enums

Blocks3D.vcproj

@@ -675,14 +675,26 @@
 				</Filter>
 			</Filter>
 			<Filter
-				Name="Properties"
+				Name="PropertiesV2"
 				>
 				<File
-					RelativePath=".\src\source\Properties\BoolProperty.cpp"
+					RelativePath=".\src\source\PropertiesV2\BoolProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\source\Properties\Property.cpp"
+					RelativePath=".\src\source\PropertiesV2\Color3Property.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\PropertiesV2\Property.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\PropertiesV2\StringProperty.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\PropertiesV2\Vector3Property.cpp"
 					>
 				</File>
 			</Filter>
@@ -960,14 +972,26 @@
 				</Filter>
 			</Filter>
 			<Filter
-				Name="Properties"
+				Name="PropertiesV2"
 				>
 				<File
-					RelativePath=".\src\include\Properties\BoolProperty.h"
+					RelativePath=".\src\include\PropertiesV2\BoolProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\include\Properties\Property.h"
+					RelativePath=".\src\include\PropertiesV2\Color3Property.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\PropertiesV2\Property.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\PropertiesV2\StringProperty.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\PropertiesV2\Vector3Property.h"
 					>
 				</File>
 			</Filter>
@@ -979,6 +1003,14 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="B3DEnum"
+				>
+				<File
+					RelativePath=".\src\include\Enum\B3DEnum.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"

src/include/DataModelV2/Instance.h

@@ -1,6 +1,8 @@
 #pragma once
 #include <G3DAll.h>
 #include "propertyGrid.h"
+#include "PropertiesV2/StringProperty.h"
+#include "PropertiesV2/BoolProperty.h"
 #include "map"
 
 class Instance
@@ -26,12 +28,18 @@ public:
 	void clearChildren();
 	Instance* getParent();
 	virtual Instance* clone() const { return new Instance(*this); }
+	//Deprecated
 	virtual std::vector<PROPGRIDITEM> getProperties();
+	//Deprecated
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+
+	virtual std::vector<Property *> collectProperties();
+
 	int listicon;
 protected:
 	std::string className;
 	Instance* parent;  // Another pointer.
+	//Deprecated
 	PROPGRIDITEM createPGI(LPSTR catalog, LPSTR propName, LPSTR propDesc, LPARAM curVal, INT type, TCHAR choices[] = NULL);
 private:
 	static const std::map<std::string, Instance> g_logLevelsDescriptions;

src/include/DataModelV2/PVInstance.h

@@ -13,9 +13,13 @@ public:
 	virtual void postRender(RenderDevice* rd);
 	virtual std::vector<PROPGRIDITEM> getProperties();
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+	virtual std::vector<Property*> collectProperties();
 	bool nameShown;
 	bool controllerFlagShown;
 	Enum::Controller::Value controller;
+	virtual void makeJoints();
+	virtual void setNameShown(bool nameShown);
+	virtual void setControllerFlagShown(bool controllerFlagShown);
 protected:
 	CoordinateFrame cFrame;
 	static G3D::Color3 getControllerColor(int controller)

src/include/DataModelV2/PartInstance.h

@@ -1,6 +1,8 @@
 #pragma once
 #include "PVInstance.h"
 #include "Enum.h"
+#include "PropertiesV2/Color3Property.h"
+#include "PropertiesV2/Vector3Property.h"
 #define _USE_MATH_DEFINES
 #include <cmath>
 
@@ -59,6 +61,7 @@ public:
 	//Setters
 	void setParent(Instance* parent);
 	void setPosition(Vector3);
+	void setColor(Color3 color);
 	void setVelocity(Vector3);
 	void setRotVelocity(Vector3);
 	void setCFrame(CoordinateFrame);
@@ -83,6 +86,7 @@ public:
 	//Properties
 	virtual std::vector<PROPGRIDITEM> getProperties();
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+	virtual std::vector<Property *> collectProperties();
 private:
 	bool anchored;
 	Vector3 position;

src/include/Enum.h

@@ -1,4 +1,6 @@
 #pragma once
