goat3d
changeset 11:d1cebaf1d5c9
ok wtf
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Mon, 26 Aug 2013 05:42:30 +0300 |
parents | 1f94a2107c64 |
children | be15ba7c5483 |
files | goat3d.vcxproj goat3d.vcxproj.filters src/goat3d.cc src/goat3d.h |
diffstat | 4 files changed, 22 insertions(+), 13 deletions(-) [+] |
line diff
1.1 --- a/goat3d.vcxproj Mon Aug 26 05:30:40 2013 +0300 1.2 +++ b/goat3d.vcxproj Mon Aug 26 05:42:30 2013 +0300 1.3 @@ -26,15 +26,17 @@ 1.4 <ClInclude Include="src\light.h" /> 1.5 <ClInclude Include="src\material.h" /> 1.6 <ClInclude Include="src\mesh.h" /> 1.7 + <ClInclude Include="src\node.h" /> 1.8 <ClInclude Include="src\object.h" /> 1.9 - <ClInclude Include="src\opengl.h" /> 1.10 <ClInclude Include="src\xform_node.h" /> 1.11 </ItemGroup> 1.12 <ItemGroup> 1.13 + <ClCompile Include="src\camera.cc" /> 1.14 <ClCompile Include="src\goat3d.cc" /> 1.15 + <ClCompile Include="src\light.cc" /> 1.16 + <ClCompile Include="src\material.cc" /> 1.17 <ClCompile Include="src\mesh.cc" /> 1.18 - <ClCompile Include="src\object.cc" /> 1.19 - <ClCompile Include="src\opengl.cc" /> 1.20 + <ClCompile Include="src\node.cc" /> 1.21 <ClCompile Include="src\xform_node.cc" /> 1.22 </ItemGroup> 1.23 <PropertyGroup Label="Globals"> 1.24 @@ -112,7 +114,7 @@ 1.25 <WarningLevel>Level3</WarningLevel> 1.26 <Optimization>Disabled</Optimization> 1.27 <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 1.28 - <DisableSpecificWarnings>4244</DisableSpecificWarnings> 1.29 + <DisableSpecificWarnings>4244;4305</DisableSpecificWarnings> 1.30 </ClCompile> 1.31 <Link> 1.32 <SubSystem>Windows</SubSystem> 1.33 @@ -146,7 +148,7 @@ 1.34 <FunctionLevelLinking>true</FunctionLevelLinking> 1.35 <IntrinsicFunctions>true</IntrinsicFunctions> 1.36 <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 1.37 - <DisableSpecificWarnings>4244</DisableSpecificWarnings> 1.38 + <DisableSpecificWarnings>4244;4305</DisableSpecificWarnings> 1.39 </ClCompile> 1.40 <Link> 1.41 <SubSystem>Windows</SubSystem>
2.1 --- a/goat3d.vcxproj.filters Mon Aug 26 05:30:40 2013 +0300 2.2 +++ b/goat3d.vcxproj.filters Mon Aug 26 05:42:30 2013 +0300 2.3 @@ -28,13 +28,13 @@ 2.4 <ClInclude Include="src\mesh.h"> 2.5 <Filter>src</Filter> 2.6 </ClInclude> 2.7 - <ClInclude Include="src\object.h"> 2.8 + <ClInclude Include="src\xform_node.h"> 2.9 <Filter>src</Filter> 2.10 </ClInclude> 2.11 - <ClInclude Include="src\opengl.h"> 2.12 + <ClInclude Include="src\node.h"> 2.13 <Filter>src</Filter> 2.14 </ClInclude> 2.15 - <ClInclude Include="src\xform_node.h"> 2.16 + <ClInclude Include="src\object.h"> 2.17 <Filter>src</Filter> 2.18 </ClInclude> 2.19 </ItemGroup> 2.20 @@ -45,13 +45,19 @@ 2.21 <ClCompile Include="src\mesh.cc"> 2.22 <Filter>src</Filter> 2.23 </ClCompile> 2.24 - <ClCompile Include="src\object.cc"> 2.25 + <ClCompile Include="src\xform_node.cc"> 2.26 <Filter>src</Filter> 2.27 </ClCompile> 2.28 - <ClCompile Include="src\opengl.cc"> 2.29 + <ClCompile Include="src\camera.cc"> 2.30 <Filter>src</Filter> 2.31 </ClCompile> 2.32 - <ClCompile Include="src\xform_node.cc"> 2.33 + <ClCompile Include="src\light.cc"> 2.34 + <Filter>src</Filter> 2.35 + </ClCompile> 2.36 + <ClCompile Include="src\material.cc"> 2.37 + <Filter>src</Filter> 2.38 + </ClCompile> 2.39 + <ClCompile Include="src\node.cc"> 2.40 <Filter>src</Filter> 2.41 </ClCompile> 2.42 </ItemGroup>
3.1 --- a/src/goat3d.cc Mon Aug 26 05:30:40 2013 +0300 3.2 +++ b/src/goat3d.cc Mon Aug 26 05:42:30 2013 +0300 3.3 @@ -1,6 +1,7 @@ 3.4 #include "goat3d.h" 3.5 #include "goat3d_impl.h" 3.6 #include "chunk.h" 3.7 +#include "node.h" 3.8 3.9 Scene::Scene() 3.10 : name("unnamed"), ambient(0.05, 0.05, 0.05)
4.1 --- a/src/goat3d.h Mon Aug 26 05:30:40 2013 +0300 4.2 +++ b/src/goat3d.h Mon Aug 26 05:42:30 2013 +0300 4.3 @@ -9,8 +9,8 @@ 4.4 struct goat3d_io { 4.5 void *cls; /* closure data */ 4.6 4.7 - ssize_t (*read)(void *buf, size_t bytes, void *uptr); 4.8 - ssize_t (*write)(void *buf, size_t bytes, void *uptr); 4.9 + long (*read)(void *buf, size_t bytes, void *uptr); 4.10 + long (*write)(void *buf, size_t bytes, void *uptr); 4.11 long (*seek)(long offs, int whence, void *uptr); 4.12 }; 4.13