This commit is contained in:
Modnark
2022-10-01 17:32:48 -04:00
parent 550962f1e6
commit 2f3cb43807
23 changed files with 228 additions and 221 deletions

View File

@@ -7,6 +7,7 @@
#include "IEBrowser.h"
#include "Mouse.h"
#include "Tool/Tool.h"
#include "XplicitNgine/XplicitNgine.h"
//#include "GuiRoot.h"
class TextButtonInstance;
@@ -75,6 +76,7 @@ class Application { // : public GApp {
HWND _buttonTest;
HWND _hwndRenderer;
DataModelInstance* _dataModel;
XplicitNgine* _xplicitNgine;
G3D::TextureRef shadowMap;
std::string _title;
bool _dragging;

View File

@@ -26,6 +26,7 @@ class CameraController {
void panRight();
void tiltUp();
void tiltDown();
void zoomExtents();
void Zoom(short delta);
bool onMouseWheel(int x, int y, short delta);
GCamera* getCamera();

View File

@@ -2,10 +2,6 @@
#include <G3DAll.h>
#include "propertyGrid.h"
#include "map"
#ifdef NO_SPRINTF
#define sprintf_s sprintf
#endif
//#include "Properties/BoolProperty.h"
class Instance

View File

@@ -1,6 +1,7 @@
#pragma once
#include "instance.h"
#include "enum.h"
#include <ode/ode.h>
class PVInstance :
public Instance

View File

@@ -30,6 +30,8 @@ public:
Color3 color;
bool canCollide;
bool anchored;
dBodyID physBody;
dGeomID physGeom[3];
//Getters
Vector3 getPosition();

View File

@@ -9,5 +9,6 @@ public:
WorkspaceInstance(void);
~WorkspaceInstance(void);
void clearChildren();
void zoomToExtents();
std::vector<PartInstance *> partObjects;
};

View File

@@ -1,6 +1,6 @@
#pragma once
#include "DataModelV2/DataModelInstance.h"
#include "XplicitNgine/XplicitNgine.h"
class Application;
@@ -28,6 +28,7 @@ extern std::vector<Instance*> postRenderStack;
extern std::vector<Instance*> g_selectedInstances;
extern bool running;
extern DataModelInstance* g_dataModel;
extern XplicitNgine* g_xplicitNgine;
extern Application* g_usableApp;
extern GFontRef g_fntdominant;

View File

@@ -0,0 +1,15 @@
#pragma once
#include <ode/ode.h>
#include "DatamodelV2/PartInstance.h"
class XplicitNgine
{
public:
XplicitNgine();
~XplicitNgine();
dWorldID physWorld;
dSpaceID physSpace;
dJointGroupID contactgroup;
void createBody(PartInstance* partInstance);
};

7
src/include/resource.h Normal file
View File

@@ -0,0 +1,7 @@
#define IDC_PROPERTYGRID 2000
#define IDC_STATIC 2
#define IDE_EDIT 105
#define IDI_ICON1 102
#define IDB_BITMAP1 103
#define IDD_DIALOG1 104

View File

@@ -1,5 +0,0 @@
#ifndef WINVER
#define _WIN32_WINNT 0x0400
#define _WIN32_WINDOWS 0x0400
#define WINVER 0x0400
#endif