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

Made cylinders and spheres act as spheres

Browse Source
This commit is contained in:
FlareMicrosystems
2022-10-01 23:12:55 -07:00
parent ce999d226d
commit d3f9b74ba1
2 changed files with 135 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/source/PropertyWindow.cpp
View File

@@ -7,11 +7,6 @@
#include "strsafe.h" #include "strsafe.h"
#include "Application.h" #include "Application.h"
/*typedef struct typPRGP {
Instance* instance; // Declare member types
Property ∝
} PRGP;*/
std::vector<PROPGRIDITEM> prop; std::vector<PROPGRIDITEM> prop;
std::vector<Instance*> children; std::vector<Instance*> children;
Instance * selectedInstance; Instance * selectedInstance;

12
src/source/XplicitNgine/XplicitNgine.cpp
View File

@@ -73,13 +73,14 @@ void XplicitNgine::createBody(PartInstance* partInstance)
partInstance->physBody = dBodyCreate(physWorld); partInstance->physBody = dBodyCreate(physWorld);
// Create geom // Create geom
if(partInstance->shape == Enum::Shape::Block)
{
partInstance->physGeom[0] = dCreateBox(physSpace, partInstance->physGeom[0] = dCreateBox(physSpace,
partInstance->getSize()[0], partInstance->getSize()[0],
partInstance->getSize()[1], partInstance->getSize()[1],
partInstance->getSize()[2] partInstance->getSize()[2]
); );
// Debug output
dVector3 result; dVector3 result;
dGeomBoxGetLengths(partInstance->physGeom[0], result); dGeomBoxGetLengths(partInstance->physGeom[0], result);
printf("[XplicitNgine] Part Geom Size: %.1f, %.1f, %.1f\n", printf("[XplicitNgine] Part Geom Size: %.1f, %.1f, %.1f\n",
@@ -87,6 +88,15 @@ void XplicitNgine::createBody(PartInstance* partInstance)
result[1], result[1],
result[2] result[2]
); );
}
else
{
partInstance->physGeom[0] = dCreateSphere(physSpace, partInstance->getSize()[0]/2);
}
// Debug output
// Create rigid body // Create rigid body
printf("[XplicitNgine] Created Geom for PartInstance\n"); printf("[XplicitNgine] Created Geom for PartInstance\n");