Skip to content

Commit

Permalink
Added groups
Browse files Browse the repository at this point in the history
  • Loading branch information
denis authored and denis committed Nov 10, 2024
1 parent 003f76e commit 672d8ce
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Engine/include/Physics/Physics.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace Prisma

struct CollisionData
{
Collider collider;
Collider collider = Collider::BOX_COLLIDER;
float mass = 0.0f;
bool dynamic = false;
bool softBody = false;
Expand Down
5 changes: 1 addition & 4 deletions GUI/src/MeshInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ void Prisma::MeshInfo::showSelected(const NodeViewer::NodeData& meshData)
{
if (meshData.node)
{
NodeViewer::NodeData parentData = meshData;
parentData.node = parentData.node->parent();

std::shared_ptr<PhysicsMeshComponent> physicsComponent = nullptr;
for (auto component : meshData.node->components())
{
Expand All @@ -24,7 +21,7 @@ void Prisma::MeshInfo::showSelected(const NodeViewer::NodeData& meshData)
auto mesh = dynamic_cast<Prisma::Mesh*>(meshData.node);
auto isAnimate = dynamic_cast<AnimatedMesh*>(meshData.node);

NodeViewer::getInstance().showSelected(parentData, false);
NodeViewer::getInstance().showSelected(meshData, false);
ImGui::Dummy(ImVec2(0.0f, 4.0f));

if (mesh)
Expand Down

0 comments on commit 672d8ce

Please sign in to comment.