From 2445d076a167fde533d179c35d9bf9a82d5127a3 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 21:36:31 -0700 Subject: [PATCH] Reset Solution --- Dialogs.aps | Bin 35036 -> 0 bytes Dialogs.rc | 191 --------- G3DTest.opt | Bin 53760 -> 0 bytes G3DTest.plg | 32 -- G3DTest.suo | Bin 15872 -> 0 bytes G3DTest.sln => G3D_Application.sln | 40 +- G3DTest.dsp => G3D_New.dsp | 242 ++++++----- G3DTest.dsw => G3D_New.dsw | 58 +-- G3DTest.vcproj => G3D_New.vcproj | 653 +++++++++++++++-------------- main.cpp | 5 +- resource.h | 25 -- 11 files changed, 530 insertions(+), 716 deletions(-) delete mode 100644 Dialogs.aps delete mode 100644 Dialogs.rc delete mode 100644 G3DTest.opt delete mode 100644 G3DTest.plg delete mode 100644 G3DTest.suo rename G3DTest.sln => G3D_Application.sln (54%) rename G3DTest.dsp => G3D_New.dsp (77%) rename G3DTest.dsw => G3D_New.dsw (84%) rename G3DTest.vcproj => G3D_New.vcproj (67%) delete mode 100644 resource.h diff --git a/Dialogs.aps b/Dialogs.aps deleted file mode 100644 index 02bfebf527769d63da67061abe317cd1c86ba025..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35036 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 diff --git a/G3DTest.plg b/G3DTest.plg deleted file mode 100644 index 5c210ef..0000000 --- a/G3DTest.plg +++ /dev/null @@ -1,32 +0,0 @@ - - -

-
Build Log

-

---------------------Configuration: G3DTest - Win32 Debug--------------------
-

-
Command Lines

-Creating temporary file "C:\Users\Andreja\AppData\Local\Temp\RSPFD70.tmp" with contents
-[
-/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"Debug/G3DTest.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\USERS\ANDREJA\G3D\G3DTest\main.cpp"
-]
-Creating command line "cl.exe @C:\Users\Andreja\AppData\Local\Temp\RSPFD70.tmp" 
-Creating temporary file "C:\Users\Andreja\AppData\Local\Temp\RSPFD71.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/G3DTest.pdb" /debug /machine:I386 /out:"Debug/G3DTest.exe" /pdbtype:sept 
-.\Debug\main.obj
-]
-Creating command line "link.exe @C:\Users\Andreja\AppData\Local\Temp\RSPFD71.tmp"
-
Output Window

-Compiling...
-main.cpp
-Linking...
-
-
-
-
Results

