Changeset 1307


Ignore:
Timestamp:
Apr 29, 2012, 6:43:49 PM (8 years ago)
Author:
sam
Message:

core: move the Camera class from Orbital to the engine core.

Location:
trunk
Files:
2 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/orbital/Makefile.am

    r1301 r1307  
    33
    44orbital_SOURCES = \
    5     orbital.cpp orbital.h mesh.h particlesystem.h camera.h
     5    orbital.cpp orbital.h mesh.h particlesystem.h
    66orbital_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    77orbital_LDADD =
  • trunk/src/Makefile.am

    r1247 r1307  
    1111    text.cpp text.h emitter.cpp emitter.h numeric.h hash.cpp hash.h \
    1212    worldentity.cpp worldentity.h gradient.cpp gradient.h \
    13     platform.cpp platform.h sprite.cpp sprite.h \
     13    platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
    1414    \
    1515    lol/unit.h lol/debug.h \
  • trunk/src/core.h

    r1247 r1307  
    8686#include "worldentity.h"
    8787
     88#include "camera.h"
    8889#include "emitter.h"
    8990#include "font.h"
  • trunk/win32/lolcore.vcxproj

    r1252 r1307  
    7575    <ClCompile Include="..\src\application\application.cpp" />
    7676    <ClCompile Include="..\src\audio.cpp" />
     77    <ClCompile Include="..\src\camera.cpp" />
    7778    <ClCompile Include="..\src\debug\fps.cpp" />
    7879    <ClCompile Include="..\src\debug\quad.cpp" />
     
    129130    <ClInclude Include="..\src\audio.h" />
    130131    <ClInclude Include="..\src\bitfield.h" />
     132    <ClInclude Include="..\src\camera.h" />
    131133    <ClInclude Include="..\src\core.h" />
    132134    <ClInclude Include="..\src\debug\fps.h" />
  • trunk/win32/lolcore.vcxproj.filters

    r1252 r1307  
    7171      <Filter>src</Filter>
    7272    </ClCompile>
     73    <ClCompile Include="..\src\camera.cpp">
     74      <Filter>src</Filter>
     75    </ClCompile>
    7376    <ClCompile Include="..\src\dict.cpp">
    7477      <Filter>src</Filter>
     
    226229      <Filter>src</Filter>
    227230    </ClInclude>
     231    <ClInclude Include="..\src\camera.h">
     232      <Filter>src</Filter>
     233    </ClInclude>
    228234    <ClInclude Include="..\src\core.h">
    229235      <Filter>src</Filter>
  • trunk/win32/orbital.vcxproj

    r1301 r1307  
    2828  </ItemGroup>
    2929  <ItemGroup>
    30     <ClInclude Include="..\orbital\camera.h" />
    3130    <ClInclude Include="..\orbital\mesh.h" />
    3231    <ClInclude Include="..\orbital\orbital.h" />
  • trunk/win32/orbital.vcxproj.filters

    r1301 r1307  
    33  <ItemGroup>
    44    <ClInclude Include="..\orbital\mesh.h" />
    5     <ClInclude Include="..\orbital\camera.h" />
    65  </ItemGroup>
    76  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.