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

Physics kinda sorta?

Browse Source
This commit is contained in:
andreja6
2020-03-08 15:44:13 -07:00
parent 804e329516
commit 4ff4d54f09
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Application.cpp
View File

@@ -332,8 +332,8 @@ void eject(PartInstance * colliding, PartInstance * collider)
{ {
if(colliding == collider || !colliding->canCollide || !collider->canCollide) if(colliding == collider || !colliding->canCollide || !collider->canCollide)
return; return;
if(G3D::CollisionDetection::fixedSolidBoxIntersectsFixedSolidBox(collider->getBox(), colliding->getBox())); if(G3D::CollisionDetection::fixedSolidBoxIntersectsFixedSolidBox(collider->getBox(), colliding->getBox()))
collider->setVelocity(collider->getVelocity() - colliding->cFrame.lookVector()); collider->setVelocity(collider->getVelocity().reflectionDirection(colliding->cFrame.upVector())/1.3);
} }

1
Instance.cpp
View File

@@ -3,6 +3,7 @@
#include "Instance.h" #include "Instance.h"
Instance::Instance(void) Instance::Instance(void)
{ {
parent = NULL; parent = NULL;

4
Instance.h
View File

@@ -1,6 +1,7 @@
#pragma once #pragma once
#include <G3DAll.h> #include <G3DAll.h>
#include "propertyGrid.h" #include "propertyGrid.h"
#include "map"
class Instance class Instance
{ {
@@ -31,5 +32,6 @@ protected:
std::string className; std::string className;
Instance* parent; // Another pointer. Instance* parent; // Another pointer.
PROPGRIDITEM createPGI(LPSTR catalog, LPSTR propName, LPSTR propDesc, LPARAM curVal, INT type, TCHAR choices[] = NULL); 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;
}; };