+#include <string>
+#include <map>
 
 namespace Enum
 {
@@ -7,6 +9,30 @@ namespace Enum
 		enum Value {
 			Smooth = 0, Bumps = 1, Hinge = 2, Motor = 3, StepperMotor = 4, Spawn = 5
 		};
+		static std::pair<std::string, Value> map_data[] = {
+			std::make_pair("Smooth", Smooth),
+			std::make_pair("Bumps", Bumps),
+			std::make_pair("Hinge", Hinge),
+			std::make_pair("Motor", Motor),
+			std::make_pair("StepperMotor", StepperMotor),
+			std::make_pair("Spawn", Spawn)
+		};
+		static std::map<std::string, Value> nameMap(map_data,
+		map_data + sizeof map_data / sizeof map_data[0]);
+
+		static Value getByName(std::string name) {
+			if(nameMap.find(name) != nameMap.end()){
+				return nameMap[name];
+			}
+			return Smooth;
+		}
+
+		static std::string getName(Value value) {
+			for (std::map<std::string, Value>::iterator it = nameMap.begin(); it != nameMap.end(); ++it)
+				if (it->second == value)
+					return it->first;
+			return "";
+		}
 	}
 	namespace Shape
 	{

src/include/Enum/B3DEnum.h

@@ -0,0 +1,24 @@
+#pragma once
+
+namespace Enum
+{
+	class B3DEnum {
+		public:
+			B3DEnum(int id, std::string name)
+			{
+				this->id = id;
+				this->name = name;
+			}
+			const int getId() {
+				return id;
+			}
+			const std::string getName() {
+				return name;
+			}
+			virtual B3DEnum getByName(std::string name);
+			virtual B3DEnum getById(int id);
+		private:
+			int id;
+			std::string name;
+	}
+}

src/include/Properties/BoolProperty.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Property.h"
-class BoolProperty : public Property<bool>
-{
-public:
-	BoolProperty(std::string name, bool& value, Instance& owner)
-	{
-		Property<bool>(name, value, owner);
-	}
-	~BoolProperty(void);
-	PROPGRIDITEM getPropGridItem();
-};

src/include/Properties/Property.h

@@ -1,30 +0,0 @@
-#pragma once
-#include "DataModelV2/Instance.h"
-#include <string>
-class Instance;
-
-template <typename T> 
-class Property
-{
-public:
-	Property(std::string name, T& value, Instance& owner)
-	{
-		_value = value;
-		_owner = owner;
-	}
-	~Property(void);
-	const T getValue()
-	{
-		return _value;
-	}
-	const void setValue(T val)
-	{
-		_value = val;
-	}
-	virtual PROPGRIDITEM getPropGridItem();
-	void setProperty(LPPROPGRIDITEM item);
-protected:
-	Instance* _owner;
-	std::string _name;
-	T* _value;
-};

src/include/PropertiesV2/BoolProperty.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "Property.h"
+
+class BoolProperty : public Property
+{
+public:
+	typedef void (Instance::*instanceSetter)(bool); 
+	//Win32 why
+	~BoolProperty(void);
+	BoolProperty(LPSTR name, LPSTR desc, LPSTR catalog, bool value, Instance * owner, instanceSetter setterFunc)
+	:Property(name, desc, catalog, (void*)value, owner) 
+	{
+		this->setterFunc = setterFunc;
+	}
+	const void setValue(bool val){
+		(_owner->*setterFunc)(val);
+		_value = (void *)val;
+	}
+	PROPGRIDITEM getPropGridItem();
+	void setProperty(LPPROPGRIDITEM &pItem);
+private:
+	instanceSetter setterFunc;
+};

src/include/PropertiesV2/Color3Property.h

@@ -0,0 +1,24 @@
+#pragma once
+#include "Property.h"
+
+class Color3Property : public Property
+{
+public:
+	typedef void (Instance::*instanceSetter)(Color3);
+	~Color3Property(void){}; 
+	Color3Property(LPSTR name, LPSTR desc, LPSTR catalog, Color3 value, Instance * owner, instanceSetter setterFunc)
+	:Property(name, desc, catalog, &_value, owner) 
+	{
+		this->_value = value;
+		this->setterFunc = setterFunc;
+	}
+	const void setValue(Color3 val){
+		(_owner->*setterFunc)(val);
+		_value = val;
+	}
+	PROPGRIDITEM getPropGridItem();
+	void setProperty(LPPROPGRIDITEM &pItem);
+private:
+	Color3 _value;
+	instanceSetter setterFunc;
+};

src/include/PropertiesV2/Property.h

@@ -0,0 +1,38 @@
+#pragma once
+#include <G3DAll.h>
+#include "propertyGrid.h"
+
+class Instance;
+
+class Property
+{
+public:
+	Property(LPSTR name, LPSTR desc, LPSTR catalog, Instance * owner){
+		_name = name;
+		_desc = desc;
+		_catalog = catalog;
+		_owner = owner;
+	}
+	Property(LPSTR name, LPSTR desc, LPSTR catalog, void* value, Instance * owner){
+		_name = name;
+		_desc = desc;
+		_catalog = catalog;
+		_owner = owner;
+		_value = value;
+	}
+	~Property(void){}
+	const void* getValue() {
+		return _value;
+	}
+	const LPSTR getName() {
+		return _name;
+	}
+	virtual PROPGRIDITEM getPropGridItem();
+	virtual void setProperty(LPPROPGRIDITEM &pItem);
+protected:
+	Instance* _owner;
+	LPSTR _name;
+	LPSTR _desc;
+	LPSTR _catalog;
+	void* _value;
+};

src/include/PropertiesV2/StringProperty.h

@@ -0,0 +1,24 @@
+#pragma once
+#include "Property.h"
+
+class StringProperty : public Property
+{
+public:
+	typedef void (Instance::*instanceSetter)(std::string);
+	~StringProperty(void){}; 
+	StringProperty(LPSTR name, LPSTR desc, LPSTR catalog, std::string value, Instance * owner, instanceSetter setterFunc)
+	:Property(name, desc, catalog, &_value, owner) 
+	{
+		this->_value = value;
+		this->setterFunc = setterFunc;
+	}
+	const void setValue(std::string val){
+		(_owner->*setterFunc)(val);
+		_value = val;
+	}
+	PROPGRIDITEM getPropGridItem();
+	void setProperty(LPPROPGRIDITEM &pItem);
+private:
+	std::string _value;
+	instanceSetter setterFunc;
+};

src/include/PropertiesV2/Vector3Property.h

@@ -0,0 +1,26 @@
+#pragma once
+#include "Property.h"
+#include <sstream>
+
+class Vector3Property : public Property
+{
+public:
+	typedef void (Instance::*instanceSetter)(Vector3);
+	~Vector3Property(void){}; 
+	Vector3Property(LPSTR name, LPSTR desc, LPSTR catalog, Vector3 value, Instance * owner, instanceSetter setterFunc)
+	:Property(name, desc, catalog, &_value, owner) 
+	{
+		this->_value = value;
+		this->setterFunc = setterFunc;
+	}
+	const void setValue(Vector3 val){
+		(_owner->*setterFunc)(val);
+		_value = val;
+	}
+	PROPGRIDITEM getPropGridItem();
+	void setProperty(LPPROPGRIDITEM &pItem);
+private:
+	Vector3 _value;
+	std::string stringRep;
+	instanceSetter setterFunc;
+};

src/include/PropertyWindow.h

@@ -15,4 +15,5 @@ private:
 	HWND	_explorerComboBox;
 	void	_resize();
 	void	clearExplorer();
+	void	deleteProperties();
 };

