Ivan Avdeev 6 rokov pred
rodič
commit
9d2ada4a31
4 zmenil súbory, kde vykonal 13 pridanie a 1 odobranie
  1. 2 0
      OpenSource.vcxproj
  2. 6 0
      OpenSource.vcxproj.filters
  3. 4 1
      src/libc.h
  4. 1 0
      src/render.c

+ 2 - 0
OpenSource.vcxproj

@@ -107,6 +107,7 @@
     <ClCompile Include="src\atto\src\app_windows.c" />
     <ClCompile Include="src\bsp.c" />
     <ClCompile Include="src\cache.c" />
+    <ClCompile Include="src\camera.c" />
     <ClCompile Include="src\collection.c" />
     <ClCompile Include="src\dxt.c" />
     <ClCompile Include="src\filemap.c" />
@@ -128,6 +129,7 @@
     <ClInclude Include="src\atto\atto_udio.h" />
     <ClInclude Include="src\bsp.h" />
     <ClInclude Include="src\cache.h" />
+    <ClInclude Include="src\camera.h" />
     <ClInclude Include="src\collection.h" />
     <ClInclude Include="src\common.h" />
     <ClInclude Include="src\dxt.h" />

+ 6 - 0
OpenSource.vcxproj.filters

@@ -54,6 +54,9 @@
     <ClCompile Include="src\atto\src\app_windows.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\camera.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\ahash.h">
@@ -131,5 +134,8 @@
     <ClInclude Include="src\atto\atto\platform.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\camera.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

+ 4 - 1
src/libc.h

@@ -1,17 +1,20 @@
 #pragma once
 
-#include <alloca.h>
 #include <stdint.h>
 #include <stdio.h> /* printf */
 #include <stdlib.h> /* malloc */
 #include <stddef.h> /* offsetof, size_t */
 #include <string.h> /* memset */
 #ifndef _WIN32
+#include <alloca.h>
 #include <strings.h> /* strncasecmp */
 #else
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
 #include <windows.h>
+#undef near
+#undef far
 #define strncasecmp _strnicmp
+#define alloca _alloca
 #endif
 #include <ctype.h> /* isspace */

+ 1 - 0
src/render.c

@@ -132,6 +132,7 @@ static void a__GlPrintError(const char *message, int error) {
 	WGL__FUNCLIST_DO(PFNGLUNIFORM1IPROC, Uniform1i) \
 	WGL__FUNCLIST_DO(PFNGLUNIFORMMATRIX4FVPROC, UniformMatrix4fv) \
 	WGL__FUNCLIST_DO(PFNGLENABLEVERTEXATTRIBARRAYPROC, EnableVertexAttribArray) \
+	WGL__FUNCLIST_DO(PFNGLDISABLEVERTEXATTRIBARRAYPROC, DisableVertexAttribArray) \
 	WGL__FUNCLIST_DO(PFNGLVERTEXATTRIBPOINTERPROC, VertexAttribPointer) \
 	WGL__FUNCLIST_DO(PFNGLGENERATEMIPMAPPROC, GenerateMipmap) \