CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed MFC

Browse Source
This commit is contained in:
andreja6
2018-04-22 12:32:37 -07:00
parent 19913cb665
commit 49c117d5d7
5 changed files with 15 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
G3DTest.vcproj
View File

@@ -274,10 +274,6 @@
RelativePath=".\TextButtonInstance.cpp" RelativePath=".\TextButtonInstance.cpp"
> >
</File> </File>
<File
RelativePath=".\Work.cpp"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Header Files" Name="Header Files"
@@ -303,18 +299,10 @@
RelativePath=".\resource.h" RelativePath=".\resource.h"
> >
</File> </File>
<File
RelativePath=".\stdafx.h"
>
</File>
<File <File
RelativePath=".\TextButtonInstance.h" RelativePath=".\TextButtonInstance.h"
> >
</File> </File>
<File
RelativePath=".\Work.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

40
Work.cpp
View File

@@ -1,40 +0,0 @@
// 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();
}

23
Work.h
View File

@@ -1,23 +0,0 @@
#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();
};

20
main.cpp
View File

@@ -10,13 +10,12 @@
@author Morgan McGuire, matrix@graphics3d.com @author Morgan McGuire, matrix@graphics3d.com
*/ */
//Compile for 95 and higher
#define WINVER 0x0400
#include <G3DAll.h> #include <G3DAll.h>
#include "Instance.h" #include "Instance.h"
#include "PhysicalInstance.h" #include "PhysicalInstance.h"
#include "TextButtonInstance.h" #include "TextButtonInstance.h"
#if G3D_VER < 61000 #if G3D_VER < 61000
#error Requires G3D 6.10 #error Requires G3D 6.10
#endif #endif
@@ -26,8 +25,8 @@ static const std::string VERSION = "PRE-ALPHA ";
static std::vector<Instance*> instances; static std::vector<Instance*> instances;
static std::vector<Instance*> instances_2D; static std::vector<Instance*> instances_2D;
static Instance* dataModel; static Instance* dataModel;
static GFontRef fntdominant = NULL; GFontRef fntdominant = NULL;
static GFontRef fntlighttrek = NULL; GFontRef fntlighttrek = NULL;
static bool democ = true; static bool democ = true;
static std::string message = ""; static std::string message = "";
static G3D::RealTime messageTime = 0; static G3D::RealTime messageTime = 0;
@@ -250,6 +249,7 @@ void Demo::onInit() {
initGUI(); initGUI();
PhysicalInstance* test = makePart(); PhysicalInstance* test = makePart();
test->parent = dataModel; test->parent = dataModel;
test->color = Color3(0.2F,0.3F,1); test->color = Color3(0.2F,0.3F,1);
@@ -257,6 +257,7 @@ void Demo::onInit() {
test = makePart(); test = makePart();
test->parent = dataModel; test->parent = dataModel;
test->color = Color3(.5F,1,.5F); test->color = Color3(.5F,1,.5F);
@@ -324,6 +325,7 @@ void Demo::onInit() {
setDesiredFrameRate(FPSVal[index]); setDesiredFrameRate(FPSVal[index]);
app->debugCamera.setPosition(Vector3(0, 2, 10)); app->debugCamera.setPosition(Vector3(0, 2, 10));
app->debugCamera.lookAt(Vector3(0, 2, 0)); app->debugCamera.lookAt(Vector3(0, 2, 0));
@@ -359,6 +361,12 @@ void Demo::onCleanup() {
go->~Texture(); go->~Texture();
go_ovr->~Texture(); go_ovr->~Texture();
go_dn->~Texture(); go_dn->~Texture();
go_dn.~ReferenceCountedPointer();
delete go_dn.pointer();
go.~ReferenceCountedPointer();
delete go.pointer();
go_ovr.~ReferenceCountedPointer();
delete go_ovr.pointer();
app->sky->~Sky(); app->sky->~Sky();
} }
@@ -470,7 +478,7 @@ void Demo::onUserInput(UserInput* ui) {
std::string ExePath() { std::string ExePath() {
char buffer[MAX_PATH]; char buffer[MAX_PATH];
GetModuleFileNameA( NULL, buffer, MAX_PATH ); GetModuleFileName( NULL, buffer, MAX_PATH );
std::string::size_type pos = std::string( buffer ).find_last_of( "\\/" ); std::string::size_type pos = std::string( buffer ).find_last_of( "\\/" );
return std::string( buffer ).substr( 0, pos); return std::string( buffer ).substr( 0, pos);
} }
@@ -704,6 +712,8 @@ App::~App() {
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {
//_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
//_CrtSetBreakAlloc(1279);
GAppSettings settings; GAppSettings settings;
if(getOSVersion() > 5.0) if(getOSVersion() > 5.0)
settings.window.defaultIconFilename = GetFileInPath("/content/images/rico.png"); settings.window.defaultIconFilename = GetFileInPath("/content/images/rico.png");

4
stdafx.h
View File

@@ -1,4 +0,0 @@
#pragma once
#define _AFXDLL 1
#include <afxwin.h>