diff --git a/Building.cpp b/Building.cpp index 8e20597..cc3ea56 100644 --- a/Building.cpp +++ b/Building.cpp @@ -143,7 +143,7 @@ void CBuilding::RenderFlat (bool colored) if (colored) glColor3fv (&_color.red); - _mesh_flat->Render (); + //_mesh_flat->Render (); } diff --git a/Render.cpp b/Render.cpp index 0a2cb5d..1771901 100644 --- a/Render.cpp +++ b/Render.cpp @@ -343,6 +343,7 @@ static void do_effects (int type) radius = render_width / 16; do_progress ((float)render_width / 2, (float)render_height / 2, (float)radius, fade, EntityProgress ()); RenderPrint (render_width / 2 - LOGO_PIXELS, render_height / 2 + LOGO_PIXELS, 0, glRgba (0.5f), "%1.2f%%", EntityProgress () * 100.0f); + RenderPrint (1, "%s v%d.%d.%03d", APP_TITLE, VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION); } glPopMatrix (); glMatrixMode (GL_PROJECTION); diff --git a/Render.h b/Render.h index cb45449..ee8c96d 100644 --- a/Render.h +++ b/Render.h @@ -15,6 +15,7 @@ bool RenderWireframe (); void RenderWireframeToggle (); void RenderHelpToggle (); void RenderPrint (int x, int y, int font, GLrgba color, const char *fmt, ...); +void RenderPrint (int line, const char *fmt, ...); diff --git a/Win.cpp b/Win.cpp index b96475f..e462e40 100644 --- a/Win.cpp +++ b/Win.cpp @@ -389,7 +389,7 @@ void AppQuit () void AppInit (void) { - RandomInit (1); + RandomInit (time (NULL)); CameraInit (); RenderInit (); TextureInit (); diff --git a/World.cpp b/World.cpp index cad50e3..5d0b434 100644 --- a/World.cpp +++ b/World.cpp @@ -212,7 +212,6 @@ static void build_road (int x1, int y1, int width, int depth) claim (x1 + sidewalk, y1, lanes, depth, CLAIM_ROAD | MAP_ROAD_SOUTH); claim (x1 + sidewalk + lanes + divider, y1, lanes, depth, CLAIM_ROAD | MAP_ROAD_NORTH); } - //new CStreet (x1, y1, width, depth); } @@ -401,6 +400,7 @@ static void do_reset (void) GLrgba building_color; float west_street, north_street, east_street, south_street; + //Re-init Random to make the same city each time. Good for debugging. //RandomInit (6); reset_needed = false; broadway_done = false; diff --git a/glMatrix.cpp b/glMatrix.cpp index 31770ff..22496ad 100644 --- a/glMatrix.cpp +++ b/glMatrix.cpp @@ -74,12 +74,6 @@ #define EulOrdXYZr EulOrd(Z,EulParOdd,EulRepNo,EulFrmR) #define EulOrdZYZr EulOrd(Z,EulParOdd,EulRepYes,EulFrmR) -//EulerAngles Eul_(float ai, float aj, float ah, int order); -//Quat Eul_ToQuat(EulerAngles ea); -//void Eul_ToHMatrix(EulerAngles ea, HMatrix M); -//EulerAngles Eul_FromHMatrix(HMatrix M, int order); -//EulerAngles Eul_FromQuat(Quat q, int order); - #include #include diff --git a/glVector3.cpp b/glVector3.cpp index cffa549..dce5aba 100644 --- a/glVector3.cpp +++ b/glVector3.cpp @@ -29,7 +29,6 @@ GLvector glVectorReflect (GLvector3 ray, GLvector3 normal) float dot; dot = glVectorDotProduct (ray, normal); - //return glVectorSubtract (ray, glVectorScale (normal, 2.0f * dot)); return ray - (normal * (2.0f * dot)); }