-G3DTest.exe - 0 error(s), 0 warning(s)
-
- - diff --git a/G3DTest.suo b/G3DTest.suo deleted file mode 100644 index 8a3723781d65793cdca3298ca3bf3e2557de258d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15872 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 diff --git a/G3DTest.sln b/G3D_Application.sln similarity index 54% rename from G3DTest.sln rename to G3D_Application.sln index cc42e7a..4d13571 100644 --- a/G3DTest.sln +++ b/G3D_Application.sln @@ -1,20 +1,20 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "G3DTest", "G3DTest.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug|Win32.Build.0 = Debug|Win32 - {6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release|Win32.ActiveCfg = Release|Win32 - {6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "G3D_New", "G3D_New.vcproj", "{583B17DE-1A0C-4070-801A-021DC0C84B0C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {583B17DE-1A0C-4070-801A-021DC0C84B0C}.Debug|Win32.ActiveCfg = Debug|Win32 + {583B17DE-1A0C-4070-801A-021DC0C84B0C}.Debug|Win32.Build.0 = Debug|Win32 + {583B17DE-1A0C-4070-801A-021DC0C84B0C}.Release|Win32.ActiveCfg = Release|Win32 + {583B17DE-1A0C-4070-801A-021DC0C84B0C}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/G3DTest.dsp b/G3D_New.dsp similarity index 77% rename from G3DTest.dsp rename to G3D_New.dsp index 4ada96f..e658867 100644 --- a/G3DTest.dsp +++ b/G3D_New.dsp @@ -1,105 +1,137 @@ -# Microsoft Developer Studio Project File - Name="G3DTest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=G3DTest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "G3DTest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "G3DTest.mak" CFG="G3DTest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "G3DTest - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "G3DTest - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "G3DTest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x1009 /d "NDEBUG" -# ADD RSC /l 0x1009 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "G3DTest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x1009 /d "_DEBUG" -# ADD RSC /l 0x1009 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "G3DTest - Win32 Release" -# Name "G3DTest - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\main.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="G3D_New" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=G3D_New - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "G3D_New.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "G3D_New.mak" CFG="G3D_New - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "G3D_New - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "G3D_New - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "G3D_New - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x1009 /d "NDEBUG" +# ADD RSC /l 0x1009 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 + +!ELSEIF "$(CFG)" == "G3D_New - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x1009 /d "_DEBUG" +# ADD RSC /l 0x1009 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "G3D_New - Win32 Release" +# Name "G3D_New - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\ImageButtonInstance.h +# End Source File +# Begin Source File + +SOURCE=.\Instance.h +# End Source File +# Begin Source File + +SOURCE=.\PhysicalInstance.h +# End Source File +# Begin Source File + +SOURCE=.\TextButtonInstance.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=.\ImageButtonInstance.cpp +# End Source File +# Begin Source File + +SOURCE=.\Instance.cpp +# End Source File +# Begin Source File + +SOURCE=.\main.cpp +# End Source File +# Begin Source File + +SOURCE=.\PhysicalInstance.cpp +# End Source File +# Begin Source File + +SOURCE=.\TextButtonInstance.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/G3DTest.dsw b/G3D_New.dsw similarity index 84% rename from G3DTest.dsw rename to G3D_New.dsw index 90964d3..91db04b 100644 --- a/G3DTest.dsw +++ b/G3D_New.dsw @@ -1,29 +1,29 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "G3DTest"=.\G3DTest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "G3D_New"=.\G3D_New.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/G3DTest.vcproj b/G3D_New.vcproj similarity index 67% rename from G3DTest.vcproj rename to G3D_New.vcproj index aeacc36..26a2f31 100644 --- a/G3DTest.vcproj +++ b/G3D_New.vcproj @@ -1,311 +1,342 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main.cpp b/main.cpp index 077b923..da4b56d 100644 --- a/main.cpp +++ b/main.cpp @@ -11,7 +11,6 @@ @author Morgan McGuire, matrix@graphics3d.com */ #include -#include "resource.h" #include "Instance.h" #include "PhysicalInstance.h" #include "TextButtonInstance.h" @@ -347,7 +346,7 @@ void OnError(int err, std::string msg = "") std::string emsg = "An unexpected error has occured and DUOM 5 has to quit. We're sorry!" + msg; clearInstances(); //DialogBox(NULL, MAKEINTRESOURCE(IDD_DIALOG1), NULL, NULL); - MessageBox(NULL, emsg.c_str(),"Dynamica Crash", MB_OK); + MessageBoxA(NULL, emsg.c_str(),"Dynamica Crash", MB_OK); exit(err); } @@ -462,7 +461,7 @@ void Demo::onUserInput(UserInput* ui) { std::string ExePath() { char buffer[MAX_PATH]; - GetModuleFileName( NULL, buffer, MAX_PATH ); + GetModuleFileNameA( NULL, buffer, MAX_PATH ); std::string::size_type pos = std::string( buffer ).find_last_of( "\\/" ); return std::string( buffer ).substr( 0, pos); } diff --git a/resource.h b/resource.h deleted file mode 100644 index 2612c21..0000000 --- a/resource.h +++ /dev/null @@ -1,25 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Dialogs.rc -// -#define IDD_TOOLBOX 101 -#define IDD_ABOUT_DIALOG 102 -#define IDR_MENU1 107 -#define IDD_PROPPAGE_SMALL 108 -#define IDC_AXBROWSER1 1001 -#define IDC_SAVE 1004 -#define IDC_LOAD 1005 -#define IDC_LOAD2 1006 -#define ID_FILE_SAVE40004 40004 -#define ID_FILE_QUIT 40005 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 109 -#define _APS_NEXT_COMMAND_VALUE 40006 -#define _APS_NEXT_CONTROL_VALUE 1005 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif