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

struct removal and stopped parts from moving up

Browse Source
This commit is contained in:
DirtPiper
2018-10-23 14:00:28 -04:00
parent 1a7cd2e250
commit 7273ee9ce0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PropertyWindow.cpp
View File

@@ -5,12 +5,12 @@
#include "resource.h" #include "resource.h"
#include "PropertyWindow.h" #include "PropertyWindow.h"
typedef struct typPRGP { /*typedef struct typPRGP {
Instance* instance; // Declare member types Instance* instance; // Declare member types
Property ∝ Property ∝
} PRGP; } PRGP;*/
std::vector<PRGP> propvec; //std::vector<PRGP> propvec;
LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
PropertyWindow *propWind = (PropertyWindow *)GetWindowLongPtr(hwnd, GWL_USERDATA); PropertyWindow *propWind = (PropertyWindow *)GetWindowLongPtr(hwnd, GWL_USERDATA);
@@ -124,9 +124,9 @@ void PropertyWindow::SetProperties(Instance * instance)
{ {
::PROPGRIDITEM item = prop.at(i).item; ::PROPGRIDITEM item = prop.at(i).item;
PropGrid_AddItem(_propGrid, &item); PropGrid_AddItem(_propGrid, &item);
PRGP propgp; //PRGP propgp;
propgp.instance = instance; //propgp.instance = instance;
propgp.prop = prop.at(i); //propgp.prop = prop.at(i);
} }
PropGrid_ExpandAllCatalogs(_propGrid); PropGrid_ExpandAllCatalogs(_propGrid);
SetWindowLongPtr(_propGrid,GWL_USERDATA,(LONG)this); SetWindowLongPtr(_propGrid,GWL_USERDATA,(LONG)this);

4
main.cpp
View File

@@ -261,8 +261,8 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
PhysicalInstance* clonedInstance = (PhysicalInstance*) selectedInstances.at(i)->clone(); PhysicalInstance* clonedInstance = (PhysicalInstance*) selectedInstances.at(i)->clone();
newinst.push_back(tempinst); newinst.push_back(tempinst);
tempinst->setPosition(Vector3(tempPos.x, tempPos.y + tempSize.y, tempPos.z)); /*tempinst->setPosition(Vector3(tempPos.x, tempPos.y + tempSize.y, tempPos.z));
usableApp->cameraController.centerCamera(selectedInstances.at(0)); usableApp->cameraController.centerCamera(selectedInstances.at(0));*/
} }
selectedInstances = newinst; selectedInstances = newinst;
} }