Minor tidying up

Minor changes to header include lines and some formatting clean up.

C3Dit.vcxproj

@@ -18,12 +18,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Globals.h

@@ -5,7 +5,6 @@
 //#include "Model.h"
 
 #include <string>
-using namespace std;
 
 
 class Globals
@@ -22,10 +21,10 @@ class Globals
 	~Globals(){}
 
 	//Global Variables
-	string		GameLocation;
-	string		WorkingDirectory;
-	string		EnvironmentMap;
-	string		SpecularMap;
+	std::string		GameLocation;
+	std::string		WorkingDirectory;
+	std::string		EnvironmentMap;
+	std::string		SpecularMap;
 
 	int			WinX, WinY, WinW, WinH;
 	bool		Maximized;
@@ -39,6 +38,8 @@ class GlobalVariables
 private:
 
 	GlobalVariables(){}
+	GlobalVariables(const GlobalVariables&) = delete;
+	GlobalVariables(GlobalVariables&&) = delete;
 
 public:
 

Ini.cpp

@@ -1,7 +1,8 @@
 
 #include "header.h"
 #include "Ini.h"
-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
 
 
 //===========================================================//
@@ -142,12 +143,10 @@ INIFILE::~INIFILE()
 
 	fp = fopen( Name.c_str(), "w" );
 