src/source/DataModelV2/Instance.cpp

@@ -80,6 +80,13 @@ std::vector<PROPGRIDITEM> Instance::getProperties()
 }
 
 
+std::vector<Property *> Instance::collectProperties()
+{
+	std::vector<Property *> properties;
+	properties.push_back(new StringProperty("Name", "The name of this instance", "Properties", name, this, &Instance::setName));
+	return properties;
+}
+
 
 Instance::~Instance(void)
 {

src/source/DataModelV2/PVInstance.cpp

@@ -63,6 +63,33 @@ static Enum::Controller::Value strEnum(TCHAR * tval)
 }
 
 
+std::vector<Property *> PVInstance::collectProperties()
+{
+	std::vector<Property *> properties = Instance::collectProperties();
+	properties.push_back(new BoolProperty(
+								"NameShown", 
+								"This chooses whether the item name is shown", 
+								"Item", 
+								nameShown, 
+								this, 
+								(BoolProperty::instanceSetter)&PVInstance::setNameShown));
+	properties.push_back(new BoolProperty(
+								"ControllerFlagShown", 
+								"This chooses whether the item's ControllerFlag is shown",
+								"Item", 
+								controllerFlagShown, 
+								this, 
+								(BoolProperty::instanceSetter)&PVInstance::setControllerFlagShown));
+	return properties;
+}
+
+
+void PVInstance::setNameShown(bool nameShown){
+	this->nameShown = nameShown;
+}
+void PVInstance::setControllerFlagShown(bool controllerFlagShown){
+	this->controllerFlagShown = controllerFlagShown;
+}
 
 std::vector<PROPGRIDITEM> PVInstance::getProperties()
 {
@@ -90,6 +117,15 @@ std::vector<PROPGRIDITEM> PVInstance::getProperties()
 
 	return properties;
 }
