"shader" source directory since we have "gpu".legacy
@@ -2,15 +2,15 @@ | |||||
noinst_LIBRARIES = liblol.a | noinst_LIBRARIES = liblol.a | ||||
liblol_a_SOURCES = \ | liblol_a_SOURCES = \ | ||||
core.h vector.cpp real.cpp tiler.cpp tiler.h dict.cpp dict.h \ | |||||
core.h tiler.cpp tiler.h dict.cpp dict.h \ | |||||
audio.cpp audio.h scene.cpp scene.h font.cpp font.h layer.cpp layer.h \ | audio.cpp audio.h scene.cpp scene.h font.cpp font.h layer.cpp layer.h \ | ||||
map.cpp map.h entity.cpp entity.h ticker.cpp ticker.h lolgl.h \ | map.cpp map.h entity.cpp entity.h ticker.cpp ticker.h lolgl.h \ | ||||
tileset.cpp tileset.h forge.cpp forge.h video.cpp video.h log.cpp log.h \ | tileset.cpp tileset.h forge.cpp forge.h video.cpp video.h log.cpp log.h \ | ||||
timer.cpp timer.h bitfield.h profiler.cpp profiler.h input.h input.cpp \ | timer.cpp timer.h bitfield.h profiler.cpp profiler.h input.h input.cpp \ | ||||
world.cpp world.h sample.cpp sample.h sampler.cpp sampler.h \ | world.cpp world.h sample.cpp sample.h sampler.cpp sampler.h \ | ||||
text.cpp text.h emitter.cpp emitter.h numeric.h hash.cpp hash.h \ | text.cpp text.h emitter.cpp emitter.h numeric.h hash.cpp hash.h \ | ||||
worldentity.cpp worldentity.h gradient.cpp gradient.h half.cpp \ | |||||
platform.cpp platform.h sprite.cpp sprite.h trig.cpp trig.h \ | |||||
worldentity.cpp worldentity.h gradient.cpp gradient.h \ | |||||
platform.cpp platform.h sprite.cpp sprite.h \ | |||||
\ | \ | ||||
lol/unit.h \ | lol/unit.h \ | ||||
lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \ | lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \ | ||||
@@ -23,8 +23,11 @@ liblol_a_SOURCES = \ | |||||
$(nacl_sources) \ | $(nacl_sources) \ | ||||
$(sdl_sources) \ | $(sdl_sources) \ | ||||
\ | \ | ||||
shader/shader.cpp shader/shader.h \ | |||||
thread/threadbase.h thread/thread.h \ | thread/threadbase.h thread/thread.h \ | ||||
\ | |||||
math/vector.cpp math/real.cpp math/half.cpp math/trig.cpp math/trig.h \ | |||||
\ | |||||
gpu/shader.cpp gpu/shader.h \ | |||||
gpu/vbo.cpp gpu/vbo.h \ | gpu/vbo.cpp gpu/vbo.h \ | ||||
\ | \ | ||||
image/image.cpp image/image.h image/image-private.h \ | image/image.cpp image/image.h image/image-private.h \ | ||||
@@ -62,7 +62,7 @@ static inline int isnan(float f) | |||||
#endif | #endif | ||||
// Base types | // Base types | ||||
#include "trig.h" | |||||
#include "math/trig.h" | |||||
#include "lol/math/half.h" | #include "lol/math/half.h" | ||||
#include "lol/math/real.h" | #include "lol/math/real.h" | ||||
#include "lol/math/vector.h" | #include "lol/math/vector.h" | ||||
@@ -97,8 +97,8 @@ static inline int isnan(float f) | |||||
#include "dict.h" | #include "dict.h" | ||||
#include "map.h" | #include "map.h" | ||||
#include "layer.h" | #include "layer.h" | ||||
#include "gpu/shader.h" | |||||
#include "gpu/vbo.h" | #include "gpu/vbo.h" | ||||
#include "shader/shader.h" | |||||
#include "image/image.h" | #include "image/image.h" | ||||
#include "application/application.h" | #include "application/application.h" | ||||
@@ -151,9 +151,9 @@ | |||||
<ClCompile Include="..\src\entity.cpp" /> | <ClCompile Include="..\src\entity.cpp" /> | ||||
<ClCompile Include="..\src\font.cpp" /> | <ClCompile Include="..\src\font.cpp" /> | ||||
<ClCompile Include="..\src\forge.cpp" /> | <ClCompile Include="..\src\forge.cpp" /> | ||||
<ClCompile Include="..\src\gpu\shader.cpp" /> | |||||
<ClCompile Include="..\src\gpu\vbo.cpp" /> | <ClCompile Include="..\src\gpu\vbo.cpp" /> | ||||
<ClCompile Include="..\src\gradient.cpp" /> | <ClCompile Include="..\src\gradient.cpp" /> | ||||
<ClCompile Include="..\src\half.cpp" /> | |||||
<ClCompile Include="..\src\hash.cpp" /> | <ClCompile Include="..\src\hash.cpp" /> | ||||
<ClCompile Include="..\src\image\codec\android-image.cpp" /> | <ClCompile Include="..\src\image\codec\android-image.cpp" /> | ||||
<ClCompile Include="..\src\image\codec\dummy-image.cpp" /> | <ClCompile Include="..\src\image\codec\dummy-image.cpp" /> | ||||
@@ -166,24 +166,24 @@ | |||||
<ClCompile Include="..\src\layer.cpp" /> | <ClCompile Include="..\src\layer.cpp" /> | ||||
<ClCompile Include="..\src\log.cpp" /> | <ClCompile Include="..\src\log.cpp" /> | ||||
<ClCompile Include="..\src\map.cpp" /> | <ClCompile Include="..\src\map.cpp" /> | ||||
<ClCompile Include="..\src\math\half.cpp" /> | |||||
<ClCompile Include="..\src\math\real.cpp" /> | |||||
<ClCompile Include="..\src\math\trig.cpp" /> | |||||
<ClCompile Include="..\src\math\vector.cpp" /> | |||||
<ClCompile Include="..\src\platform.cpp" /> | <ClCompile Include="..\src\platform.cpp" /> | ||||
<ClCompile Include="..\src\platform\sdl\sdlapp.cpp" /> | <ClCompile Include="..\src\platform\sdl\sdlapp.cpp" /> | ||||
<ClCompile Include="..\src\platform\sdl\sdlinput.cpp" /> | <ClCompile Include="..\src\platform\sdl\sdlinput.cpp" /> | ||||
<ClCompile Include="..\src\platform\xbox\xboxapp.cpp" /> | <ClCompile Include="..\src\platform\xbox\xboxapp.cpp" /> | ||||
<ClCompile Include="..\src\profiler.cpp" /> | <ClCompile Include="..\src\profiler.cpp" /> | ||||
<ClCompile Include="..\src\real.cpp" /> | |||||
<ClCompile Include="..\src\sample.cpp" /> | <ClCompile Include="..\src\sample.cpp" /> | ||||
<ClCompile Include="..\src\sampler.cpp" /> | <ClCompile Include="..\src\sampler.cpp" /> | ||||
<ClCompile Include="..\src\scene.cpp" /> | <ClCompile Include="..\src\scene.cpp" /> | ||||
<ClCompile Include="..\src\shader\shader.cpp" /> | |||||
<ClCompile Include="..\src\sprite.cpp" /> | <ClCompile Include="..\src\sprite.cpp" /> | ||||
<ClCompile Include="..\src\text.cpp" /> | <ClCompile Include="..\src\text.cpp" /> | ||||
<ClCompile Include="..\src\ticker.cpp" /> | <ClCompile Include="..\src\ticker.cpp" /> | ||||
<ClCompile Include="..\src\tiler.cpp" /> | <ClCompile Include="..\src\tiler.cpp" /> | ||||
<ClCompile Include="..\src\tileset.cpp" /> | <ClCompile Include="..\src\tileset.cpp" /> | ||||
<ClCompile Include="..\src\timer.cpp" /> | <ClCompile Include="..\src\timer.cpp" /> | ||||
<ClCompile Include="..\src\trig.cpp" /> | |||||
<ClCompile Include="..\src\vector.cpp" /> | |||||
<ClCompile Include="..\src\video.cpp" /> | <ClCompile Include="..\src\video.cpp" /> | ||||
<ClCompile Include="..\src\world.cpp" /> | <ClCompile Include="..\src\world.cpp" /> | ||||
<ClCompile Include="..\src\worldentity.cpp" /> | <ClCompile Include="..\src\worldentity.cpp" /> | ||||
@@ -204,9 +204,9 @@ | |||||
<ClInclude Include="..\src\entity.h" /> | <ClInclude Include="..\src\entity.h" /> | ||||
<ClInclude Include="..\src\font.h" /> | <ClInclude Include="..\src\font.h" /> | ||||
<ClInclude Include="..\src\forge.h" /> | <ClInclude Include="..\src\forge.h" /> | ||||
<ClInclude Include="..\src\gpu\shader.h" /> | |||||
<ClInclude Include="..\src\gpu\vbo.h" /> | <ClInclude Include="..\src\gpu\vbo.h" /> | ||||
<ClInclude Include="..\src\gradient.h" /> | <ClInclude Include="..\src\gradient.h" /> | ||||
<ClInclude Include="..\src\half.h" /> | |||||
<ClInclude Include="..\src\hash.h" /> | <ClInclude Include="..\src\hash.h" /> | ||||
<ClInclude Include="..\src\image\image-private.h" /> | <ClInclude Include="..\src\image\image-private.h" /> | ||||
<ClInclude Include="..\src\image\image.h" /> | <ClInclude Include="..\src\image\image.h" /> | ||||
@@ -215,11 +215,13 @@ | |||||
<ClInclude Include="..\src\log.h" /> | <ClInclude Include="..\src\log.h" /> | ||||
<ClInclude Include="..\src\loldebug.h" /> | <ClInclude Include="..\src\loldebug.h" /> | ||||
<ClInclude Include="..\src\lolgl.h" /> | <ClInclude Include="..\src\lolgl.h" /> | ||||
<ClInclude Include="..\src\lol\math\half.h" /> | |||||
<ClInclude Include="..\src\lol\math\real.h" /> | <ClInclude Include="..\src\lol\math\real.h" /> | ||||
<ClInclude Include="..\src\lol\math\remez.h" /> | <ClInclude Include="..\src\lol\math\remez.h" /> | ||||
<ClInclude Include="..\src\lol\math\vector.h" /> | <ClInclude Include="..\src\lol\math\vector.h" /> | ||||
<ClInclude Include="..\src\lol\unit.h" /> | <ClInclude Include="..\src\lol\unit.h" /> | ||||
<ClInclude Include="..\src\map.h" /> | <ClInclude Include="..\src\map.h" /> | ||||
<ClInclude Include="..\src\math\trig.h" /> | |||||
<ClInclude Include="..\src\numeric.h" /> | <ClInclude Include="..\src\numeric.h" /> | ||||
<ClInclude Include="..\src\platform.h" /> | <ClInclude Include="..\src\platform.h" /> | ||||
<ClInclude Include="..\src\platform\sdl\sdlapp.h" /> | <ClInclude Include="..\src\platform\sdl\sdlapp.h" /> | ||||
@@ -229,7 +231,6 @@ | |||||
<ClInclude Include="..\src\sample.h" /> | <ClInclude Include="..\src\sample.h" /> | ||||
<ClInclude Include="..\src\sampler.h" /> | <ClInclude Include="..\src\sampler.h" /> | ||||
<ClInclude Include="..\src\scene.h" /> | <ClInclude Include="..\src\scene.h" /> | ||||
<ClInclude Include="..\src\shader\shader.h" /> | |||||
<ClInclude Include="..\src\simd.h" /> | <ClInclude Include="..\src\simd.h" /> | ||||
<ClInclude Include="..\src\sprite.h" /> | <ClInclude Include="..\src\sprite.h" /> | ||||
<ClInclude Include="..\src\text.h" /> | <ClInclude Include="..\src\text.h" /> | ||||
@@ -239,7 +240,6 @@ | |||||
<ClInclude Include="..\src\tiler.h" /> | <ClInclude Include="..\src\tiler.h" /> | ||||
<ClInclude Include="..\src\tileset.h" /> | <ClInclude Include="..\src\tileset.h" /> | ||||
<ClInclude Include="..\src\timer.h" /> | <ClInclude Include="..\src\timer.h" /> | ||||
<ClInclude Include="..\src\trig.h" /> | |||||
<ClInclude Include="..\src\video.h" /> | <ClInclude Include="..\src\video.h" /> | ||||
<ClInclude Include="..\src\world.h" /> | <ClInclude Include="..\src\world.h" /> | ||||
<ClInclude Include="..\src\worldentity.h" /> | <ClInclude Include="..\src\worldentity.h" /> | ||||
@@ -247,4 +247,4 @@ | |||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
<ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
</ImportGroup> | </ImportGroup> | ||||
</Project> | |||||
</Project> |
@@ -14,9 +14,6 @@ | |||||
<Filter Include="src\platform"> | <Filter Include="src\platform"> | ||||
<UniqueIdentifier>{a11c55f8-8e10-4270-be24-38e8d4fcf589}</UniqueIdentifier> | <UniqueIdentifier>{a11c55f8-8e10-4270-be24-38e8d4fcf589}</UniqueIdentifier> | ||||
</Filter> | </Filter> | ||||
<Filter Include="src\shader"> | |||||
<UniqueIdentifier>{ae7aa503-aea5-4aa6-9f61-2f92cfade09c}</UniqueIdentifier> | |||||
</Filter> | |||||
<Filter Include="src\platform\sdl"> | <Filter Include="src\platform\sdl"> | ||||
<UniqueIdentifier>{4089421f-2cc2-4036-a6b2-9df8a2f4efc8}</UniqueIdentifier> | <UniqueIdentifier>{4089421f-2cc2-4036-a6b2-9df8a2f4efc8}</UniqueIdentifier> | ||||
</Filter> | </Filter> | ||||
@@ -26,6 +23,9 @@ | |||||
<Filter Include="src\lol\math"> | <Filter Include="src\lol\math"> | ||||
<UniqueIdentifier>{1e0b7a4c-425f-4d4f-945e-ba2ac9386ce0}</UniqueIdentifier> | <UniqueIdentifier>{1e0b7a4c-425f-4d4f-945e-ba2ac9386ce0}</UniqueIdentifier> | ||||
</Filter> | </Filter> | ||||
<Filter Include="src\math"> | |||||
<UniqueIdentifier>{2caadbda-b9f1-446d-bbd2-55c959db342c}</UniqueIdentifier> | |||||
</Filter> | |||||
<Filter Include="src\gpu"> | <Filter Include="src\gpu"> | ||||
<UniqueIdentifier>{ec9b94fc-c716-4ef2-9c3b-c7f3447574b0}</UniqueIdentifier> | <UniqueIdentifier>{ec9b94fc-c716-4ef2-9c3b-c7f3447574b0}</UniqueIdentifier> | ||||
</Filter> | </Filter> | ||||
@@ -61,9 +61,6 @@ | |||||
<ClCompile Include="..\src\debug\stats.cpp"> | <ClCompile Include="..\src\debug\stats.cpp"> | ||||
<Filter>src\debug</Filter> | <Filter>src\debug</Filter> | ||||
</ClCompile> | </ClCompile> | ||||
<ClCompile Include="..\src\shader\shader.cpp"> | |||||
<Filter>src\shader</Filter> | |||||
</ClCompile> | |||||
<ClCompile Include="..\src\platform\sdl\sdlapp.cpp"> | <ClCompile Include="..\src\platform\sdl\sdlapp.cpp"> | ||||
<Filter>src\platform\sdl</Filter> | <Filter>src\platform\sdl</Filter> | ||||
</ClCompile> | </ClCompile> | ||||
@@ -94,8 +91,8 @@ | |||||
<ClCompile Include="..\src\gradient.cpp"> | <ClCompile Include="..\src\gradient.cpp"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
</ClCompile> | </ClCompile> | ||||
<ClCompile Include="..\src\half.cpp"> | |||||
<Filter>src</Filter> | |||||
<ClCompile Include="..\src\math\half.cpp"> | |||||
<Filter>src\math</Filter> | |||||
</ClCompile> | </ClCompile> | ||||
<ClCompile Include="..\src\hash.cpp"> | <ClCompile Include="..\src\hash.cpp"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
@@ -118,8 +115,8 @@ | |||||
<ClCompile Include="..\src\profiler.cpp"> | <ClCompile Include="..\src\profiler.cpp"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
</ClCompile> | </ClCompile> | ||||
<ClCompile Include="..\src\real.cpp"> | |||||
<Filter>src</Filter> | |||||
<ClCompile Include="..\src\math\real.cpp"> | |||||
<Filter>src\math</Filter> | |||||
</ClCompile> | </ClCompile> | ||||
<ClCompile Include="..\src\sample.cpp"> | <ClCompile Include="..\src\sample.cpp"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
@@ -148,11 +145,11 @@ | |||||
<ClCompile Include="..\src\timer.cpp"> | <ClCompile Include="..\src\timer.cpp"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
</ClCompile> | </ClCompile> | ||||
<ClCompile Include="..\src\trig.cpp"> | |||||
<Filter>src</Filter> | |||||
<ClCompile Include="..\src\math\trig.cpp"> | |||||
<Filter>src\math</Filter> | |||||
</ClCompile> | </ClCompile> | ||||
<ClCompile Include="..\src\vector.cpp"> | |||||
<Filter>src</Filter> | |||||
<ClCompile Include="..\src\math\vector.cpp"> | |||||
<Filter>src\math</Filter> | |||||
</ClCompile> | </ClCompile> | ||||
<ClCompile Include="..\src\video.cpp"> | <ClCompile Include="..\src\video.cpp"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
@@ -163,6 +160,9 @@ | |||||
<ClCompile Include="..\src\worldentity.cpp"> | <ClCompile Include="..\src\worldentity.cpp"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
</ClCompile> | </ClCompile> | ||||
<ClCompile Include="..\src\gpu\shader.cpp"> | |||||
<Filter>src\gpu</Filter> | |||||
</ClCompile> | |||||
<ClCompile Include="..\src\gpu\vbo.cpp"> | <ClCompile Include="..\src\gpu\vbo.cpp"> | ||||
<Filter>src\gpu</Filter> | <Filter>src\gpu</Filter> | ||||
</ClCompile> | </ClCompile> | ||||
@@ -210,9 +210,6 @@ | |||||
<ClInclude Include="..\src\debug\stats.h"> | <ClInclude Include="..\src\debug\stats.h"> | ||||
<Filter>src\debug</Filter> | <Filter>src\debug</Filter> | ||||
</ClInclude> | </ClInclude> | ||||
<ClInclude Include="..\src\shader\shader.h"> | |||||
<Filter>src\shader</Filter> | |||||
</ClInclude> | |||||
<ClInclude Include="..\src\platform\sdl\sdlinput.h"> | <ClInclude Include="..\src\platform\sdl\sdlinput.h"> | ||||
<Filter>src\platform\sdl</Filter> | <Filter>src\platform\sdl</Filter> | ||||
</ClInclude> | </ClInclude> | ||||
@@ -249,9 +246,6 @@ | |||||
<ClInclude Include="..\src\gradient.h"> | <ClInclude Include="..\src\gradient.h"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
</ClInclude> | </ClInclude> | ||||
<ClInclude Include="..\src\half.h"> | |||||
<Filter>src</Filter> | |||||
</ClInclude> | |||||
<ClInclude Include="..\src\hash.h"> | <ClInclude Include="..\src\hash.h"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
</ClInclude> | </ClInclude> | ||||
@@ -312,8 +306,8 @@ | |||||
<ClInclude Include="..\src\timer.h"> | <ClInclude Include="..\src\timer.h"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
</ClInclude> | </ClInclude> | ||||
<ClInclude Include="..\src\trig.h"> | |||||
<Filter>src</Filter> | |||||
<ClInclude Include="..\src\math\trig.h"> | |||||
<Filter>src\math</Filter> | |||||
</ClInclude> | </ClInclude> | ||||
<ClInclude Include="..\src\video.h"> | <ClInclude Include="..\src\video.h"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
@@ -324,6 +318,9 @@ | |||||
<ClInclude Include="..\src\worldentity.h"> | <ClInclude Include="..\src\worldentity.h"> | ||||
<Filter>src</Filter> | <Filter>src</Filter> | ||||
</ClInclude> | </ClInclude> | ||||
<ClInclude Include="..\src\lol\math\half.h"> | |||||
<Filter>src\lol\math</Filter> | |||||
</ClInclude> | |||||
<ClInclude Include="..\src\lol\math\real.h"> | <ClInclude Include="..\src\lol\math\real.h"> | ||||
<Filter>src\lol\math</Filter> | <Filter>src\lol\math</Filter> | ||||
</ClInclude> | </ClInclude> | ||||
@@ -336,6 +333,9 @@ | |||||
<ClInclude Include="..\src\lol\unit.h"> | <ClInclude Include="..\src\lol\unit.h"> | ||||
<Filter>src\lol</Filter> | <Filter>src\lol</Filter> | ||||
</ClInclude> | </ClInclude> | ||||
<ClInclude Include="..\src\gpu\shader.h"> | |||||
<Filter>src\gpu</Filter> | |||||
</ClInclude> | |||||
<ClInclude Include="..\src\gpu\vbo.h"> | <ClInclude Include="..\src\gpu\vbo.h"> | ||||
<Filter>src\gpu</Filter> | <Filter>src\gpu</Filter> | ||||
</ClInclude> | </ClInclude> | ||||
@@ -355,4 +355,4 @@ | |||||
<Filter>src\platform\xbox</Filter> | <Filter>src\platform\xbox</Filter> | ||||
</ClInclude> | </ClInclude> | ||||
</ItemGroup> | </ItemGroup> | ||||
</Project> | |||||
</Project> |