maride/Redline
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix includes

Browse Source
This commit is contained in:
maride 2016-04-04 23:17:52 +02:00
parent 0b90ea2f12
commit bab38f82e1
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/mactexturesimport.cpp
View File

@ -5,6 +5,7 @@
#include <QuickTime/QuickTime.h> #include <QuickTime/QuickTime.h>
#include <QD/QD.h> #include <QD/QD.h>
#include <QD/Quickdraw.h> #include <QD/Quickdraw.h>
#include <ApplicationServices/ApplicationServices.h>
#include <string.h> #include <string.h>
#include "fileio.h" #include "fileio.h"
#include "error.h" #include "error.h"

20
source/rendercar.cpp
View File

@ -25,6 +25,8 @@
#include "stencil.h" #include "stencil.h"
#include "random.h" #include "random.h"
#include "mVertex.h"
#define sign(x) ((x)<0?-1:1) #define sign(x) ((x)<0?-1:1)
@ -194,20 +196,20 @@ void RenderArm(tVector3 point1,tVector3 point2,tVector3 point3)
glBegin(GL_TRIANGLE_STRIP); glBegin(GL_TRIANGLE_STRIP);
glVertex3fv(&(point1).x); glVertex3fv(&(point1).x);
glNormal3fv(&dir1.x); glNormal3fv(&dir1.x);
glVertex3fv(&(point1+dir1*kArmRadius).x); mVertex3fv((point1+dir1*kArmRadius));
dir1=dir1*mat1; dir1=dir1*mat1;
glNormal3fv(&dir1.x); glNormal3fv(&dir1.x);
glVertex3fv(&(point1+dir1*kArmRadius).x); mVertex3fv((point1+dir1*kArmRadius));
glNormal3fv(&dir2.x); glNormal3fv(&dir2.x);
glVertex3fv(&(point2+dir2*kArmRadius).x); mVertex3fv((point2+dir2*kArmRadius));
dir2=dir2*mat2; dir2=dir2*mat2;
glNormal3fv(&dir2.x); glNormal3fv(&dir2.x);
glVertex3fv(&(point2+dir2*kArmRadius).x); mVertex3fv((point2+dir2*kArmRadius));
glNormal3fv(&dir3.x); glNormal3fv(&dir3.x);
glVertex3fv(&(point3+dir3*kArmRadius).x); mVertex3fv((point3+dir3*kArmRadius));
dir3=dir3*mat3; dir3=dir3*mat3;
glNormal3fv(&dir3.x); glNormal3fv(&dir3.x);
glVertex3fv(&(point3+dir3*kArmRadius).x); mVertex3fv((point3+dir3*kArmRadius));
glVertex3fv(&(point3).x); glVertex3fv(&(point3).x);
glEnd(); glEnd();
} }
@ -575,7 +577,7 @@ void CarRenderWheelShadowPass(float width,float radius,float shadowLength,int cw
float c=cos(f); float c=cos(f);
tVector3 v=Vector(dir,c*normal.y+s*lightDirFlat.y,c*normal.z+s*lightDirFlat.z); tVector3 v=Vector(dir,c*normal.y+s*lightDirFlat.y,c*normal.z+s*lightDirFlat.z);
glVertex3fv(&v.x); glVertex3fv(&v.x);
glVertex3fv(&(v-shadowVector).x); mVertex3fv((v-shadowVector));
} }
for(int i=kNumWheelSides/2;i<=kNumWheelSides;i++) for(int i=kNumWheelSides/2;i<=kNumWheelSides;i++)
{ {
@ -584,11 +586,11 @@ void CarRenderWheelShadowPass(float width,float radius,float shadowLength,int cw
float c=cos(f); float c=cos(f);
tVector3 v=Vector(-dir,c*normal.y+s*lightDirFlat.y,c*normal.z+s*lightDirFlat.z); tVector3 v=Vector(-dir,c*normal.y+s*lightDirFlat.y,c*normal.z+s*lightDirFlat.z);
glVertex3fv(&v.x); glVertex3fv(&v.x);
glVertex3fv(&(v-shadowVector).x); mVertex3fv((v-shadowVector));
} }
tVector3 v=Vector(dir,normal.y,normal.z); tVector3 v=Vector(dir,normal.y,normal.z);
glVertex3fv(&v.x); glVertex3fv(&v.x);
glVertex3fv(&(v-shadowVector).x); mVertex3fv((v-shadowVector));
glEnd(); glEnd();
} }

4
source/renderframe.cpp
View File

@ -27,6 +27,8 @@
#include "textures.h" #include "textures.h"
#include "lights.h" #include "lights.h"
#include "mVertex.h"
#ifdef __POLYCOUNT #ifdef __POLYCOUNT
int gPolyCount; int gPolyCount;
#endif #endif
@ -587,7 +589,7 @@ void RenderVisWalls()
glVertex3fv(&(gMapInfo->visWalls[i].b.x)); glVertex3fv(&(gMapInfo->visWalls[i].b.x));
glVertex3fv(&(gMapInfo->visWalls[i].c.x)); glVertex3fv(&(gMapInfo->visWalls[i].c.x));
glVertex3fv(&((gMapInfo->visWalls[i].c+(gMapInfo->visWalls[i].b-gMapInfo->visWalls[i].a)).x)); mVertex3fv(((gMapInfo->visWalls[i].c+(gMapInfo->visWalls[i].b-gMapInfo->visWalls[i].a))));
glEnd(); glEnd();
} }
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);

2
source/sound_ST.cpp
View File

@ -1,4 +1,4 @@
#include <sound_tool.h> #include <AmbrosiaTools/sound_tool.h>
#include <math.h> #include <math.h>
#include "gamemem.h" #include "gamemem.h"
#include "vectors.h" #include "vectors.h"

9
source/tracker.cpp
View File

@ -1,7 +1,7 @@
#include <reggie.h> #include <AmbrosiaTools/reggie.h>
#include <network_tool.h> #include <AmbrosiaTools/network_tool.h>
#include <platform.h> #include <AmbrosiaTools/platform.h>
#include <lsockets.h> #include <AmbrosiaTools/lsockets.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "tracker.h" #include "tracker.h"
@ -15,7 +15,6 @@
#include "initexit.h" #include "initexit.h"
#include "network.h" #include "network.h"
#include "interfaceutil.h" #include "interfaceutil.h"
#include "reg_tool_3.h"
#include "gamesystem.h" #include "gamesystem.h"
#include "screen.h" #include "screen.h"