diff --git a/G3DTest.vcproj b/G3DTest.vcproj index b925670..80a844a 100644 --- a/G3DTest.vcproj +++ b/G3DTest.vcproj @@ -74,7 +74,7 @@ /> + + @@ -403,6 +407,10 @@ RelativePath=".\PartType.h" > + + diff --git a/IEBrowser.h b/IEBrowser.h index b03e523..4ee5587 100644 --- a/IEBrowser.h +++ b/IEBrowser.h @@ -1,4 +1,5 @@ //#include "WindowFunctions.h" +#pragma once #include #include //#include diff --git a/Instance.h b/Instance.h index b8aea00..7041b32 100644 --- a/Instance.h +++ b/Instance.h @@ -1,9 +1,11 @@ #include +#include "Property.h" #pragma once class Instance { public: + Property *properties; Instance(void); Instance(const Instance&); virtual ~Instance(void); diff --git a/Property.cpp b/Property.cpp new file mode 100644 index 0000000..fdaa479 --- /dev/null +++ b/Property.cpp @@ -0,0 +1,25 @@ +#include "Property.h" + +Property::Property(std::string title, std::string propName, void * prop, void *(*getFunc)(void), void(*setFunc)(void *)) +{ + this->title = title; + this->propName = propName; + this->prop = prop; + this->getFunc = getFunc; + this->setFunc = setFunc; +} + +Property::~Property(void) +{ +} + + +void Property::setProperty(void * newprop) +{ + this->setFunc(newprop); +} + +void * Property::getProperty() +{ + return this->getFunc(); +} \ No newline at end of file diff --git a/Property.h b/Property.h new file mode 100644 index 0000000..161e66f --- /dev/null +++ b/Property.h @@ -0,0 +1,15 @@ +#pragma once +#include +class Property +{ +public: + std::string title; + std::string propName; + void * prop; + void *(*getFunc)(void); + void(*setFunc)(void *); + void setProperty(void*); + void * getProperty(); + Property(std::string title, std::string propName, void * prop, void *(*getFunc)(void), void(*setFunc)(void *)); + ~Property(void); +}; diff --git a/main.cpp b/main.cpp index fa27457..f1740a3 100644 --- a/main.cpp +++ b/main.cpp @@ -79,7 +79,7 @@ bool dragging = false; Vector2 oldMouse = Vector2(0,0); float moveRate = 0.5; std::vector selectedInstances = std::vector(); -static const std::string PlaceholderName = "Dynamica"; +static const std::string PlaceholderName = "HyperCube"; Demo *usableApp = NULL;