+
+void PVInstance::makeJoints()
+{
+	for(size_t i = 0; i < children.size(); i++)
+	{
+
+	}
+}
+
 void PVInstance::PropUpdate(LPPROPGRIDITEM &pItem)
 {
 	if(strcmp(pItem->lpszPropName, "NameShown") == 0)

src/source/DataModelV2/PartInstance.cpp

@@ -674,6 +674,49 @@ void PartInstance::PropUpdate(LPPROPGRIDITEM &item)
 	else PVInstance::PropUpdate(item);
 }
 
+void PartInstance::setColor(Color3 color)
+{
+	this->color = color;
+	changed = true;
+}
+
+std::vector<Property *> PartInstance::collectProperties()
+{
+	std::vector<Property *> properties = PVInstance::collectProperties();
+	properties.push_back(new Color3Property(
+								"Color3", 
+								"The color of the selected part", 
+								"Properties", 
+								color, 
+								this, 
+								(Color3Property::instanceSetter)&PartInstance::setColor));
+
+	properties.push_back(new BoolProperty(
+								"Anchored", 
+								"Whether the block can move or not", 
+								"Item", 
+								anchored, 
+								this, 
+								(BoolProperty::instanceSetter)&PartInstance::setAnchored));
+	
+	properties.push_back(new Vector3Property(
+								"Offset", 
+								"The position of the object in the workspace", 
+								"Item", 
+								position, 
+								this, 
+								(Vector3Property::instanceSetter)&PartInstance::setPosition));
+	
+	properties.push_back(new Vector3Property(
+								"Size", 
+								"The size of the object in the workspace", 
+								"Item", 
+								size, 
+								this, 
+								(Vector3Property::instanceSetter)&PartInstance::setSize));
+	return properties;
+}
+
 // This needs to be changed, buffer size of 12 is way too small
 // Crash occurs if you put a huge number in
 char changeTimerTxt[12];

src/source/Properties/BoolProperty.cpp

@@ -1,5 +0,0 @@
-//#include "Properties/BoolProperty.h"
-//PROPGRIDITEM BoolProperty::getPropGridItem()
-//{
-	//return PROPGRIDITEM();
-//}

src/source/Properties/Property.cpp

@@ -1,7 +0,0 @@
-#include "Properties/Property.h"
-
-template <typename T>
-void Property<T>::setProperty(LPPROPGRIDITEM item)
-{
-	_owner->propertiesChanged();
-}

src/source/PropertiesV2/BoolProperty.cpp

@@ -0,0 +1,16 @@
+#include "PropertiesV2/BoolProperty.h"
+
+PROPGRIDITEM BoolProperty::getPropGridItem(){
+	PROPGRIDITEM pItem;
+	PropGrid_ItemInit(pItem);
+	pItem.lpszCatalog=_catalog;
+	pItem.lpszPropName=_name;
+	pItem.lpszPropDesc=_desc;
+	pItem.lpCurValue=_value > 0;
+	pItem.iItemType=PIT_CHECK;
+	return pItem;
+}
+
+void BoolProperty::setProperty(LPPROPGRIDITEM &pItem){
+	setValue(pItem->lpCurValue == TRUE);
+}

src/source/PropertiesV2/Color3Property.cpp

@@ -0,0 +1,21 @@
+#include "PropertiesV2/Color3Property.h"
+
+PROPGRIDITEM Color3Property::getPropGridItem(){
+	PROPGRIDITEM pItem;
+	PropGrid_ItemInit(pItem);
+	pItem.lpszCatalog=_catalog;
+	pItem.lpszPropName=_name;
+	pItem.lpszPropDesc=_desc;
+	pItem.lpCurValue=RGB((_value.r*255),(_value.g*255),(_value.b*255));
+	pItem.iItemType=PIT_COLOR;
+	return pItem;
+}
+
+void Color3Property::setProperty(LPPROPGRIDITEM &pItem){
+
+	setValue(Color3(
+			GetRValue(pItem->lpCurValue)/255.0F,
+			GetGValue(pItem->lpCurValue)/255.0F,
+			GetBValue(pItem->lpCurValue)/255.0F
+		));
+}

src/source/PropertiesV2/Property.cpp

@@ -0,0 +1,14 @@
+#include "PropertiesV2/Property.h"
+
+PROPGRIDITEM Property::getPropGridItem(){
+	PROPGRIDITEM pItem;
+	PropGrid_ItemInit(pItem);
+	pItem.lpszCatalog=_catalog;
+	pItem.lpszPropName=_name;
+	pItem.lpszPropDesc=_desc;
+	pItem.iItemType=PIT_EDIT;
+	return pItem;
+}
+
+void Property::setProperty(LPPROPGRIDITEM &pItem){
+}

src/source/PropertiesV2/StringProperty.cpp

