From 804e3295167c953a64dacb2339e5c8345b435665 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Sun, 8 Mar 2020 14:29:37 -0700 Subject: [PATCH] Temporarily set it to legacy load --- Application.cpp | 7 +++++-- PartInstance.cpp | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Application.cpp b/Application.cpp index 74d6d95..b5dbe0e 100644 --- a/Application.cpp +++ b/Application.cpp @@ -31,7 +31,7 @@ #include "DeleteListener.h" #include "CameraButtonListener.h" #include "RotateButtonListener.h" - +#define LEGACY_LOAD_G3DFUN_LEVEL Ray testRay; static int cursorid = 0; static int cursorOvrid = 0; @@ -332,6 +332,8 @@ void eject(PartInstance * colliding, PartInstance * collider) { if(colliding == collider || !colliding->canCollide || !collider->canCollide) 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_NORMAL_ARRAY); //if(_dataModel->getWorkspace() != NULL) - _dataModel->getWorkspace()->render(rd); + + _dataModel->getWorkspace()->render(rd); //else throw std::exception("Workspace not found"); glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_COLOR_ARRAY); diff --git a/PartInstance.cpp b/PartInstance.cpp index 4c257d7..1578823 100644 --- a/PartInstance.cpp +++ b/PartInstance.cpp @@ -1182,6 +1182,7 @@ std::vector PartInstance::getProperties() (LPARAM)anchored, PIT_CHECK )); + sprintf_s(pto, "%g, %g, %g", position.x, position.y, position.z); properties.push_back(createPGI( "Item", "Offset",