From 7273ee9ce0ec8b00a72434e2b63fb835de8d8bb4 Mon Sep 17 00:00:00 2001 From: DirtPiper Date: Tue, 23 Oct 2018 14:00:28 -0400 Subject: [PATCH] struct removal and stopped parts from moving up --- PropertyWindow.cpp | 12 ++++++------ main.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PropertyWindow.cpp b/PropertyWindow.cpp index c13b272..c9bee73 100644 --- a/PropertyWindow.cpp +++ b/PropertyWindow.cpp @@ -5,12 +5,12 @@ #include "resource.h" #include "PropertyWindow.h" -typedef struct typPRGP { +/*typedef struct typPRGP { Instance* instance; // Declare member types Property ∝ -} PRGP; +} PRGP;*/ -std::vector propvec; +//std::vector propvec; LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { PropertyWindow *propWind = (PropertyWindow *)GetWindowLongPtr(hwnd, GWL_USERDATA); @@ -124,9 +124,9 @@ void PropertyWindow::SetProperties(Instance * instance) { ::PROPGRIDITEM item = prop.at(i).item; PropGrid_AddItem(_propGrid, &item); - PRGP propgp; - propgp.instance = instance; - propgp.prop = prop.at(i); + //PRGP propgp; + //propgp.instance = instance; + //propgp.prop = prop.at(i); } PropGrid_ExpandAllCatalogs(_propGrid); SetWindowLongPtr(_propGrid,GWL_USERDATA,(LONG)this); diff --git a/main.cpp b/main.cpp index 75b8e24..0f1bc7e 100644 --- a/main.cpp +++ b/main.cpp @@ -261,8 +261,8 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button) PhysicalInstance* clonedInstance = (PhysicalInstance*) selectedInstances.at(i)->clone(); newinst.push_back(tempinst); - tempinst->setPosition(Vector3(tempPos.x, tempPos.y + tempSize.y, tempPos.z)); - usableApp->cameraController.centerCamera(selectedInstances.at(0)); + /*tempinst->setPosition(Vector3(tempPos.x, tempPos.y + tempSize.y, tempPos.z)); + usableApp->cameraController.centerCamera(selectedInstances.at(0));*/ } selectedInstances = newinst; }