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

Made class name getter, can not be set outside of class

Browse Source
This commit is contained in:
andreja6
2018-04-30 21:43:02 -07:00
parent 529821ab9f
commit 9986f2ee5f
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Instance.cpp
View File

@@ -4,12 +4,13 @@
std::string name; std::string name;
Instance* parent; Instance* parent;
static std::string className = "DataModel"; std::vector<Instance* > children;
static std::string className = "BaseInstance";
Instance::Instance(void) Instance::Instance(void)
{ {
name = "Default Game Instance"; name = "Default Game Instance";
className = "DataModel"; className = "BaseInstance";
} }
Instance::~Instance(void) Instance::~Instance(void)
@@ -17,6 +18,11 @@ Instance::~Instance(void)
name = "Default Game Instance"; name = "Default Game Instance";
} }
std::string Instance::getClassName()
{
return className;
}

3
Instance.h
View File

@@ -8,5 +8,8 @@ public:
virtual ~Instance(void); virtual ~Instance(void);
std::string name; std::string name;
Instance* parent; // Another pointer. Instance* parent; // Another pointer.
std::vector<Instance*> children; // All children.
std::string getClassName();
protected:
std::string className; std::string className;
}; };

12
main.cpp
View File

@@ -299,7 +299,7 @@ void RotateButtonListener::onButton1MouseClick(BaseButtonInstance* button)
if(selectedInstance != NULL) if(selectedInstance != NULL)
{ {
AudioPlayer::PlaySound(clickSound); AudioPlayer::PlaySound(clickSound);
if(selectedInstance->className == "Part") if(selectedInstance->getClassName() == "Part")
{ {
PhysicalInstance* part = (PhysicalInstance*) selectedInstance; PhysicalInstance* part = (PhysicalInstance*) selectedInstance;
if(button->name == "Tilt") if(button->name == "Tilt")
@@ -1122,7 +1122,7 @@ void Demo::onUserInput(UserInput* ui) {
bool onGUI = false; bool onGUI = false;
for(size_t i = 0; i < instances_2D.size(); i++) for(size_t i = 0; i < instances_2D.size(); i++)
{ {
if(instances_2D.at(i)->className == "TextButton" || instances_2D.at(i)->className == "ImageButton") if(instances_2D.at(i)->getClassName() == "TextButton" || instances_2D.at(i)->getClassName() == "ImageButton")
{ {
BaseButtonInstance* button = (BaseButtonInstance*)instances_2D.at(i); BaseButtonInstance* button = (BaseButtonInstance*)instances_2D.at(i);
if(button->mouseInButton(ui->mouseXY().x, ui->mouseXY().y, app->renderDevice)) if(button->mouseInButton(ui->mouseXY().x, ui->mouseXY().y, app->renderDevice))
@@ -1140,7 +1140,7 @@ void Demo::onUserInput(UserInput* ui) {
Vector3 camPos = app->debugCamera.getCoordinateFrame().translation; Vector3 camPos = app->debugCamera.getCoordinateFrame().translation;
for(size_t i = 0; i < instances.size(); i++) for(size_t i = 0; i < instances.size(); i++)
{ {
if(instances.at(i)->className == "Part" && instances.at(i)->parent == dataModel) if(instances.at(i)->getClassName() == "Part" && instances.at(i)->parent == dataModel)
{ {
PhysicalInstance* test = (PhysicalInstance*)instances.at(i); PhysicalInstance* test = (PhysicalInstance*)instances.at(i);
float time = testRay.intersectionTime(test->getBox()); float time = testRay.intersectionTime(test->getBox());
@@ -1167,7 +1167,7 @@ void Demo::onUserInput(UserInput* ui) {
for(size_t i = 0; i < instances_2D.size(); i++) for(size_t i = 0; i < instances_2D.size(); i++)
{ {
if(instances_2D.at(i)->className == "TextButton" || instances_2D.at(i)->className == "ImageButton") if(instances_2D.at(i)->getClassName() == "TextButton" || instances_2D.at(i)->getClassName() == "ImageButton")
{ {
BaseButtonInstance* button = (BaseButtonInstance*)instances_2D.at(i); BaseButtonInstance* button = (BaseButtonInstance*)instances_2D.at(i);
if(button->mouseInButton(ui->mouseXY().x, ui->mouseXY().y, app->renderDevice)) if(button->mouseInButton(ui->mouseXY().x, ui->mouseXY().y, app->renderDevice))
@@ -1237,7 +1237,7 @@ void drawButtons(RenderDevice* rd)
for(size_t i = 0; i < instances_2D.size(); i++) for(size_t i = 0; i < instances_2D.size(); i++)
{ {
Instance* instance = instances_2D.at(i); Instance* instance = instances_2D.at(i);
if((instance->className == "TextButton" || instance->className == "ImageButton") && instance->parent == dataModel) if((instance->getClassName() == "TextButton" || instance->getClassName() == "ImageButton") && instance->parent == dataModel)
{ {
BaseButtonInstance* tbi = (BaseButtonInstance*)instance; BaseButtonInstance* tbi = (BaseButtonInstance*)instance;
tbi->drawObj(rd, Vector2(mousex, mousey), mouseButton1Down); tbi->drawObj(rd, Vector2(mousex, mousey), mouseButton1Down);
@@ -1451,7 +1451,7 @@ void Demo::onGraphics(RenderDevice* rd) {
for(size_t i = 0; i < instances.size(); i++) for(size_t i = 0; i < instances.size(); i++)
{ {
Instance* instance = instances.at(i); Instance* instance = instances.at(i);
if(instance->className == "Part" && instance->parent != NULL) if(instance->getClassName() == "Part" && instance->parent != NULL)
{ {
PhysicalInstance* part = (PhysicalInstance*)instance; PhysicalInstance* part = (PhysicalInstance*)instance;