zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 23:32:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint_1.8'

Browse source
This commit is contained in:
Braden Obrzut 2013-06-26 19:05:03 -04:00
commit 57324f6fd8
5 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gl/models/gl_models_md2.cpp
View file

@ -176,7 +176,7 @@ bool FDMDModel::Load(const char * path, int, const char * buffer, int length)
// Translate each vertex. // Translate each vertex.
for(k = 0, pVtx = pfr->vertices; k < info.numVertices; k++, pVtx++) for(k = 0, pVtx = pfr->vertices; k < info.numVertices; k++, pVtx++)
{ {
UnpackVector(USHORT(pVtx->normal), frame->normals[k].xyz); UnpackVector((unsigned short)(pVtx->normal), frame->normals[k].xyz);
for(c = 0; c < 3; c++) for(c = 0; c < 3; c++)
{ {
frame->vertices[k].xyz[axis[c]] = frame->vertices[k].xyz[axis[c]] =
@ -208,7 +208,7 @@ bool FDMDModel::Load(const char * path, int, const char * buffer, int length)
for(i = 0; i < info.numLODs; i++) for(i = 0; i < info.numLODs; i++)
for(k = 0; k < lodInfo[i].numTriangles; k++) for(k = 0; k < lodInfo[i].numTriangles; k++)
for(c = 0; c < 3; c++) for(c = 0; c < 3; c++)
vertexUsage[SHORT(triangles[i][k].vertexIndices[c])] |= 1 << i; vertexUsage[short(triangles[i][k].vertexIndices[c])] |= 1 << i;
loaded=true; loaded=true;
return true; return true;

5
src/gl/system/gl_interface.h
View file

@ -5,6 +5,11 @@
#define APIENTRY #define APIENTRY
#endif // __APPLE__ #endif // __APPLE__
#include "basictypes.h"
#ifndef _WIN32
typedef bool BOOL;
#endif
#ifndef PFNGLMULTITEXCOORD2FPROC #ifndef PFNGLMULTITEXCOORD2FPROC
typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
#endif #endif

1
src/gl/system/gl_system.h
View file

@ -88,7 +88,6 @@ inline T max( T a, T b) { return (((a)>(b)) ? (a) : (b)); }
#define _access(a,b) access(a,b) #define _access(a,b) access(a,b)
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
#include "platform.h"
#include <SDL.h> #include <SDL.h>
#endif #endif
#include "gl/system/gl_interface.h" #include "gl/system/gl_interface.h"

13
src/gl/system/gl_wipe.cpp
View file

@ -56,6 +56,19 @@
#include "gl/textures/gl_material.h" #include "gl/textures/gl_material.h"
#include "gl/utility/gl_templates.h" #include "gl/utility/gl_templates.h"
#ifndef _WIN32
struct POINT {
SDWORD x;
SDWORD y;
};
struct RECT {
SDWORD left;
SDWORD top;
SDWORD right;
SDWORD bottom;
};
#endif
EXTERN_CVAR(Bool, gl_vid_compatibility) EXTERN_CVAR(Bool, gl_vid_compatibility)
//=========================================================================== //===========================================================================

4
src/gl/textures/gl_hirestex.cpp
View file

@ -56,8 +56,8 @@
#include "d_main.h" #include "d_main.h"
#include "zstring.h" #include "zstring.h"
#ifdef __GNUC__ #ifndef _WIN32
#include "Linux/platform.h" /* Without this it would fail on _access on line 374 (378 now) */ #define _access(a,b) access(a,b)
#endif #endif
static int Doom2Wad = -1; static int Doom2Wad = -1;