-	for ( int s=0; s<Groups.size(); ++s )
-	{
+	for (auto s = 0u; s<Groups.size(); ++s ) {
 		fprintf( fp, "[%s]\n", Groups[s].mName.c_str()  );
 
-		for ( int k=0; k<Groups[s].mKeys.size(); ++k )
-		{
+		for (auto k=0u; k<Groups[s].mKeys.size(); ++k ) {
 			fprintf( fp, "%s=%s\n", Groups[s].mKeys[k].mName.c_str(), Groups[s].mKeys[k].mValue.c_str() );
 		}
 

header.h

@@ -3,11 +3,11 @@
 
 #include <windows.h>
 #include <commctrl.h>
-#include <gl/gl.h>
-#include <gl/glu.h>
-#include <gl/glext.h>
-#include <math.h>
-#include <stdio.h>
+#include <gl/GL.h>
+#include <gl/GLU.h>
+#include <gl/GLEXT.h>
+#include <cmath>
+#include <cstdio>
 
 #include "version.h"
 #include "Ini.h"

main.cpp

@@ -13,8 +13,6 @@
 #include <vector>
 #include <string>
 
-using namespace std;
-
 
 string statMessages[] = {
     "Holding the right mouse button lets you orbit the object!",
@@ -40,7 +38,6 @@ void LoadCARData(char*);
 void LoadC2OData(char*);
 void Load3DFData(char*);
 void LoadOBJData(char*);
-void SaveEZJSOBJData(char *);
 
 
 BOOL CALLBACK AniDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);
@@ -498,21 +495,19 @@ int WINAPI WinMain(HINSTANCE hInstance,
 
     g_TVItems.clear();
 
-	{
-		gIniFile->SetValueString( "General", "gamedir", GlobalData->GameLocation );
-		gIniFile->SetValueString( "General", "envmap", GlobalData->EnvironmentMap );
-		gIniFile->SetValueString( "General", "specular", GlobalData->SpecularMap );
-		gIniFile->SetValueInt( "General", "software", false );
-
-		gIniFile->SetValueInt( "Window", "left", WinX );
-		gIniFile->SetValueInt( "Window", "top", WinY );
-		gIniFile->SetValueInt( "Window", "width", WinW );
-		gIniFile->SetValueInt( "Window", "height", WinH );
-
-		gIniFile->SetValueInt( "OpenGL", "color", GlobalData->BufferColorBits );
-		gIniFile->SetValueInt( "OpenGL", "depth", GlobalData->BufferDepthBits );
-		gIniFile->SetValueInt( "OpenGL", "mipmaps", GlobalData->UseMipMaps );
-	}
+	gIniFile->SetValueString( "General", "gamedir", GlobalData->GameLocation );
+	gIniFile->SetValueString( "General", "envmap", GlobalData->EnvironmentMap );
+	gIniFile->SetValueString( "General", "specular", GlobalData->SpecularMap );
+	gIniFile->SetValueInt( "General", "software", false );
+
+	gIniFile->SetValueInt( "Window", "left", WinX );
+	gIniFile->SetValueInt( "Window", "top", WinY );
+	gIniFile->SetValueInt( "Window", "width", WinW );
+	gIniFile->SetValueInt( "Window", "height", WinH );
+
+	gIniFile->SetValueInt( "OpenGL", "color", GlobalData->BufferColorBits );
+	gIniFile->SetValueInt( "OpenGL", "depth", GlobalData->BufferDepthBits );
+	gIniFile->SetValueInt( "OpenGL", "mipmaps", GlobalData->UseMipMaps );
 
 	delete gIniFile;
 
@@ -622,6 +617,7 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
                 if (ParItem == rootNodes[TV_ANIMATIONS]) // Animations
                 {
+                    // TODO: 
                     CUR_ANIM = ((UINT)nmtv->itemNew.lParam - (UINT)&g_Animations[0]) / sizeof(TVtl);
 					CUR_FRAME = 0;
                     SendMessage(g_AniTrack, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, ( g_Animations[CUR_ANIM].FrameCount-1 ) ) );
@@ -1752,6 +1748,7 @@ void LoadCARData(char* fname)
     hResMenu = GetSubMenu(hMenu, 0);
     EnableMenuItem(hResMenu, IDF_SAVEAS, MF_BYCOMMAND | (TRUE ? MF_ENABLED : MF_GRAYED));*/
 
+    RedrawWindow(g_FileView, nullptr, nullptr, RDW_UPDATENOW);
 	UpdateWindow(g_FileView);
     UpdateWindow(g_hMain);
 }
@@ -2002,7 +1999,6 @@ void loadCAR()
     char sstr[64];
     sprintf(sstr,"Triangles: %u",(UINT)Model.num_tris);
     SendMessage(gHStatus, SB_SETTEXT, 0, (LPARAM)sstr);
-    MessageBox(g_hMain,sstr,"triangles",MB_OK);
     return;
 }
 
@@ -2148,45 +2144,6 @@ void SaveOBJData(char *fname)
     return;
 }
 
-void SaveEZJSOBJData(char *fname)
-{
-    // -- Saves the mesh as an EpicZenVideo-JS primitive script
-    FILE *fp = fopen(fname,"w");
-
-    fprintf(fp, "function Create_%s_Primitive()\n{\n", Model.name);
-
-    fprintf(fp, "\tmesh = new EZprimitive( EZPT_TRIANGLES );\n", Model.name);
-
-    for (int t=0; t<Model.num_tris; t++)
-    {
-        fprintf(fp, "\tmesh.AddVertex( %f, %f, %f, [1.0, 1.0, 1.0, 1.0], null, [ %f, %f ] );\n",
-			g_Verticies[ g_Triangles[t].v1 ].mX,
-			g_Verticies[ g_Triangles[t].v1 ].mY,
-			g_Verticies[ g_Triangles[t].v1 ].mZ,
-			g_Triangles[t].tx1 / 255.0f,
-			g_Triangles[t].ty1 / 255.0f);
-		fprintf(fp, "\tmesh.AddVertex( %f, %f, %f, [1.0, 1.0, 1.0, 1.0], null, [ %f, %f ] );\n",
-			g_Verticies[ g_Triangles[t].v2 ].mX,
-			g_Verticies[ g_Triangles[t].v2 ].mY,
-			g_Verticies[ g_Triangles[t].v2 ].mZ,
-			g_Triangles[t].tx2 / 255.0f,
-			g_Triangles[t].ty2 / 255.0f);
-		fprintf(fp, "\tmesh.AddVertex( %f, %f, %f, [1.0, 1.0, 1.0, 1.0], null, [ %f, %f ] );\n",
-			g_Verticies[ g_Triangles[t].v3 ].mX,
-			g_Verticies[ g_Triangles[t].v3 ].mY,
-			g_Verticies[ g_Triangles[t].v3 ].mZ,
-			g_Triangles[t].tx3 / 255.0f,
-			g_Triangles[t].ty3 / 255.0f);
-    }
-
-	fprintf( fp, "\tmesh.End();\n" );
-	fprintf( fp, "}\n" );
-
-    fclose(fp);
-
-    return;
-}
-
 void LoadOBJData(char *fname)
 {
     // -- Supports Triangulated (preferred) or quadulated geometry
@@ -2625,10 +2582,6 @@ void SaveProject()
     {
         SaveOBJData(fileName);
     }
-	if ( strstr(_strlwr(fileName),".js") )
-	{
-		SaveEZJSOBJData(fileName);
-	}
 }