Changeset 1180


Ignore:
Timestamp:
Mar 30, 2012, 10:48:42 AM (8 years ago)
Author:
sam
Message:

build: reorganise math files in a single "math" directory, and get rid of the
"shader" source directory since we have "gpu".

Location:
trunk
Files:
1 added
4 edited
7 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r1173 r1180  
    33
    44liblol_a_SOURCES = \
    5     core.h vector.cpp real.cpp tiler.cpp tiler.h dict.cpp dict.h \
     5    core.h tiler.cpp tiler.h dict.cpp dict.h \
    66    audio.cpp audio.h scene.cpp scene.h font.cpp font.h layer.cpp layer.h \
    77    map.cpp map.h entity.cpp entity.h ticker.cpp ticker.h lolgl.h \
     
    1010    world.cpp world.h sample.cpp sample.h sampler.cpp sampler.h \
    1111    text.cpp text.h emitter.cpp emitter.h numeric.h hash.cpp hash.h \
    12     worldentity.cpp worldentity.h gradient.cpp gradient.h half.cpp \
    13     platform.cpp platform.h sprite.cpp sprite.h trig.cpp trig.h \
     12    worldentity.cpp worldentity.h gradient.cpp gradient.h \
     13    platform.cpp platform.h sprite.cpp sprite.h \
    1414    \
    1515    lol/unit.h \
     
    2424    $(sdl_sources) \
    2525    \
    26     shader/shader.cpp shader/shader.h \
    2726    thread/threadbase.h thread/thread.h \
     27    \
     28    math/vector.cpp math/real.cpp math/half.cpp math/trig.cpp math/trig.h \
     29    \
     30    gpu/shader.cpp gpu/shader.h \
    2831    gpu/vbo.cpp gpu/vbo.h \
    2932    \
  • trunk/src/core.h

    r1160 r1180  
    6363
    6464// Base types
    65 #include "trig.h"
     65#include "math/trig.h"
    6666#include "lol/math/half.h"
    6767#include "lol/math/real.h"
     
    9898#include "map.h"
    9999#include "layer.h"
     100#include "gpu/shader.h"
    100101#include "gpu/vbo.h"
    101 #include "shader/shader.h"
    102102#include "image/image.h"
    103103#include "application/application.h"
  • trunk/src/gpu/shader.cpp

    • Property svn:keywords set to Id
  • trunk/src/gpu/shader.h

    • Property svn:keywords set to Id
  • trunk/src/math/real.cpp

    • Property svn:keywords set to Id
  • trunk/src/math/trig.cpp

    • Property svn:keywords set to Id
  • trunk/src/math/trig.h

    • Property svn:keywords set to Id
  • trunk/win32/lolcore.vcxproj

    r1173 r1180  
    152152    <ClCompile Include="..\src\font.cpp" />
    153153    <ClCompile Include="..\src\forge.cpp" />
     154    <ClCompile Include="..\src\gpu\shader.cpp" />
    154155    <ClCompile Include="..\src\gpu\vbo.cpp" />
    155156    <ClCompile Include="..\src\gradient.cpp" />
    156     <ClCompile Include="..\src\half.cpp" />
    157157    <ClCompile Include="..\src\hash.cpp" />
    158158    <ClCompile Include="..\src\image\codec\android-image.cpp" />
     
    167167    <ClCompile Include="..\src\log.cpp" />
    168168    <ClCompile Include="..\src\map.cpp" />
     169    <ClCompile Include="..\src\math\half.cpp" />
     170    <ClCompile Include="..\src\math\real.cpp" />
     171    <ClCompile Include="..\src\math\trig.cpp" />
     172    <ClCompile Include="..\src\math\vector.cpp" />
    169173    <ClCompile Include="..\src\platform.cpp" />
    170174    <ClCompile Include="..\src\platform\sdl\sdlapp.cpp" />
     
    172176    <ClCompile Include="..\src\platform\xbox\xboxapp.cpp" />
    173177    <ClCompile Include="..\src\profiler.cpp" />
    174     <ClCompile Include="..\src\real.cpp" />
    175178    <ClCompile Include="..\src\sample.cpp" />
    176179    <ClCompile Include="..\src\sampler.cpp" />
    177180    <ClCompile Include="..\src\scene.cpp" />
    178     <ClCompile Include="..\src\shader\shader.cpp" />
    179181    <ClCompile Include="..\src\sprite.cpp" />
    180182    <ClCompile Include="..\src\text.cpp" />
     
    183185    <ClCompile Include="..\src\tileset.cpp" />
    184186    <ClCompile Include="..\src\timer.cpp" />
    185     <ClCompile Include="..\src\trig.cpp" />
    186     <ClCompile Include="..\src\vector.cpp" />
    187187    <ClCompile Include="..\src\video.cpp" />
    188188    <ClCompile Include="..\src\world.cpp" />
     
    205205    <ClInclude Include="..\src\font.h" />
    206206    <ClInclude Include="..\src\forge.h" />
     207    <ClInclude Include="..\src\gpu\shader.h" />
    207208    <ClInclude Include="..\src\gpu\vbo.h" />
    208209    <ClInclude Include="..\src\gradient.h" />
    209     <ClInclude Include="..\src\half.h" />
    210210    <ClInclude Include="..\src\hash.h" />
    211211    <ClInclude Include="..\src\image\image-private.h" />
     
    216216    <ClInclude Include="..\src\loldebug.h" />
    217217    <ClInclude Include="..\src\lolgl.h" />
     218    <ClInclude Include="..\src\lol\math\half.h" />
    218219    <ClInclude Include="..\src\lol\math\real.h" />
    219220    <ClInclude Include="..\src\lol\math\remez.h" />
     
    221222    <ClInclude Include="..\src\lol\unit.h" />
    222223    <ClInclude Include="..\src\map.h" />
     224    <ClInclude Include="..\src\math\trig.h" />
    223225    <ClInclude Include="..\src\numeric.h" />
    224226    <ClInclude Include="..\src\platform.h" />
     
    230232    <ClInclude Include="..\src\sampler.h" />
    231233    <ClInclude Include="..\src\scene.h" />
    232     <ClInclude Include="..\src\shader\shader.h" />
    233234    <ClInclude Include="..\src\simd.h" />
    234235    <ClInclude Include="..\src\sprite.h" />
     
    240241    <ClInclude Include="..\src\tileset.h" />
    241242    <ClInclude Include="..\src\timer.h" />
    242     <ClInclude Include="..\src\trig.h" />
    243243    <ClInclude Include="..\src\video.h" />
    244244    <ClInclude Include="..\src\world.h" />
  • trunk/win32/lolcore.vcxproj.filters

    r1173 r1180  
    1515      <UniqueIdentifier>{a11c55f8-8e10-4270-be24-38e8d4fcf589}</UniqueIdentifier>
    1616    </Filter>
    17     <Filter Include="src\shader">
    18       <UniqueIdentifier>{ae7aa503-aea5-4aa6-9f61-2f92cfade09c}</UniqueIdentifier>
    19     </Filter>
    2017    <Filter Include="src\platform\sdl">
    2118      <UniqueIdentifier>{4089421f-2cc2-4036-a6b2-9df8a2f4efc8}</UniqueIdentifier>
     
    2623    <Filter Include="src\lol\math">
    2724      <UniqueIdentifier>{1e0b7a4c-425f-4d4f-945e-ba2ac9386ce0}</UniqueIdentifier>
     25    </Filter>
     26    <Filter Include="src\math">
     27      <UniqueIdentifier>{2caadbda-b9f1-446d-bbd2-55c959db342c}</UniqueIdentifier>
    2828    </Filter>
    2929    <Filter Include="src\gpu">
     
    6262      <Filter>src\debug</Filter>
    6363    </ClCompile>
    64     <ClCompile Include="..\src\shader\shader.cpp">
    65       <Filter>src\shader</Filter>
    66     </ClCompile>
    6764    <ClCompile Include="..\src\platform\sdl\sdlapp.cpp">
    6865      <Filter>src\platform\sdl</Filter>
     
    9592      <Filter>src</Filter>
    9693    </ClCompile>
    97     <ClCompile Include="..\src\half.cpp">
    98       <Filter>src</Filter>
     94    <ClCompile Include="..\src\math\half.cpp">
     95      <Filter>src\math</Filter>
    9996    </ClCompile>
    10097    <ClCompile Include="..\src\hash.cpp">
     
    119116      <Filter>src</Filter>
    120117    </ClCompile>
    121     <ClCompile Include="..\src\real.cpp">
    122       <Filter>src</Filter>
     118    <ClCompile Include="..\src\math\real.cpp">
     119      <Filter>src\math</Filter>
    123120    </ClCompile>
    124121    <ClCompile Include="..\src\sample.cpp">
     
    149146      <Filter>src</Filter>
    150147    </ClCompile>
    151     <ClCompile Include="..\src\trig.cpp">
    152       <Filter>src</Filter>
    153     </ClCompile>
    154     <ClCompile Include="..\src\vector.cpp">
    155       <Filter>src</Filter>
     148    <ClCompile Include="..\src\math\trig.cpp">
     149      <Filter>src\math</Filter>
     150    </ClCompile>
     151    <ClCompile Include="..\src\math\vector.cpp">
     152      <Filter>src\math</Filter>
    156153    </ClCompile>
    157154    <ClCompile Include="..\src\video.cpp">
     
    163160    <ClCompile Include="..\src\worldentity.cpp">
    164161      <Filter>src</Filter>
     162    </ClCompile>
     163    <ClCompile Include="..\src\gpu\shader.cpp">
     164      <Filter>src\gpu</Filter>
    165165    </ClCompile>
    166166    <ClCompile Include="..\src\gpu\vbo.cpp">
     
    211211      <Filter>src\debug</Filter>
    212212    </ClInclude>
    213     <ClInclude Include="..\src\shader\shader.h">
    214       <Filter>src\shader</Filter>
    215     </ClInclude>
    216213    <ClInclude Include="..\src\platform\sdl\sdlinput.h">
    217214      <Filter>src\platform\sdl</Filter>
     
    250247      <Filter>src</Filter>
    251248    </ClInclude>
    252     <ClInclude Include="..\src\half.h">
    253       <Filter>src</Filter>
    254     </ClInclude>
    255249    <ClInclude Include="..\src\hash.h">
    256250      <Filter>src</Filter>
     
    313307      <Filter>src</Filter>
    314308    </ClInclude>
    315     <ClInclude Include="..\src\trig.h">
    316       <Filter>src</Filter>
     309    <ClInclude Include="..\src\math\trig.h">
     310      <Filter>src\math</Filter>
    317311    </ClInclude>
    318312    <ClInclude Include="..\src\video.h">
     
    324318    <ClInclude Include="..\src\worldentity.h">
    325319      <Filter>src</Filter>
     320    </ClInclude>
     321    <ClInclude Include="..\src\lol\math\half.h">
     322      <Filter>src\lol\math</Filter>
    326323    </ClInclude>
    327324    <ClInclude Include="..\src\lol\math\real.h">
     
    337334      <Filter>src\lol</Filter>
    338335    </ClInclude>
     336    <ClInclude Include="..\src\gpu\shader.h">
     337      <Filter>src\gpu</Filter>
     338    </ClInclude>
    339339    <ClInclude Include="..\src\gpu\vbo.h">
    340340      <Filter>src\gpu</Filter>
Note: See TracChangeset for help on using the changeset viewer.