@@ -0,0 +1,16 @@
+#include "PropertiesV2/StringProperty.h"
+
+PROPGRIDITEM StringProperty::getPropGridItem(){
+	PROPGRIDITEM pItem;
+	PropGrid_ItemInit(pItem);
+	pItem.lpszCatalog=_catalog;
+	pItem.lpszPropName=_name;
+	pItem.lpszPropDesc=_desc;
+	pItem.lpCurValue=(LPARAM)_value.c_str();
+	pItem.iItemType=PIT_EDIT;
+	return pItem;
+}
+
+void StringProperty::setProperty(LPPROPGRIDITEM &pItem){
+	setValue((LPSTR)pItem->lpCurValue);
+}

src/source/PropertiesV2/Vector3Property.cpp

@@ -0,0 +1,33 @@
+#include "PropertiesV2/Vector3Property.h"
+
+PROPGRIDITEM Vector3Property::getPropGridItem(){
+	std::stringstream s;
+	s << _value.x << ", " << _value.y << ", " << _value.z;
+	stringRep = s.str();
+	PROPGRIDITEM pItem;
+	PropGrid_ItemInit(pItem);
+	pItem.lpszCatalog=_catalog;
+	pItem.lpszPropName=_name;
+	pItem.lpszPropDesc=_desc;
+	pItem.lpCurValue=(LPARAM)stringRep.c_str();
+	pItem.iItemType=PIT_EDIT;
+	return pItem;
+}
+
+void Vector3Property::setProperty(LPPROPGRIDITEM &pItem){
+
+	std::string str = (LPTSTR)pItem->lpCurValue;
+	std::vector<float> vect;
+	std::stringstream ss(str);
+	float i;
+	while (ss >> i)
+	{
+		vect.push_back(i);
+		if (ss.peek() == ',')
+			ss.ignore();
+	}
+	if(vect.size() == 3)
+	{
+		setValue(Vector3(vect.at(0),vect.at(1),vect.at(2)));
+	}
+}

src/source/PropertyWindow.cpp

@@ -6,7 +6,7 @@
 #include "strsafe.h"
 #include "Application.h"
 
-std::vector<PROPGRIDITEM> prop;
+std::vector<Property*> prop;
 std::vector<Instance*> children;
 Instance * selectedInstance;
 Instance * parent = NULL;
@@ -186,8 +186,15 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                         LPNMHDR pnm = (LPNMHDR)lParam;
                         LPNMPROPGRID lpnmp = (LPNMPROPGRID)pnm;
                         LPPROPGRIDITEM item = PropGrid_GetItemData(pnm->hwndFrom,lpnmp->iIndex);
-						selectedInstance->PropUpdate(item);
-						//propWind->UpdateSelected(selectedInstance);
+						for(size_t i = 0; i < prop.size(); i++)
+						{
+							if(strcmp(item->lpszPropName, prop[i]->getName()) == 0)
+							{
+								prop[i]->setProperty(item);
+							}
+						}
+						//selectedInstance->PropUpdate(item);
+						propWind->UpdateSelected(g_dataModel->getSelectionService()->getSelection());
                     }
 				}
                 break;
@@ -342,6 +349,7 @@ void PropertyWindow::_resize()
 
 void PropertyWindow::UpdateSelected(std::vector<Instance *> instances)
 {
+	deleteProperties();
 	if(instances.size() <= 0)
 	{
 		ClearProperties();
@@ -349,13 +357,13 @@ void PropertyWindow::UpdateSelected(std::vector<Instance *> instances)
 	}
 	Instance * instance = instances[0];
 	PropGrid_ResetContent(_propGrid);
-	prop = instance->getProperties();
+	prop = instance->collectProperties();
 	//if (selectedInstance != instance)
 	{
 		selectedInstance = instance;
 		for(size_t i = 0; i < prop.size(); i++)
 		{
-			::PROPGRIDITEM item = prop.at(i);
+			::PROPGRIDITEM item = prop.at(i)->getPropGridItem();
 			PropGrid_AddItem(_propGrid, &item);
 			//PRGP propgp;
 			//propgp.instance = instance;
@@ -371,6 +379,16 @@ void PropertyWindow::UpdateSelected(std::vector<Instance *> instances)
 
 void PropertyWindow::ClearProperties()
 {
+	deleteProperties();
 	clearExplorer();
 	PropGrid_ResetContent(_propGrid);
+}
+
+void PropertyWindow::deleteProperties()
+{
+	while(prop.size() > 0) {
+		Property * toDelete = prop.back();
+		prop.pop_back();
+		delete toDelete;
+	}
 }