maelstrom/openblocks
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases 3 Packages Wiki Activity Actions

fix(part): temporarily soft-disabled wedges as they crash the engine currently

Browse source
This commit is contained in:
maelstrom 2025-07-23 03:05:32 +02:00
parent 74a4a01ebf
commit 8b8776cbd7
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/objects/part/wedgepart.cpp
View file

@ -13,6 +13,7 @@ WedgePart::WedgePart(PartConstructParams params): BasePart(&TYPE, params) {
} }
void WedgePart::updateCollider(rp::PhysicsCommon* common) { void WedgePart::updateCollider(rp::PhysicsCommon* common) {
Logger::fatalError("Wedges are currently disabled! Please do not use them or your editor may crash\n");
rp::ConvexMeshShape* shape = common->createConvexMeshShape(wedgePhysMesh, glmToRp(size * glm::vec3(0.5f))); rp::ConvexMeshShape* shape = common->createConvexMeshShape(wedgePhysMesh, glmToRp(size * glm::vec3(0.5f)));
// Recreate the rigidbody if the shape changes // Recreate the rigidbody if the shape changes
@ -87,5 +88,5 @@ void WedgePart::createWedgeShape(rp::PhysicsCommon* common) {
// Create the convex mesh // Create the convex mesh
std::vector<rp3d::Message> messages; std::vector<rp3d::Message> messages;
wedgePhysMesh = common->createConvexMesh(polygonVertexArray, messages); // wedgePhysMesh = common->createConvexMesh(polygonVertexArray, messages);
} }

2
core/src/objects/part/wedgepart.h
View file

@ -3,7 +3,7 @@
#include "basepart.h" #include "basepart.h"
#include "objects/annotation.h" #include "objects/annotation.h"
class DEF_INST WedgePart : public BasePart { class DEF_INST_(hidden) WedgePart : public BasePart {
AUTOGEN_PREAMBLE AUTOGEN_PREAMBLE
protected: protected:

2
editor/panes/explorerview.cpp
View file

@ -107,7 +107,7 @@ void ExplorerView::buildContextMenu() {
contextMenu.addMenu(insertObjectMenu); contextMenu.addMenu(insertObjectMenu);
for (const auto& [_, type] : INSTANCE_MAP) { for (const auto& [_, type] : INSTANCE_MAP) {
if (type->flags & INSTANCE_NOTCREATABLE || !type->constructor) continue; if (type->flags & (INSTANCE_NOTCREATABLE | INSTANCE_HIDDEN) || !type->constructor) continue;
QAction* instAction = new QAction(model.iconOf(type), QString::fromStdString(type->className)); QAction* instAction = new QAction(model.iconOf(type), QString::fromStdString(type->className));
insertObjectMenu->addAction(instAction); insertObjectMenu->addAction(instAction);