dungeon_crawler
changeset 68:1141a325cb73
merged with visual studio crap
| author | John Tsiombikas <nuclear@member.fsf.org> |
|---|---|
| date | Sun, 07 Oct 2012 02:05:11 +0300 |
| parents | 2560a7ab0243 6a471c87f9ca |
| children | 45172d087ebe |
| files | |
| diffstat | 8 files changed, 492 insertions(+), 9 deletions(-) [+] |
line diff
1.1 --- a/prototype/drawtext/drawtext_impl.h Sun Oct 07 02:04:00 2012 +0300 1.2 +++ b/prototype/drawtext/drawtext_impl.h Sun Oct 07 02:05:11 2012 +0300 1.3 @@ -18,6 +18,10 @@ 1.4 #ifndef TEXT_IMPL_H_ 1.5 #define TEXT_IMPL_H_ 1.6 1.7 +#include <stdio.h> 1.8 +#include <string.h> 1.9 +#include <errno.h> 1.10 + 1.11 struct glyph { 1.12 int code; 1.13 float x, y, width, height; 1.14 @@ -61,7 +65,7 @@ 1.15 1.16 1.17 #define fperror(str) \ 1.18 - fprintf(stderr, "%s: %s: %s\n", __func__, (str), strerror(errno)) 1.19 + fprintf(stderr, "%s: %s: %s\n", __FUNCTION__, (str), strerror(errno)) 1.20 1.21 int dtx_gl_init(void); 1.22
2.1 --- a/prototype/drawtext/font.c Sun Oct 07 02:04:00 2012 +0300 2.2 +++ b/prototype/drawtext/font.c Sun Oct 07 02:05:11 2012 +0300 2.3 @@ -332,7 +332,7 @@ 2.4 2.5 res = sscanf(line + 1, "%d: %fx%f+%f+%f\n", &c, &xsz, &ysz, &x, &y); 2.6 if(res != 5) { 2.7 - fprintf(stderr, "%s: invalid glyph info line\n", __func__); 2.8 + fprintf(stderr, "%s: invalid glyph info line\n", __FUNCTION__); 2.9 goto err; 2.10 } 2.11 2.12 @@ -358,14 +358,14 @@ 2.13 switch(hdr_lines) { 2.14 case 0: 2.15 if(0[line] != 'P' || 1[line] != '6') { 2.16 - fprintf(stderr, "%s: invalid file format (magic)\n", __func__); 2.17 + fprintf(stderr, "%s: invalid file format (magic)\n", __FUNCTION__); 2.18 goto err; 2.19 } 2.20 break; 2.21 2.22 case 1: 2.23 if(sscanf(line, "%d %d", &gmap->xsz, &gmap->ysz) != 2) { 2.24 - fprintf(stderr, "%s: invalid file format (dim)\n", __func__); 2.25 + fprintf(stderr, "%s: invalid file format (dim)\n", __FUNCTION__); 2.26 goto err; 2.27 } 2.28 break; 2.29 @@ -375,7 +375,7 @@ 2.30 char *endp; 2.31 max_pixval = strtol(line, &endp, 10); 2.32 if(endp == line) { 2.33 - fprintf(stderr, "%s: invalid file format (maxval)\n", __func__); 2.34 + fprintf(stderr, "%s: invalid file format (maxval)\n", __FUNCTION__); 2.35 goto err; 2.36 } 2.37 } 2.38 @@ -438,7 +438,7 @@ 2.39 int res; 2.40 2.41 if(!(fp = fopen(fname, "wb"))) { 2.42 - fprintf(stderr, "%s: failed to open file: %s: %s\n", __func__, fname, strerror(errno)); 2.43 + fprintf(stderr, "%s: failed to open file: %s: %s\n", __FUNCTION__, fname, strerror(errno)); 2.44 return -1; 2.45 } 2.46 res = dtx_save_glyphmap_stream(fp, gmap);
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/prototype/prototype.sln Sun Oct 07 02:05:11 2012 +0300 3.3 @@ -0,0 +1,20 @@ 3.4 + 3.5 +Microsoft Visual Studio Solution File, Format Version 12.00 3.6 +# Visual Studio 2012 3.7 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prototype", "prototype.vcxproj", "{DBC203E4-17DE-4B50-9D14-85A063ABCFBF}" 3.8 +EndProject 3.9 +Global 3.10 + GlobalSection(SolutionConfigurationPlatforms) = preSolution 3.11 + Debug|Win32 = Debug|Win32 3.12 + Release|Win32 = Release|Win32 3.13 + EndGlobalSection 3.14 + GlobalSection(ProjectConfigurationPlatforms) = postSolution 3.15 + {DBC203E4-17DE-4B50-9D14-85A063ABCFBF}.Debug|Win32.ActiveCfg = Debug|Win32 3.16 + {DBC203E4-17DE-4B50-9D14-85A063ABCFBF}.Debug|Win32.Build.0 = Debug|Win32 3.17 + {DBC203E4-17DE-4B50-9D14-85A063ABCFBF}.Release|Win32.ActiveCfg = Release|Win32 3.18 + {DBC203E4-17DE-4B50-9D14-85A063ABCFBF}.Release|Win32.Build.0 = Release|Win32 3.19 + EndGlobalSection 3.20 + GlobalSection(SolutionProperties) = preSolution 3.21 + HideSolutionNode = FALSE 3.22 + EndGlobalSection 3.23 +EndGlobal
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/prototype/prototype.vcxproj Sun Oct 07 02:05:11 2012 +0300 4.3 @@ -0,0 +1,177 @@ 4.4 +<?xml version="1.0" encoding="utf-8"?> 4.5 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4.6 + <ItemGroup Label="ProjectConfigurations"> 4.7 + <ProjectConfiguration Include="Debug|Win32"> 4.8 + <Configuration>Debug</Configuration> 4.9 + <Platform>Win32</Platform> 4.10 + </ProjectConfiguration> 4.11 + <ProjectConfiguration Include="Release|Win32"> 4.12 + <Configuration>Release</Configuration> 4.13 + <Platform>Win32</Platform> 4.14 + </ProjectConfiguration> 4.15 + </ItemGroup> 4.16 + <PropertyGroup Label="Globals"> 4.17 + <ProjectGuid>{DBC203E4-17DE-4B50-9D14-85A063ABCFBF}</ProjectGuid> 4.18 + <Keyword>Win32Proj</Keyword> 4.19 + <RootNamespace>prototype</RootNamespace> 4.20 + </PropertyGroup> 4.21 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 4.22 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 4.23 + <ConfigurationType>Application</ConfigurationType> 4.24 + <UseDebugLibraries>true</UseDebugLibraries> 4.25 + <PlatformToolset>v110</PlatformToolset> 4.26 + <CharacterSet>Unicode</CharacterSet> 4.27 + </PropertyGroup> 4.28 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 4.29 + <ConfigurationType>Application</ConfigurationType> 4.30 + <UseDebugLibraries>false</UseDebugLibraries> 4.31 + <PlatformToolset>v110</PlatformToolset> 4.32 + <WholeProgramOptimization>true</WholeProgramOptimization> 4.33 + <CharacterSet>Unicode</CharacterSet> 4.34 + </PropertyGroup> 4.35 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 4.36 + <ImportGroup Label="ExtensionSettings"> 4.37 + </ImportGroup> 4.38 + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 4.39 + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 4.40 + </ImportGroup> 4.41 + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 4.42 + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 4.43 + </ImportGroup> 4.44 + <PropertyGroup Label="UserMacros" /> 4.45 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 4.46 + <LinkIncremental>true</LinkIncremental> 4.47 + </PropertyGroup> 4.48 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 4.49 + <LinkIncremental>false</LinkIncremental> 4.50 + </PropertyGroup> 4.51 + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 4.52 + <ClCompile> 4.53 + <PrecompiledHeader> 4.54 + </PrecompiledHeader> 4.55 + <WarningLevel>Level3</WarningLevel> 4.56 + <Optimization>Disabled</Optimization> 4.57 + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 4.58 + <AdditionalIncludeDirectories>$(SolutionDir)\vmath;$(SolutionDir)\drawtext;$(SolutionDir)\kdtree;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 4.59 + <DisableSpecificWarnings>4996</DisableSpecificWarnings> 4.60 + </ClCompile> 4.61 + <Link> 4.62 + <SubSystem>Console</SubSystem> 4.63 + <GenerateDebugInformation>true</GenerateDebugInformation> 4.64 + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;assimp.lib;glut32.lib;glew32.lib;libimago2.lib;zlib.lib;jpeglib.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies> 4.65 + </Link> 4.66 + </ItemDefinitionGroup> 4.67 + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 4.68 + <ClCompile> 4.69 + <WarningLevel>Level3</WarningLevel> 4.70 + <PrecompiledHeader> 4.71 + </PrecompiledHeader> 4.72 + <Optimization>MaxSpeed</Optimization> 4.73 + <FunctionLevelLinking>true</FunctionLevelLinking> 4.74 + <IntrinsicFunctions>true</IntrinsicFunctions> 4.75 + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 4.76 + <AdditionalIncludeDirectories>$(SolutionDir)\vmath;$(SolutionDir)\drawtext;$(SolutionDir)\kdtree;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 4.77 + <DisableSpecificWarnings>4996</DisableSpecificWarnings> 4.78 + </ClCompile> 4.79 + <Link> 4.80 + <SubSystem>Console</SubSystem> 4.81 + <GenerateDebugInformation>true</GenerateDebugInformation> 4.82 + <EnableCOMDATFolding>true</EnableCOMDATFolding> 4.83 + <OptimizeReferences>true</OptimizeReferences> 4.84 + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;assimp.lib;glut32.lib;glew32.lib;libimago2.lib;zlib.lib;jpeglib.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies> 4.85 + </Link> 4.86 + </ItemDefinitionGroup> 4.87 + <ItemGroup> 4.88 + <ClCompile Include="drawtext\drawgl.c" /> 4.89 + <ClCompile Include="drawtext\font.c" /> 4.90 + <ClCompile Include="drawtext\utf8.c" /> 4.91 + <ClCompile Include="kdtree\kdtree.c" /> 4.92 + <ClCompile Include="src\audio\audio.cc" /> 4.93 + <ClCompile Include="src\audio\auman.cc" /> 4.94 + <ClCompile Include="src\audio\ovstream.cc" /> 4.95 + <ClCompile Include="src\audio\sample.cc" /> 4.96 + <ClCompile Include="src\audio\source.cc" /> 4.97 + <ClCompile Include="src\audio\stream.cc" /> 4.98 + <ClCompile Include="src\camera.cc" /> 4.99 + <ClCompile Include="src\cfg.cc" /> 4.100 + <ClCompile Include="src\cmdcon.cc" /> 4.101 + <ClCompile Include="src\datapath.cc" /> 4.102 + <ClCompile Include="src\level.cc" /> 4.103 + <ClCompile Include="src\light.cc" /> 4.104 + <ClCompile Include="src\main.cc" /> 4.105 + <ClCompile Include="src\material.cc" /> 4.106 + <ClCompile Include="src\mesh.cc" /> 4.107 + <ClCompile Include="src\opengl.cc" /> 4.108 + <ClCompile Include="src\renderer.cc" /> 4.109 + <ClCompile Include="src\renderer_deferred.cc" /> 4.110 + <ClCompile Include="src\renderer_multipass.cc" /> 4.111 + <ClCompile Include="src\sdr.c" /> 4.112 + <ClCompile Include="src\texture.cc" /> 4.113 + <ClCompile Include="src\tile.cc" /> 4.114 + <ClCompile Include="src\tileset.cc" /> 4.115 + <ClCompile Include="src\timer.cc" /> 4.116 + <ClCompile Include="vmath\basis.cc" /> 4.117 + <ClCompile Include="vmath\basis_c.c" /> 4.118 + <ClCompile Include="vmath\geom.c" /> 4.119 + <ClCompile Include="vmath\matrix.cc" /> 4.120 + <ClCompile Include="vmath\matrix_c.c" /> 4.121 + <ClCompile Include="vmath\quat.cc" /> 4.122 + <ClCompile Include="vmath\quat_c.c" /> 4.123 + <ClCompile Include="vmath\ray.cc" /> 4.124 + <ClCompile Include="vmath\ray_c.c" /> 4.125 + <ClCompile Include="vmath\sphvec.cc" /> 4.126 + <ClCompile Include="vmath\vector.cc" /> 4.127 + <ClCompile Include="vmath\vmath.c" /> 4.128 + </ItemGroup> 4.129 + <ItemGroup> 4.130 + <ClInclude Include="drawtext\drawtext.h" /> 4.131 + <ClInclude Include="drawtext\drawtext_impl.h" /> 4.132 + <ClInclude Include="kdtree\kdtree.h" /> 4.133 + <ClInclude Include="src\audio\audio.h" /> 4.134 + <ClInclude Include="src\audio\auman.h" /> 4.135 + <ClInclude Include="src\audio\openal.h" /> 4.136 + <ClInclude Include="src\audio\ovstream.h" /> 4.137 + <ClInclude Include="src\audio\sample.h" /> 4.138 + <ClInclude Include="src\audio\source.h" /> 4.139 + <ClInclude Include="src\audio\stream.h" /> 4.140 + <ClInclude Include="src\camera.h" /> 4.141 + <ClInclude Include="src\cfg.h" /> 4.142 + <ClInclude Include="src\cmdcon.h" /> 4.143 + <ClInclude Include="src\color.h" /> 4.144 + <ClInclude Include="src\datapath.h" /> 4.145 + <ClInclude Include="src\dataset.h" /> 4.146 + <ClInclude Include="src\level.h" /> 4.147 + <ClInclude Include="src\light.h" /> 4.148 + <ClInclude Include="src\material.h" /> 4.149 + <ClInclude Include="src\mesh.h" /> 4.150 + <ClInclude Include="src\opengl.h" /> 4.151 + <ClInclude Include="src\renderer.h" /> 4.152 + <ClInclude Include="src\renderer_deferred.h" /> 4.153 + <ClInclude Include="src\renderer_multipass.h" /> 4.154 + <ClInclude Include="src\sdr.h" /> 4.155 + <ClInclude Include="src\texture.h" /> 4.156 + <ClInclude Include="src\tile.h" /> 4.157 + <ClInclude Include="src\tileset.h" /> 4.158 + <ClInclude Include="src\timer.h" /> 4.159 + <ClInclude Include="vmath\basis.h" /> 4.160 + <ClInclude Include="vmath\geom.h" /> 4.161 + <ClInclude Include="vmath\matrix.h" /> 4.162 + <ClInclude Include="vmath\quat.h" /> 4.163 + <ClInclude Include="vmath\ray.h" /> 4.164 + <ClInclude Include="vmath\sphvec.h" /> 4.165 + <ClInclude Include="vmath\vector.h" /> 4.166 + <ClInclude Include="vmath\vmath.h" /> 4.167 + <ClInclude Include="vmath\vmath_config.h" /> 4.168 + <ClInclude Include="vmath\vmath_types.h" /> 4.169 + </ItemGroup> 4.170 + <ItemGroup> 4.171 + <None Include="vmath\matrix.inl" /> 4.172 + <None Include="vmath\quat.inl" /> 4.173 + <None Include="vmath\ray.inl" /> 4.174 + <None Include="vmath\vector.inl" /> 4.175 + <None Include="vmath\vmath.inl" /> 4.176 + </ItemGroup> 4.177 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 4.178 + <ImportGroup Label="ExtensionTargets"> 4.179 + </ImportGroup> 4.180 +</Project> 4.181 \ No newline at end of file
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/prototype/prototype.vcxproj.filters Sun Oct 07 02:05:11 2012 +0300 5.3 @@ -0,0 +1,282 @@ 5.4 +<?xml version="1.0" encoding="utf-8"?> 5.5 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 5.6 + <ItemGroup> 5.7 + <Filter Include="src"> 5.8 + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> 5.9 + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> 5.10 + </Filter> 5.11 + <Filter Include="audio"> 5.12 + <UniqueIdentifier>{cb48c0ab-e309-4f8f-b3c7-ba5522748dfe}</UniqueIdentifier> 5.13 + </Filter> 5.14 + <Filter Include="libs"> 5.15 + <UniqueIdentifier>{b0ec2f24-37c0-4783-b242-5bb90a09f3c7}</UniqueIdentifier> 5.16 + </Filter> 5.17 + <Filter Include="libs\vmath"> 5.18 + <UniqueIdentifier>{76d11503-7646-4655-80e3-e055ffbd3671}</UniqueIdentifier> 5.19 + </Filter> 5.20 + <Filter Include="libs\kdtree"> 5.21 + <UniqueIdentifier>{88a7a215-3123-49c8-abbc-be8b4c1477ac}</UniqueIdentifier> 5.22 + </Filter> 5.23 + <Filter Include="libs\drawtext"> 5.24 + <UniqueIdentifier>{a1933fec-b18b-4122-a680-4da3e97a2d88}</UniqueIdentifier> 5.25 + </Filter> 5.26 + </ItemGroup> 5.27 + <ItemGroup> 5.28 + <ClCompile Include="src\camera.cc"> 5.29 + <Filter>src</Filter> 5.30 + </ClCompile> 5.31 + <ClCompile Include="src\cfg.cc"> 5.32 + <Filter>src</Filter> 5.33 + </ClCompile> 5.34 + <ClCompile Include="src\cmdcon.cc"> 5.35 + <Filter>src</Filter> 5.36 + </ClCompile> 5.37 + <ClCompile Include="src\datapath.cc"> 5.38 + <Filter>src</Filter> 5.39 + </ClCompile> 5.40 + <ClCompile Include="src\level.cc"> 5.41 + <Filter>src</Filter> 5.42 + </ClCompile> 5.43 + <ClCompile Include="src\light.cc"> 5.44 + <Filter>src</Filter> 5.45 + </ClCompile> 5.46 + <ClCompile Include="src\main.cc"> 5.47 + <Filter>src</Filter> 5.48 + </ClCompile> 5.49 + <ClCompile Include="src\material.cc"> 5.50 + <Filter>src</Filter> 5.51 + </ClCompile> 5.52 + <ClCompile Include="src\mesh.cc"> 5.53 + <Filter>src</Filter> 5.54 + </ClCompile> 5.55 + <ClCompile Include="src\opengl.cc"> 5.56 + <Filter>src</Filter> 5.57 + </ClCompile> 5.58 + <ClCompile Include="src\renderer.cc"> 5.59 + <Filter>src</Filter> 5.60 + </ClCompile> 5.61 + <ClCompile Include="src\renderer_deferred.cc"> 5.62 + <Filter>src</Filter> 5.63 + </ClCompile> 5.64 + <ClCompile Include="src\renderer_multipass.cc"> 5.65 + <Filter>src</Filter> 5.66 + </ClCompile> 5.67 + <ClCompile Include="src\sdr.c"> 5.68 + <Filter>src</Filter> 5.69 + </ClCompile> 5.70 + <ClCompile Include="src\texture.cc"> 5.71 + <Filter>src</Filter> 5.72 + </ClCompile> 5.73 + <ClCompile Include="src\tile.cc"> 5.74 + <Filter>src</Filter> 5.75 + </ClCompile> 5.76 + <ClCompile Include="src\tileset.cc"> 5.77 + <Filter>src</Filter> 5.78 + </ClCompile> 5.79 + <ClCompile Include="src\timer.cc"> 5.80 + <Filter>src</Filter> 5.81 + </ClCompile> 5.82 + <ClCompile Include="src\audio\audio.cc"> 5.83 + <Filter>audio</Filter> 5.84 + </ClCompile> 5.85 + <ClCompile Include="src\audio\auman.cc"> 5.86 + <Filter>audio</Filter> 5.87 + </ClCompile> 5.88 + <ClCompile Include="src\audio\ovstream.cc"> 5.89 + <Filter>audio</Filter> 5.90 + </ClCompile> 5.91 + <ClCompile Include="src\audio\sample.cc"> 5.92 + <Filter>audio</Filter> 5.93 + </ClCompile> 5.94 + <ClCompile Include="src\audio\source.cc"> 5.95 + <Filter>audio</Filter> 5.96 + </ClCompile> 5.97 + <ClCompile Include="src\audio\stream.cc"> 5.98 + <Filter>audio</Filter> 5.99 + </ClCompile> 5.100 + <ClCompile Include="vmath\basis.cc"> 5.101 + <Filter>libs\vmath</Filter> 5.102 + </ClCompile> 5.103 + <ClCompile Include="vmath\basis_c.c"> 5.104 + <Filter>libs\vmath</Filter> 5.105 + </ClCompile> 5.106 + <ClCompile Include="vmath\geom.c"> 5.107 + <Filter>libs\vmath</Filter> 5.108 + </ClCompile> 5.109 + <ClCompile Include="vmath\matrix.cc"> 5.110 + <Filter>libs\vmath</Filter> 5.111 + </ClCompile> 5.112 + <ClCompile Include="vmath\matrix_c.c"> 5.113 + <Filter>libs\vmath</Filter> 5.114 + </ClCompile> 5.115 + <ClCompile Include="vmath\quat.cc"> 5.116 + <Filter>libs\vmath</Filter> 5.117 + </ClCompile> 5.118 + <ClCompile Include="vmath\quat_c.c"> 5.119 + <Filter>libs\vmath</Filter> 5.120 + </ClCompile> 5.121 + <ClCompile Include="vmath\ray.cc"> 5.122 + <Filter>libs\vmath</Filter> 5.123 + </ClCompile> 5.124 + <ClCompile Include="vmath\ray_c.c"> 5.125 + <Filter>libs\vmath</Filter> 5.126 + </ClCompile> 5.127 + <ClCompile Include="vmath\sphvec.cc"> 5.128 + <Filter>libs\vmath</Filter> 5.129 + </ClCompile> 5.130 + <ClCompile Include="vmath\vector.cc"> 5.131 + <Filter>libs\vmath</Filter> 5.132 + </ClCompile> 5.133 + <ClCompile Include="vmath\vmath.c"> 5.134 + <Filter>libs\vmath</Filter> 5.135 + </ClCompile> 5.136 + <ClCompile Include="kdtree\kdtree.c"> 5.137 + <Filter>libs\kdtree</Filter> 5.138 + </ClCompile> 5.139 + <ClCompile Include="drawtext\drawgl.c"> 5.140 + <Filter>libs\drawtext</Filter> 5.141 + </ClCompile> 5.142 + <ClCompile Include="drawtext\font.c"> 5.143 + <Filter>libs\drawtext</Filter> 5.144 + </ClCompile> 5.145 + <ClCompile Include="drawtext\utf8.c"> 5.146 + <Filter>libs\drawtext</Filter> 5.147 + </ClCompile> 5.148 + </ItemGroup> 5.149 + <ItemGroup> 5.150 + <ClInclude Include="src\camera.h"> 5.151 + <Filter>src</Filter> 5.152 + </ClInclude> 5.153 + <ClInclude Include="src\cfg.h"> 5.154 + <Filter>src</Filter> 5.155 + </ClInclude> 5.156 + <ClInclude Include="src\cmdcon.h"> 5.157 + <Filter>src</Filter> 5.158 + </ClInclude> 5.159 + <ClInclude Include="src\color.h"> 5.160 + <Filter>src</Filter> 5.161 + </ClInclude> 5.162 + <ClInclude Include="src\datapath.h"> 5.163 + <Filter>src</Filter> 5.164 + </ClInclude> 5.165 + <ClInclude Include="src\dataset.h"> 5.166 + <Filter>src</Filter> 5.167 + </ClInclude> 5.168 + <ClInclude Include="src\level.h"> 5.169 + <Filter>src</Filter> 5.170 + </ClInclude> 5.171 + <ClInclude Include="src\light.h"> 5.172 + <Filter>src</Filter> 5.173 + </ClInclude> 5.174 + <ClInclude Include="src\material.h"> 5.175 + <Filter>src</Filter> 5.176 + </ClInclude> 5.177 + <ClInclude Include="src\mesh.h"> 5.178 + <Filter>src</Filter> 5.179 + </ClInclude> 5.180 + <ClInclude Include="src\opengl.h"> 5.181 + <Filter>src</Filter> 5.182 + </ClInclude> 5.183 + <ClInclude Include="src\renderer.h"> 5.184 + <Filter>src</Filter> 5.185 + </ClInclude> 5.186 + <ClInclude Include="src\renderer_deferred.h"> 5.187 + <Filter>src</Filter> 5.188 + </ClInclude> 5.189 + <ClInclude Include="src\renderer_multipass.h"> 5.190 + <Filter>src</Filter> 5.191 + </ClInclude> 5.192 + <ClInclude Include="src\sdr.h"> 5.193 + <Filter>src</Filter> 5.194 + </ClInclude> 5.195 + <ClInclude Include="src\texture.h"> 5.196 + <Filter>src</Filter> 5.197 + </ClInclude> 5.198 + <ClInclude Include="src\tile.h"> 5.199 + <Filter>src</Filter> 5.200 + </ClInclude> 5.201 + <ClInclude Include="src\tileset.h"> 5.202 + <Filter>src</Filter> 5.203 + </ClInclude> 5.204 + <ClInclude Include="src\timer.h"> 5.205 + <Filter>src</Filter> 5.206 + </ClInclude> 5.207 + <ClInclude Include="src\audio\audio.h"> 5.208 + <Filter>audio</Filter> 5.209 + </ClInclude> 5.210 + <ClInclude Include="src\audio\auman.h"> 5.211 + <Filter>audio</Filter> 5.212 + </ClInclude> 5.213 + <ClInclude Include="src\audio\openal.h"> 5.214 + <Filter>audio</Filter> 5.215 + </ClInclude> 5.216 + <ClInclude Include="src\audio\ovstream.h"> 5.217 + <Filter>audio</Filter> 5.218 + </ClInclude> 5.219 + <ClInclude Include="src\audio\sample.h"> 5.220 + <Filter>audio</Filter> 5.221 + </ClInclude> 5.222 + <ClInclude Include="src\audio\source.h"> 5.223 + <Filter>audio</Filter> 5.224 + </ClInclude> 5.225 + <ClInclude Include="src\audio\stream.h"> 5.226 + <Filter>audio</Filter> 5.227 + </ClInclude> 5.228 + <ClInclude Include="vmath\basis.h"> 5.229 + <Filter>libs\vmath</Filter> 5.230 + </ClInclude> 5.231 + <ClInclude Include="vmath\geom.h"> 5.232 + <Filter>libs\vmath</Filter> 5.233 + </ClInclude> 5.234 + <ClInclude Include="vmath\matrix.h"> 5.235 + <Filter>libs\vmath</Filter> 5.236 + </ClInclude> 5.237 + <ClInclude Include="vmath\quat.h"> 5.238 + <Filter>libs\vmath</Filter> 5.239 + </ClInclude> 5.240 + <ClInclude Include="vmath\ray.h"> 5.241 + <Filter>libs\vmath</Filter> 5.242 + </ClInclude> 5.243 + <ClInclude Include="vmath\sphvec.h"> 5.244 + <Filter>libs\vmath</Filter> 5.245 + </ClInclude> 5.246 + <ClInclude Include="vmath\vector.h"> 5.247 + <Filter>libs\vmath</Filter> 5.248 + </ClInclude> 5.249 + <ClInclude Include="vmath\vmath.h"> 5.250 + <Filter>libs\vmath</Filter> 5.251 + </ClInclude> 5.252 + <ClInclude Include="vmath\vmath_config.h"> 5.253 + <Filter>libs\vmath</Filter> 5.254 + </ClInclude> 5.255 + <ClInclude Include="vmath\vmath_types.h"> 5.256 + <Filter>libs\vmath</Filter> 5.257 + </ClInclude> 5.258 + <ClInclude Include="kdtree\kdtree.h"> 5.259 + <Filter>libs\kdtree</Filter> 5.260 + </ClInclude> 5.261 + <ClInclude Include="drawtext\drawtext.h"> 5.262 + <Filter>libs\drawtext</Filter> 5.263 + </ClInclude> 5.264 + <ClInclude Include="drawtext\drawtext_impl.h"> 5.265 + <Filter>libs\drawtext</Filter> 5.266 + </ClInclude> 5.267 + </ItemGroup> 5.268 + <ItemGroup> 5.269 + <None Include="vmath\matrix.inl"> 5.270 + <Filter>libs\vmath</Filter> 5.271 + </None> 5.272 + <None Include="vmath\quat.inl"> 5.273 + <Filter>libs\vmath</Filter> 5.274 + </None> 5.275 + <None Include="vmath\ray.inl"> 5.276 + <Filter>libs\vmath</Filter> 5.277 + </None> 5.278 + <None Include="vmath\vector.inl"> 5.279 + <Filter>libs\vmath</Filter> 5.280 + </None> 5.281 + <None Include="vmath\vmath.inl"> 5.282 + <Filter>libs\vmath</Filter> 5.283 + </None> 5.284 + </ItemGroup> 5.285 +</Project> 5.286 \ No newline at end of file
6.1 --- a/prototype/src/mesh.cc Sun Oct 07 02:04:00 2012 +0300 6.2 +++ b/prototype/src/mesh.cc Sun Oct 07 02:05:11 2012 +0300 6.3 @@ -38,7 +38,7 @@ 6.4 bool Mesh::create(const aiScene *scn, aiMesh *aim) 6.5 { 6.6 if(aim->mPrimitiveTypes != aiPrimitiveType_TRIANGLE) { 6.7 - fprintf(stderr, "%s: non-triangle mesh!? primtype mask: %x\n", __func__, aim->mPrimitiveTypes); 6.8 + fprintf(stderr, "%s: non-triangle mesh!? primtype mask: %x\n", __FUNCTION__, aim->mPrimitiveTypes); 6.9 return false; 6.10 } 6.11
7.1 --- a/prototype/src/tile.h Sun Oct 07 02:04:00 2012 +0300 7.2 +++ b/prototype/src/tile.h Sun Oct 07 02:05:11 2012 +0300 7.3 @@ -4,7 +4,7 @@ 7.4 #include <vector> 7.5 #include <map> 7.6 #include <assimp/scene.h> 7.7 -#include <psys/psys.h> 7.8 +#include "psys/psys.h" 7.9 #include "mesh.h" 7.10 #include "light.h" 7.11 #include "audio/sample.h"
8.1 --- a/prototype/vmath/vmath_config.h Sun Oct 07 02:04:00 2012 +0300 8.2 +++ b/prototype/vmath/vmath_config.h Sun Oct 07 02:05:11 2012 +0300 8.3 @@ -1,7 +1,7 @@ 8.4 #ifndef VMATH_CONFIG_H_ 8.5 #define VMATH_CONFIG_H_ 8.6 8.7 -#if (__STDC_VERSION__ < 199999) 8.8 +#if (__STDC_VERSION__ < 199999) && !defined(__cplusplus) 8.9 #if defined(__GNUC__) || defined(_MSC_VER) 8.10 #define inline __inline 8.11 #else