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

Temporarily set it to legacy load

Browse Source
This commit is contained in:
andreja6
2020-03-08 14:29:37 -07:00
parent f92f01be88
commit 804e329516
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Application.cpp
View File

@@ -31,7 +31,7 @@
#include "DeleteListener.h" #include "DeleteListener.h"
#include "CameraButtonListener.h" #include "CameraButtonListener.h"
#include "RotateButtonListener.h" #include "RotateButtonListener.h"
#define LEGACY_LOAD_G3DFUN_LEVEL
Ray testRay; Ray testRay;
static int cursorid = 0; static int cursorid = 0;
static int cursorOvrid = 0; static int cursorOvrid = 0;
@@ -332,6 +332,8 @@ void eject(PartInstance * colliding, PartInstance * collider)
{ {
if(colliding == collider || !colliding->canCollide || !collider->canCollide) if(colliding == collider || !colliding->canCollide || !collider->canCollide)
return; return;
if(G3D::CollisionDetection::fixedSolidBoxIntersectsFixedSolidBox(collider->getBox(), colliding->getBox()));
collider->setVelocity(collider->getVelocity() - colliding->cFrame.lookVector());
} }
@@ -662,7 +664,8 @@ void Application::onGraphics(RenderDevice* rd) {
glEnableClientState(GL_COLOR_ARRAY); glEnableClientState(GL_COLOR_ARRAY);
glEnableClientState(GL_NORMAL_ARRAY); glEnableClientState(GL_NORMAL_ARRAY);
//if(_dataModel->getWorkspace() != NULL) //if(_dataModel->getWorkspace() != NULL)
_dataModel->getWorkspace()->render(rd);
_dataModel->getWorkspace()->render(rd);
//else throw std::exception("Workspace not found"); //else throw std::exception("Workspace not found");
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_COLOR_ARRAY); glDisableClientState(GL_COLOR_ARRAY);

1
PartInstance.cpp
View File

@@ -1182,6 +1182,7 @@ std::vector<PROPGRIDITEM> PartInstance::getProperties()
(LPARAM)anchored, (LPARAM)anchored,
PIT_CHECK PIT_CHECK
)); ));
sprintf_s(pto, "%g, %g, %g", position.x, position.y, position.z);
properties.push_back(createPGI( properties.push_back(createPGI(
"Item", "Item",
"Offset", "Offset",