diff --git a/G3D_Application.aps b/Dialogs.aps similarity index 71% rename from G3D_Application.aps rename to Dialogs.aps index df0ba65..51701b7 100644 Binary files a/G3D_Application.aps and b/Dialogs.aps differ diff --git a/Dialogs.rc b/Dialogs.rc new file mode 100644 index 0000000..b346945 --- /dev/null +++ b/Dialogs.rc @@ -0,0 +1,109 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// English (Canada) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENC) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUT_DIALOG DIALOGEX 0, 0, 226, 151 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,169,130,50,14 + PUSHBUTTON "Cancel",IDCANCEL,112,130,50,14 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_ABOUT_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 219 + TOPMARGIN, 7 + BOTTOMMARGIN, 144 + END +END +#endif // APSTUDIO_INVOKED + +#endif // English (Canada) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/G3D_Application.dsp b/G3DTest.dsp similarity index 77% rename from G3D_Application.dsp rename to G3DTest.dsp index e658867..acdea3a 100644 --- a/G3D_Application.dsp +++ b/G3DTest.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="G3D_New" - Package Owner=<4> +# 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=G3D_New - Win32 Debug +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 "G3D_New.mak". +!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 "G3D_New.mak" CFG="G3D_New - Win32 Debug" +!MESSAGE NMAKE /f "G3DTest.mak" CFG="G3DTest - 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 "G3DTest - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "G3DTest - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "G3D_New - Win32 Release" +!IF "$(CFG)" == "G3DTest - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -54,7 +54,7 @@ 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" +!ELSEIF "$(CFG)" == "G3DTest - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -83,55 +83,23 @@ LINK32=link.exe # Begin Target -# Name "G3D_New - Win32 Release" -# Name "G3D_New - Win32 Debug" +# 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" -# 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 +# End Group +# Begin Group "Header Files" -SOURCE=.\PhysicalInstance.cpp -# End Source File -# Begin Source File +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" -SOURCE=.\TextButtonInstance.cpp -# End Source File +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # End Target # End Project diff --git a/G3D_Application.dsw b/G3DTest.dsw similarity index 89% rename from G3D_Application.dsw rename to G3DTest.dsw index 91db04b..49454be 100644 --- a/G3D_Application.dsw +++ b/G3DTest.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "G3D_New"=.\G3D_New.dsp - Package Owner=<4> +Project: "G3DTest"=.\G3DTest.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/G3DTest.opt b/G3DTest.opt new file mode 100644 index 0000000..4a8ac1e Binary files /dev/null and b/G3DTest.opt differ diff --git a/G3DTest.plg b/G3DTest.plg new file mode 100644 index 0000000..7ea12a6 --- /dev/null +++ b/G3DTest.plg @@ -0,0 +1,32 @@ + + +
+

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/G3D_Application.sln b/G3DTest.sln similarity index 54% rename from G3D_Application.sln rename to G3DTest.sln index 55d2d97..20ae2ac 100644 --- a/G3D_Application.sln +++ b/G3DTest.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "G3D_Application", "G3D_Application.vcproj", "{583B17DE-1A0C-4070-801A-021DC0C84B0C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "G3DTest", "G3DTest.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -9,10 +9,10 @@ Global 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 + {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 diff --git a/G3D_Application.vcproj b/G3DTest.vcproj similarity index 67% rename from G3D_Application.vcproj rename to G3DTest.vcproj index c8c4c0c..74b0e2c 100644 --- a/G3D_Application.vcproj +++ b/G3DTest.vcproj @@ -2,9 +2,9 @@ - - - - - - - - - - - - - - - - - - - - @@ -186,7 +92,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -231,112 +313,11 @@ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/Instance.cpp b/Instance.cpp index f28c8e5..d54e945 100644 --- a/Instance.cpp +++ b/Instance.cpp @@ -1,3 +1,4 @@ +#define WINVER 0x0400 #include #include "Instance.h" diff --git a/Work.cpp b/Work.cpp new file mode 100644 index 0000000..9666bc9 --- /dev/null +++ b/Work.cpp @@ -0,0 +1,40 @@ +// Work.cpp : implementation file +// +#define WINVER 0x0400 +#include "stdafx.h" +#include "Work.h" + + +// Work dialog + +IMPLEMENT_DYNAMIC(Work, CDialog) + +Work::Work(CWnd* pParent /*=NULL*/) + : CDialog(Work::IDD, pParent) +{ + +} + +Work::~Work() +{ +} + +void Work::DoDataExchange(CDataExchange* pDX) +{ + CDialog::DoDataExchange(pDX); +} + + +BEGIN_MESSAGE_MAP(Work, CDialog) + ON_BN_CLICKED(IDOK, &Work::OnBnClickedOk) +END_MESSAGE_MAP() + + +// Work message handlers + +void Work::OnBnClickedOk() +{ + // TODO: Add your control notification handler code here + this->DestroyWindow(); + OnOK(); +} diff --git a/Work.h b/Work.h new file mode 100644 index 0000000..173ce9f --- /dev/null +++ b/Work.h @@ -0,0 +1,23 @@ +#pragma once +#include "resource.h" + +// Work dialog + +class Work : public CDialog +{ + DECLARE_DYNAMIC(Work) + +public: + Work(CWnd* pParent = NULL); // standard constructor + virtual ~Work(); + +// Dialog Data + enum { IDD = IDD_ABOUT_DIALOG }; + +protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + + DECLARE_MESSAGE_MAP() +public: + afx_msg void OnBnClickedOk(); +}; diff --git a/main.cpp b/main.cpp index da4b56d..8ed0ec0 100644 --- a/main.cpp +++ b/main.cpp @@ -10,6 +10,8 @@ @author Morgan McGuire, matrix@graphics3d.com */ +//Compile for 95 and higher +#define WINVER 0x0400 #include #include "Instance.h" #include "PhysicalInstance.h" diff --git a/resource.h b/resource.h new file mode 100644 index 0000000..3d988c8 --- /dev/null +++ b/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Dialogs.rc +// +#define IDD_ABOUT_DIALOG 102 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 105 +#define _APS_NEXT_COMMAND_VALUE 40004 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/stdafx.h b/stdafx.h new file mode 100644 index 0000000..94c7e16 --- /dev/null +++ b/stdafx.h @@ -0,0 +1,4 @@ +#pragma once +#define _AFXDLL 1 +#include +