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

Datamodel V1.1

Browse Source
This commit is contained in:
andreja6
2018-10-24 19:45:51 -07:00
parent 0f0be7f0b9
commit 4df67897dc
16 changed files with 203 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CameraController.cpp
View File

@@ -1,7 +1,7 @@
#include "CameraController.h"
#include "win32Defines.h"
#include <iostream>
#include "PhysicalInstance.h"
#include "PartInstance.h"
#include "Demo.h"
#include "AudioPlayer.h"
@@ -141,7 +141,7 @@ void CameraController::centerCamera(Instance* selection)
}
else
{
Vector3 partPos = ((PhysicalInstance*)selection)->getPosition()/2;
Vector3 partPos = ((PartInstance*)selection)->getPosition()/2;
lookAt(partPos);
focusPosition=partPos;
zoom=((partPos-frame.translation).magnitude());

1
DataModelInstance.cpp
View File

@@ -15,6 +15,7 @@ DataModelInstance::DataModelInstance(void)
mousey = 0;
mouseButton1Down = false;
showMessage = false;
canDelete = false;
}
DataModelInstance::~DataModelInstance(void)

20
G3DTest.vcproj
View File

@@ -313,6 +313,10 @@
RelativePath=".\DataModelInstance.cpp"
>
</File>
<File
RelativePath=".\GroupInstance.cpp"
>
</File>
<File
RelativePath=".\ImageButtonInstance.cpp"
>
@@ -322,7 +326,11 @@
>
</File>
<File
RelativePath=".\PhysicalInstance.cpp"
RelativePath=".\PartInstance.cpp"
>
</File>
<File
RelativePath=".\PVInstance.cpp"
>
</File>
<File
@@ -410,6 +418,10 @@
RelativePath=".\DataModelInstance.h"
>
</File>
<File
RelativePath=".\GroupInstance.h"
>
</File>
<File
RelativePath=".\ImageButtonInstance.h"
>
@@ -419,7 +431,11 @@
>
</File>
<File
RelativePath=".\PhysicalInstance.h"
RelativePath=".\PartInstance.h"
>
</File>
<File
RelativePath=".\PVInstance.h"
>
</File>
<File

25
GroupInstance.cpp Normal file
View File

@@ -0,0 +1,25 @@
#include "GroupInstance.h"
GroupInstance::GroupInstance(void)
{
PVInstance::PVInstance();
}
GroupInstance::GroupInstance(const GroupInstance &oinst)
{
PVInstance::PVInstance(oinst);
}
GroupInstance::~GroupInstance(void)
{
}
std::vector<PROPGRIDITEM> GroupInstance::getProperties()
{
std::vector<PROPGRIDITEM> properties = PVInstance::getProperties();
return properties;
}
void GroupInstance::PropUpdate(LPPROPGRIDITEM &pItem)
{
PVInstance::PropUpdate(pItem);
}

13
GroupInstance.h Normal file
View File

@@ -0,0 +1,13 @@
#pragma once
#include "PVInstance.h"
class GroupInstance :
public PVInstance
{
public:
GroupInstance(void);
~GroupInstance(void);
GroupInstance(const GroupInstance &oinst);
virtual std::vector<PROPGRIDITEM> getProperties();
virtual void PropUpdate(LPPROPGRIDITEM &pItem);
};

2
Instance.cpp
View File

@@ -9,6 +9,7 @@ Instance::Instance(void)
name = "Default Game Instance";
className = "BaseInstance";
listicon = 0;
canDelete = true;
}
Instance::Instance(const Instance &oinst)
@@ -16,6 +17,7 @@ Instance::Instance(const Instance &oinst)
name = oinst.name;
className = oinst.className;
canDelete = oinst.canDelete;
//setParent(oinst.parent);
}

3
Instance.h
View File

