From 50f1466fe223e1dd0985d00b1d468870dfe1b543 Mon Sep 17 00:00:00 2001 From: maelstrom Date: Sun, 9 Feb 2025 11:35:19 +0100 Subject: [PATCH] fix: change scale to size --- client/src/main.cpp | 12 ++++++------ editor/mainglwidget.cpp | 4 ++-- editor/mainwindow.cpp | 4 ++-- src/objects/part.cpp | 4 ++-- src/objects/part.h | 4 ++-- src/physics/simulation.cpp | 2 +- src/rendering/renderer.cpp | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/client/src/main.cpp b/client/src/main.cpp index 38aa99b..38e80d0 100644 --- a/client/src/main.cpp +++ b/client/src/main.cpp @@ -49,7 +49,7 @@ int main() { workspace()->AddChild(Part::New({ .position = glm::vec3(0, -5, 0), .rotation = glm::vec3(0), - .scale = glm::vec3(512, 1.2, 512), + .size = glm::vec3(512, 1.2, 512), .color = glm::vec3(0.388235, 0.372549, 0.384314), .anchored = true, })); @@ -57,7 +57,7 @@ int main() { workspace()->AddChild(lastPart = Part::New({ .position = glm::vec3(0), .rotation = glm::vec3(0), - .scale = glm::vec3(4, 1.2, 2), + .size = glm::vec3(4, 1.2, 2), .color = glm::vec3(0.639216f, 0.635294f, 0.647059f), })); @@ -157,7 +157,7 @@ void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods workspace()->AddChild(lastPart = Part::New({ .position = camera.cameraPos + camera.cameraFront * glm::vec3(3), .rotation = glm::vec3(0), - .scale = glm::vec3(1, 1, 1), + .size = glm::vec3(1, 1, 1), .color = glm::vec3(1.0f, 0.5f, 0.31f), })); syncPartPhysics(lastPart); @@ -179,15 +179,15 @@ void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods } } else if (mode == 1) { if (key == GLFW_KEY_X && action == GLFW_PRESS) { - lastPart->scale.x += shiftFactor; + lastPart->size.x += shiftFactor; syncPartPhysics(lastPart); } if (key == GLFW_KEY_Y && action == GLFW_PRESS) { - lastPart->scale.y += shiftFactor; + lastPart->size.y += shiftFactor; syncPartPhysics(lastPart); } if (key == GLFW_KEY_Z && action == GLFW_PRESS) { - lastPart->scale.z += shiftFactor; + lastPart->size.z += shiftFactor; syncPartPhysics(lastPart); } } diff --git a/editor/mainglwidget.cpp b/editor/mainglwidget.cpp index 70e662a..f3e51aa 100644 --- a/editor/mainglwidget.cpp +++ b/editor/mainglwidget.cpp @@ -74,7 +74,7 @@ void MainGLWidget::handleObjectDrag(QMouseEvent* evt) { if (!rayHit) return; Data::Vector3 vec = rayHit->worldPoint; - vec = vec + Data::Vector3(rpToGlm(rayHit->worldNormal) * draggingObject->lock()->scale / 2.f); + vec = vec + Data::Vector3(rpToGlm(rayHit->worldNormal) * draggingObject->lock()->size / 2.f); draggingObject->lock()->cframe = draggingObject->lock()->cframe.Rotation() + vec; syncPartPhysics(draggingObject->lock()); } @@ -156,7 +156,7 @@ void MainGLWidget::keyPressEvent(QKeyEvent* evt) { workspace()->AddChild(lastPart = Part::New({ .position = camera.cameraPos + camera.cameraFront * glm::vec3(3), .rotation = glm::vec3(0), - .scale = glm::vec3(1, 1, 1), + .size = glm::vec3(1, 1, 1), .color = glm::vec3(1.0f, 0.5f, 0.31f), })); syncPartPhysics(lastPart); diff --git a/editor/mainwindow.cpp b/editor/mainwindow.cpp index d37f723..ed69f38 100644 --- a/editor/mainwindow.cpp +++ b/editor/mainwindow.cpp @@ -86,7 +86,7 @@ MainWindow::MainWindow(QWidget *parent) workspace()->AddChild(ui->mainWidget->lastPart = Part::New({ .position = glm::vec3(0, -5, 0), .rotation = glm::vec3(0), - .scale = glm::vec3(512, 1.2, 512), + .size = glm::vec3(512, 1.2, 512), .color = glm::vec3(0.388235, 0.372549, 0.384314), .anchored = true, })); @@ -96,7 +96,7 @@ MainWindow::MainWindow(QWidget *parent) workspace()->AddChild(ui->mainWidget->lastPart = Part::New({ .position = glm::vec3(0), .rotation = glm::vec3(0), - .scale = glm::vec3(4, 1.2, 2), + .size = glm::vec3(4, 1.2, 2), .color = glm::vec3(0.639216f, 0.635294f, 0.647059f), })); syncPartPhysics(ui->mainWidget->lastPart); diff --git a/src/objects/part.cpp b/src/objects/part.cpp index 20861cd..30b13a5 100644 --- a/src/objects/part.cpp +++ b/src/objects/part.cpp @@ -60,7 +60,7 @@ Part::Part(): Part(PartConstructParams { .color = Data::Color3(0.639216f, 0.6352 } Part::Part(PartConstructParams params): Instance(&TYPE), cframe(Data::CFrame(params.position, params.rotation)), - scale(params.scale), color(params.color), anchored(params.anchored) { + size(params.size), color(params.color), anchored(params.anchored) { this->memberMap = std::make_unique(MemberMap { .super = std::move(this->memberMap), .members = { @@ -87,7 +87,7 @@ Part::Part(PartConstructParams params): Instance(&TYPE), cframe(Data::CFrame(par .codec = fieldCodecOf(), .updateCallback = memberFunctionOf(&Part::onUpdated, this), } }, { "Size", { - .backingField = &scale, + .backingField = &size, .type = &Data::Vector3::TYPE, .codec = fieldCodecOf(), .updateCallback = memberFunctionOf(&Part::onUpdated, this) diff --git a/src/objects/part.h b/src/objects/part.h index 41205a9..a0ef113 100644 --- a/src/objects/part.h +++ b/src/objects/part.h @@ -16,7 +16,7 @@ namespace rp = reactphysics3d; struct PartConstructParams { glm::vec3 position; glm::quat rotation = glm::identity(); - glm::vec3 scale; + glm::vec3 size; Data::Color3 color; bool anchored = false; @@ -30,7 +30,7 @@ public: const static InstanceType TYPE; Data::CFrame cframe; - glm::vec3 scale; + glm::vec3 size; Data::Color3 color; bool selected = false; diff --git a/src/physics/simulation.cpp b/src/physics/simulation.cpp index 28dd23e..78d2fd8 100644 --- a/src/physics/simulation.cpp +++ b/src/physics/simulation.cpp @@ -53,7 +53,7 @@ void syncPartPhysics(std::shared_ptr part) { part->rigidBody->setTransform(transform); } - rp::BoxShape* shape = physicsCommon->createBoxShape(glmToRp(part->scale * glm::vec3(0.5f))); + rp::BoxShape* shape = physicsCommon->createBoxShape(glmToRp(part->size * glm::vec3(0.5f))); if (part->rigidBody->getNbColliders() > 0) { part->rigidBody->removeCollider(part->rigidBody->getCollider(0)); diff --git a/src/rendering/renderer.cpp b/src/rendering/renderer.cpp index 2393e86..e311483 100644 --- a/src/rendering/renderer.cpp +++ b/src/rendering/renderer.cpp @@ -126,7 +126,7 @@ void renderParts() { // ); glm::mat4 model = part->cframe; - model = glm::scale(model, part->scale); + model = glm::scale(model, part->size); shader->set("model", model); shader->set("material", Material { .diffuse = part->color, @@ -135,7 +135,7 @@ void renderParts() { }); glm::mat3 normalMatrix = glm::mat3(glm::transpose(glm::inverse(model))); shader->set("normalMatrix", normalMatrix); - shader->set("texScale", part->scale); + shader->set("texScale", part->size); CUBE_MESH->bind(); glDrawArrays(GL_TRIANGLES, 0, 36);