@@ -5,6 +5,7 @@
class Instance
{
public:
bool canDelete;
Instance(void);
Instance(const Instance&);
virtual ~Instance(void);
@@ -12,7 +13,7 @@ public:
virtual void render(RenderDevice*);
std::vector<Instance*> children; // All children.
std::string getClassName();
virtual Instance* findFirstChild(std::string);
Instance* findFirstChild(std::string);
std::vector<Instance* > getChildren();
std::vector<Instance* > getAllChildren();
void setParent(Instance*);

25
PVInstance.cpp Normal file
View File

@@ -0,0 +1,25 @@
#include "PVInstance.h"
PVInstance::PVInstance(void)
{
Instance::Instance();
}
PVInstance::PVInstance(const PVInstance &oinst)
{
Instance::Instance(oinst);
}
PVInstance::~PVInstance(void)
{
}
std::vector<PROPGRIDITEM> PVInstance::getProperties()
{
std::vector<PROPGRIDITEM> properties = Instance::getProperties();
return properties;
}
void PVInstance::PropUpdate(LPPROPGRIDITEM &pItem)
{
Instance::PropUpdate(pItem);
}

13
PVInstance.h Normal file
View File

@@ -0,0 +1,13 @@
#pragma once
#include "instance.h"
class PVInstance :
public Instance
{
public:
PVInstance(void);
~PVInstance(void);
PVInstance(const PVInstance &oinst);
virtual std::vector<PROPGRIDITEM> getProperties();
virtual void PropUpdate(LPPROPGRIDITEM &pItem);
};

39
PhysicalInstance.cpp → PartInstance.cpp
View File

@@ -1,11 +1,11 @@
#include "PhysicalInstance.h"
#include "PartInstance.h"
#include "Globals.h"
PhysicalInstance::PhysicalInstance(void)
PartInstance::PartInstance(void)
{
Instance::Instance();
name = "Default PhysicalInstance";
PVInstance::PVInstance();
name = "Default PartInstance";
className = "Part";
canCollide = true;
anchored = true;
@@ -22,11 +22,12 @@ PhysicalInstance::PhysicalInstance(void)
bottom = Enum::SurfaceType::Smooth;
}
PhysicalInstance::PhysicalInstance(const PhysicalInstance &oinst)
PartInstance::PartInstance(const PartInstance &oinst)
{
Instance::Instance(oinst);
PVInstance::PVInstance(oinst);
//name = oinst.name;
//className = "Part";
name = oinst.name;
canCollide = oinst.canCollide;
setParent(oinst.parent);
anchored = oinst.anchored;
@@ -43,7 +44,7 @@ PhysicalInstance::PhysicalInstance(const PhysicalInstance &oinst)
bottom = oinst.bottom;
}
void PhysicalInstance::setSize(Vector3 newSize)
void PartInstance::setSize(Vector3 newSize)
{
int minsize = 1;
int maxsize = 512;
@@ -71,37 +72,37 @@ void PhysicalInstance::setSize(Vector3 newSize)
}
Vector3 PhysicalInstance::getSize()
Vector3 PartInstance::getSize()
{
return size;
}
Vector3 PhysicalInstance::getPosition()
Vector3 PartInstance::getPosition()
{
return position;
}
void PhysicalInstance::setPosition(Vector3 pos)
void PartInstance::setPosition(Vector3 pos)
{
position = pos;
cFrame = CoordinateFrame(pos);
changed = true;
}
CoordinateFrame PhysicalInstance::getCFrame()
CoordinateFrame PartInstance::getCFrame()
{
return cFrame;
}
void PhysicalInstance::setCFrame(CoordinateFrame coordinateFrame)
void PartInstance::setCFrame(CoordinateFrame coordinateFrame)
{
cFrame = coordinateFrame;
position = coordinateFrame.translation;
changed = true;
}
CoordinateFrame PhysicalInstance::getCFrameRenderBased()
CoordinateFrame PartInstance::getCFrameRenderBased()
{
return CoordinateFrame(getCFrame().rotation,Vector3(getCFrame().translation.x/2, getCFrame().translation.y/2, getCFrame().translation.z/2));
}
Box PhysicalInstance::getBox()
Box PartInstance::getBox()
{
if(changed)
{
@@ -132,12 +133,12 @@ Box PhysicalInstance::getBox()
return itemBox;
}
bool PhysicalInstance::collides(Box box)
bool PartInstance::collides(Box box)
{
return CollisionDetection::fixedSolidBoxIntersectsFixedSolidBox(getBox(), box);
}
void PhysicalInstance::render(RenderDevice* rd)
void PartInstance::render(RenderDevice* rd)
{
if(changed)
Box box = getBox();
@@ -211,14 +212,14 @@ void PhysicalInstance::render(RenderDevice* rd)
}
PhysicalInstance::~PhysicalInstance(void)
PartInstance::~PartInstance(void)
{
}
char pto[512];
char pto2[512];
#include <sstream>
void PhysicalInstance::PropUpdate(LPPROPGRIDITEM &item)
void PartInstance::PropUpdate(LPPROPGRIDITEM &item)
{
if(strcmp(item->lpszPropName, "Color3") == 0)
{
@@ -285,7 +286,7 @@ void PhysicalInstance::PropUpdate(LPPROPGRIDITEM &item)
else Instance::PropUpdate(item);
}
std::vector<PROPGRIDITEM> PhysicalInstance::getProperties()
std::vector<PROPGRIDITEM> PartInstance::getProperties()
{
std::vector<PROPGRIDITEM> properties = Instance::getProperties();

13
PhysicalInstance.h → PartInstance.h
View File

@@ -1,15 +1,14 @@
#pragma once
#include "instance.h"
#include "PVInstance.h"
#include "Enum.h"
class PhysicalInstance :
public Instance
class PartInstance : public PVInstance
{
public:
PhysicalInstance(void);
PhysicalInstance(const PhysicalInstance &oinst);
Instance* clone() const { return new PhysicalInstance(*this); }
~PhysicalInstance(void);
PartInstance(void);
PartInstance(const PartInstance &oinst);
Instance* clone() const { return new PartInstance(*this); }
~PartInstance(void);
virtual void render(RenderDevice*);
Vector3 velocity;
Enum::SurfaceType::Value top;

11
TextButtonInstance.cpp
View File

@@ -58,6 +58,10 @@ void TextButtonInstance::setAllColorsSame()
textOutlineColorDn = textOutlineColor;
boxColorDn = boxColor;
boxOutlineColorDn = boxOutlineColor;
textColorDis = textColor;
textOutlineColorDis = textOutlineColor;
boxColorDis = boxColor;
boxOutlineColorDis = boxOutlineColor;
}
TextButtonInstance::~TextButtonInstance(void)
@@ -80,7 +84,12 @@ void TextButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseD
point2 = Vector3(boxEnd.x, boxEnd.y,0);
}
Vector2 RelativeTo = Vector2(point1.x + fontLocationRelativeTo.x, point1.y + fontLocationRelativeTo.y);
if(mouseInArea(point1.x, point1.y, point2.x, point2.y, mousePos.x, mousePos.y) && mouseDown)
if(disabled)
{
Draw::box(Box(point1, point2), rd, boxColorDis, boxOutlineColorDis);
font->draw2D(rd, title, RelativeTo, textSize, textColorDis, textOutlineColorDis);
}
else if(mouseInArea(point1.x, point1.y, point2.x, point2.y, mousePos.x, mousePos.y) && mouseDown)
{
Draw::box(Box(point1, point2), rd, boxColorDn, boxOutlineColorDn);
font->draw2D(rd, title, RelativeTo, textSize, textColorDn, textOutlineColorDn);

4
TextButtonInstance.h
View File

@@ -21,6 +21,10 @@ public:
Color4 textOutlineColorDn;
Color4 boxColorDn;
Color4 boxOutlineColorDn;
Color4 textColorDis;
Color4 textOutlineColorDis;
Color4 boxColorDis;
Color4 boxOutlineColorDis;
bool centeredWithinBox;
std::string title;
G3D::GFontRef font;

3
WorkspaceInstance.cpp
View File

@@ -3,11 +3,12 @@
WorkspaceInstance::WorkspaceInstance(void)
{
Instance::Instance();
GroupInstance::GroupInstance();
name = "Instance";
className = "Level";
timer = 60.0F;
score = 0;
canDelete = false;
}
WorkspaceInstance::~WorkspaceInstance(void)

5
WorkspaceInstance.h
View File

@@ -1,13 +1,12 @@
#pragma once
#include "instance.h"
#include "GroupInstance.h"
class WorkspaceInstance :
public Instance
public GroupInstance
{
public:
float timer;
int score;
WorkspaceInstance(void);
~WorkspaceInstance(void);
};

79
main.cpp
View File

@@ -20,7 +20,7 @@
#include <iomanip>
#include "Instance.h"
#include "resource.h"
#include "PhysicalInstance.h"
#include "PartInstance.h"
#include "TextButtonInstance.h"
#include "ImageButtonInstance.h"
#include "DataModelInstance.h"
@@ -192,9 +192,9 @@ std::string Convert (float number){
}
PhysicalInstance* makePart()
PartInstance* makePart()
{
PhysicalInstance* part = new PhysicalInstance();
PartInstance* part = new PartInstance();
return part;
}
@@ -246,7 +246,14 @@ public:
void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
{
if(g_selectedInstances.size() > 0)
bool cont = false;
for(size_t i = 0; i < g_selectedInstances.size(); i++)
if(g_selectedInstances.at(i)->canDelete)
{
cont = true;
break;
}
if(cont)
{
AudioPlayer::playSound(dingSound);
if(button->name == "Duplicate")
@@ -254,7 +261,7 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
std::vector<Instance*> newinst;
for(size_t i = 0; i < g_selectedInstances.size(); i++)
{
if(g_selectedInstances.at(i) != dataModel->getWorkspace())
if(g_selectedInstances.at(i)->canDelete)
{
Instance* tempinst = g_selectedInstances.at(i);
@@ -283,7 +290,7 @@ void RotateButtonListener::onButton1MouseClick(BaseButtonInstance* button)
{
Instance* selectedInstance = g_selectedInstances.at(0);
AudioPlayer::playSound(clickSound);
if(PhysicalInstance* part = dynamic_cast<PhysicalInstance*>(selectedInstance))
if(PartInstance* part = dynamic_cast<PartInstance*>(selectedInstance))
{
if(button->name == "Tilt")
part->setCFrame(part->getCFrame()*Matrix3::fromEulerAnglesXYZ(0,0,toRadians(90)));
@@ -302,7 +309,7 @@ void deleteInstance()
size_t undeletable = 0;
while(g_selectedInstances.size() > undeletable)
{
if(g_selectedInstances.at(0) != dataModel && g_selectedInstances.at(0) != dataModel->getWorkspace())
if(g_selectedInstances.at(0)->canDelete)
{
AudioPlayer::playSound(GetFileInPath("/content/sounds/pageturn.wav"));
Instance* selectedInstance = g_selectedInstances.at(0);
@@ -503,7 +510,9 @@ void Demo::initGUI()
button->boxColor = Color4::clear();
button->textSize = 12;
button->title = "Group";
button->setAllColorsSame();
button->name = "Group";
button->setAllColorsSame();
button->textColorDis = Color3(0.8F,0.8F,0.8F);
button->font = fntlighttrek;
button->fontLocationRelativeTo = Vector2(10, 0);
button->setParent(dataModel->getGuiRoot());
@@ -517,7 +526,9 @@ void Demo::initGUI()
button->boxColor = Color4::clear();
button->textSize = 12;
button->title = "UnGroup";
button->name = "UnGroup";
button->setAllColorsSame();
button->textColorDis = Color3(0.8F,0.8F,0.8F);
button->font = fntlighttrek;
button->fontLocationRelativeTo = Vector2(10, 0);
button->setParent(dataModel->getGuiRoot());
@@ -531,6 +542,7 @@ void Demo::initGUI()
button->textSize = 12;
button->title = "Duplicate";
button->setAllColorsSame();
button->textColorDis = Color3(0.8F,0.8F,0.8F);
button->font = fntlighttrek;
button->fontLocationRelativeTo = Vector2(10, 0);
button->setParent(dataModel->getGuiRoot());
@@ -710,7 +722,7 @@ void Demo::onInit() {
initGUI();
PhysicalInstance* test = makePart();
PartInstance* test = makePart();
test->setParent(dataModel->getWorkspace());
test->color = Color3(0.2F,0.3F,1);
test->setSize(Vector3(24,1,24));
@@ -838,14 +850,39 @@ std::vector<Instance*> Demo::getSelection()
}
void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
Instance* obj = dataModel->getGuiRoot()->findFirstChild("Delete");
if(obj != NULL)
Instance * obj6 = dataModel->getGuiRoot()->findFirstChild("Delete");
Instance * obj = dataModel->getGuiRoot()->findFirstChild("Duplicate");
Instance * obj2 = dataModel->getGuiRoot()->findFirstChild("Group");
Instance * obj3 = dataModel->getGuiRoot()->findFirstChild("UnGroup");
Instance * obj4 = dataModel->getGuiRoot()->findFirstChild("Rotate");
Instance * obj5 = dataModel->getGuiRoot()->findFirstChild("Tilt");
if(obj != NULL && obj2 != NULL && obj3 != NULL && obj4 !=NULL && obj5 != NULL && obj6 != NULL)
{
ImageButtonInstance* button = (ImageButtonInstance*)obj;
if(g_selectedInstances.size() <= 0 || g_selectedInstances.at(0) == dataModel->getWorkspace())
button->disabled = true;
else
button->disabled = false;
BaseButtonInstance* button = (BaseButtonInstance*)obj;
BaseButtonInstance* button2 = (BaseButtonInstance*)obj2;
BaseButtonInstance* button3 = (BaseButtonInstance*)obj3;
BaseButtonInstance* button4 = (BaseButtonInstance*)obj4;
BaseButtonInstance* button5 = (BaseButtonInstance*)obj5;
BaseButtonInstance* button6 = (BaseButtonInstance*)obj6;
button->disabled = true;
button2->disabled = true;
button3->disabled = true;
button4->disabled = true;
button5->disabled = true;
button6->disabled = true;
for(size_t i = 0; i < g_selectedInstances.size(); i++)
if(g_selectedInstances.at(i)->canDelete)
{
button->disabled = false;
button2->disabled = false;
button3->disabled = false;
button4->disabled = false;
button5->disabled = false;
button6->disabled = false;
break;
}
}
@@ -913,14 +950,14 @@ void Demo::onUserInput(UserInput* ui) {
if (GetHoldKeyState(VK_LBUTTON)) {
if (dragging) {
PhysicalInstance* part = NULL;
PartInstance* part = NULL;
if(g_selectedInstances.size() > 0)
part = (PhysicalInstance*) g_selectedInstances.at(0);
part = (PartInstance*) g_selectedInstances.at(0);
Ray dragRay = cameraController.getCamera()->worldRay(dataModel->mousex, dataModel->mousey, renderDevice->getViewport());
std::vector<Instance*> instances = dataModel->getWorkspace()->getAllChildren();
for(size_t i = 0; i < instances.size(); i++)
{
if(PhysicalInstance* moveTo = dynamic_cast<PhysicalInstance*>(instances.at(i)))
if(PartInstance* moveTo = dynamic_cast<PartInstance*>(instances.at(i)))
{
float __time = testRay.intersectionTime(moveTo->getBox());
float __nearest=std::numeric_limits<float>::infinity();
@@ -1162,7 +1199,7 @@ void Demo::onGraphics(RenderDevice* rd) {
{
for(size_t i = 0; i < g_selectedInstances.size(); i++)
{
if(PhysicalInstance* part = dynamic_cast<PhysicalInstance*>(g_selectedInstances.at(i)))
if(PartInstance* part = dynamic_cast<PartInstance*>(g_selectedInstances.at(i)))
{
Vector3 size = part->getSize();
Vector3 pos = part->getPosition();
@@ -1291,7 +1328,7 @@ void Demo::onMouseLeftPressed(HWND hwnd,int x,int y)
bool objFound = false;
for(size_t i = 0; i < instances.size(); i++)
{
if(PhysicalInstance* test = dynamic_cast<PhysicalInstance*>(instances.at(i)))
if(PartInstance* test = dynamic_cast<PartInstance*>(instances.at(i)))
{
float time = testRay.intersectionTime(test->getBox());