From 31f745b4be0e2e959fa8b762de5646c28321997b Mon Sep 17 00:00:00 2001
From: adafcaefc <33832514+adafcaefc@users.noreply.github.com>
Date: Tue, 7 Jan 2025 21:49:59 +0700
Subject: [PATCH 1/7] added animated model (need cleanup)
---
Geome3Dash/Geome3Dash.vcxproj | 2 +
Geome3Dash/Geome3Dash.vcxproj.filters | 6 +
Geome3Dash/src/engine/sus3d/Model.h | 54 +-
Geome3Dash/src/hook/LoadingLayer.cpp | 7 +
Geome3Dash/src/impl/engine/AnimatedModel.cpp | 153 +
Geome3Dash/src/impl/engine/AnimatedModel.h | 68 +
Geome3Dash/src/manager/ModelManager.cpp | 1 +
Geome3Dash/src/manager/ModelManager.h | 2 +
Geome3Dash/src/model/PlayerObjectModel.cpp | 25 +-
Geome3Dash/src/model/PlayerObjectModel.h | 3 +
.../animated3d/player/robot/0/fps.txt | 1 +
.../player/robot/0/frame/0/model.mtl | 22 +
.../player/robot/0/frame/0/model.obj | 17971 +++++++++++++++
.../player/robot/0/frame/1/model.mtl | 22 +
.../player/robot/0/frame/1/model.obj | 17971 +++++++++++++++
.../player/robot/0/frame/10/model.mtl | 22 +
.../player/robot/0/frame/10/model.obj | 17968 +++++++++++++++
.../player/robot/0/frame/11/model.mtl | 22 +
.../player/robot/0/frame/11/model.obj | 17967 +++++++++++++++
.../player/robot/0/frame/12/model.mtl | 22 +
.../player/robot/0/frame/12/model.obj | 17967 +++++++++++++++
.../player/robot/0/frame/13/model.mtl | 22 +
.../player/robot/0/frame/13/model.obj | 17972 +++++++++++++++
.../player/robot/0/frame/14/model.mtl | 22 +
.../player/robot/0/frame/14/model.obj | 17965 +++++++++++++++
.../player/robot/0/frame/15/model.mtl | 22 +
.../player/robot/0/frame/15/model.obj | 17965 +++++++++++++++
.../player/robot/0/frame/16/model.mtl | 22 +
.../player/robot/0/frame/16/model.obj | 17974 ++++++++++++++++
.../player/robot/0/frame/17/model.mtl | 22 +
.../player/robot/0/frame/17/model.obj | 17966 +++++++++++++++
.../player/robot/0/frame/18/model.mtl | 22 +
.../player/robot/0/frame/18/model.obj | 17967 +++++++++++++++
.../player/robot/0/frame/19/model.mtl | 22 +
.../player/robot/0/frame/19/model.obj | 17964 +++++++++++++++
.../player/robot/0/frame/2/model.mtl | 22 +
.../player/robot/0/frame/2/model.obj | 17967 +++++++++++++++
.../player/robot/0/frame/20/model.mtl | 22 +
.../player/robot/0/frame/20/model.obj | 17964 +++++++++++++++
.../player/robot/0/frame/21/model.mtl | 22 +
.../player/robot/0/frame/21/model.obj | 17968 +++++++++++++++
.../player/robot/0/frame/22/model.mtl | 22 +
.../player/robot/0/frame/22/model.obj | 17968 +++++++++++++++
.../player/robot/0/frame/23/model.mtl | 22 +
.../player/robot/0/frame/23/model.obj | 17965 +++++++++++++++
.../player/robot/0/frame/24/model.mtl | 22 +
.../player/robot/0/frame/24/model.obj | 17965 +++++++++++++++
.../player/robot/0/frame/25/model.mtl | 22 +
.../player/robot/0/frame/25/model.obj | 17964 +++++++++++++++
.../player/robot/0/frame/26/model.mtl | 22 +
.../player/robot/0/frame/26/model.obj | 17964 +++++++++++++++
.../player/robot/0/frame/27/model.mtl | 22 +
.../player/robot/0/frame/27/model.obj | 17968 +++++++++++++++
.../player/robot/0/frame/28/model.mtl | 22 +
.../player/robot/0/frame/28/model.obj | 17968 +++++++++++++++
.../player/robot/0/frame/29/model.mtl | 22 +
.../player/robot/0/frame/29/model.obj | 17973 +++++++++++++++
.../player/robot/0/frame/3/model.mtl | 22 +
.../player/robot/0/frame/3/model.obj | 17967 +++++++++++++++
.../player/robot/0/frame/30/model.mtl | 22 +
.../player/robot/0/frame/30/model.obj | 17971 +++++++++++++++
.../player/robot/0/frame/4/model.mtl | 22 +
.../player/robot/0/frame/4/model.obj | 17966 +++++++++++++++
.../player/robot/0/frame/5/model.mtl | 22 +
.../player/robot/0/frame/5/model.obj | 17966 +++++++++++++++
.../player/robot/0/frame/6/model.mtl | 22 +
.../player/robot/0/frame/6/model.obj | 17959 +++++++++++++++
.../player/robot/0/frame/7/model.mtl | 22 +
.../player/robot/0/frame/7/model.obj | 17961 +++++++++++++++
.../player/robot/0/frame/8/model.mtl | 22 +
.../player/robot/0/frame/8/model.obj | 17965 +++++++++++++++
.../player/robot/0/frame/9/model.mtl | 22 +
.../player/robot/0/frame/9/model.obj | 17969 +++++++++++++++
.../animated3d/player/robot/0/model.blend | Bin 0 -> 897348 bytes
74 files changed, 557950 insertions(+), 29 deletions(-)
create mode 100644 Geome3Dash/src/impl/engine/AnimatedModel.cpp
create mode 100644 Geome3Dash/src/impl/engine/AnimatedModel.h
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/fps.txt
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/0/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/0/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/1/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/1/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/10/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/10/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/11/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/11/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/12/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/12/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/13/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/13/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/14/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/14/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/15/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/15/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/16/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/16/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/17/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/17/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/18/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/18/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/19/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/19/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/2/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/2/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/20/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/20/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/21/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/21/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/22/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/22/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/23/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/23/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/24/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/24/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/25/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/25/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/26/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/26/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/27/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/27/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/28/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/28/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/29/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/29/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/3/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/3/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/30/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/30/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/4/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/4/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/5/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/5/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/6/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/6/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/7/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/7/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/8/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/8/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/9/model.mtl
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/frame/9/model.obj
create mode 100644 bin/resources/rainixgd.geome3dash/animated3d/player/robot/0/model.blend
diff --git a/Geome3Dash/Geome3Dash.vcxproj b/Geome3Dash/Geome3Dash.vcxproj
index a37feaf0..3fabc0bc 100644
--- a/Geome3Dash/Geome3Dash.vcxproj
+++ b/Geome3Dash/Geome3Dash.vcxproj
@@ -93,6 +93,7 @@
+
@@ -154,6 +155,7 @@
+
diff --git a/Geome3Dash/Geome3Dash.vcxproj.filters b/Geome3Dash/Geome3Dash.vcxproj.filters
index 274b468a..fc5ab35d 100644
--- a/Geome3Dash/Geome3Dash.vcxproj.filters
+++ b/Geome3Dash/Geome3Dash.vcxproj.filters
@@ -225,6 +225,9 @@
Source Files
+
+ Source Files
+
@@ -404,6 +407,9 @@
Header Files
+
+ Header Files
+
diff --git a/Geome3Dash/src/engine/sus3d/Model.h b/Geome3Dash/src/engine/sus3d/Model.h
index eb392a8b..89f4ad12 100644
--- a/Geome3Dash/src/engine/sus3d/Model.h
+++ b/Geome3Dash/src/engine/sus3d/Model.h
@@ -23,35 +23,35 @@ namespace sus3d
glm::vec3 scale = glm::vec3(1.0);
bool visible = 1;
public:
- void setRotation(glm::vec3 rotation) { this->rotation = rotation; }
- void setRotationX(float rotation) { this->rotation.x = rotation; }
- void setRotationY(float rotation) { this->rotation.y = rotation; }
- void setRotationZ(float rotation) { this->rotation.z = rotation; }
- glm::vec3 getRotation() const { return this->rotation; }
- float getRotationX() const { return this->rotation.x; }
- float getRotationY() const { return this->rotation.y; }
- float getRotationZ() const { return this->rotation.z; }
+ virtual void setRotation(glm::vec3 rotation) { this->rotation = rotation; }
+ virtual void setRotationX(float rotation) { this->rotation.x = rotation; }
+ virtual void setRotationY(float rotation) { this->rotation.y = rotation; }
+ virtual void setRotationZ(float rotation) { this->rotation.z = rotation; }
+ virtual glm::vec3 getRotation() const { return this->rotation; }
+ virtual float getRotationX() const { return this->rotation.x; }
+ virtual float getRotationY() const { return this->rotation.y; }
+ virtual float getRotationZ() const { return this->rotation.z; }
- void setPosition(glm::vec3 position) { this->position = position; }
- void setPositionX(float position) { this->position.x = position; }
- void setPositionY(float position) { this->position.y = position; }
- void setPositionZ(float position) { this->position.z = position; }
- glm::vec3 getPosition() const { return this->position; }
- float getPositionX() const { return this->position.x; }
- float getPositionY() const { return this->position.y; }
- float getPositionZ() const { return this->position.z; }
+ virtual void setPosition(glm::vec3 position) { this->position = position; }
+ virtual void setPositionX(float position) { this->position.x = position; }
+ virtual void setPositionY(float position) { this->position.y = position; }
+ virtual void setPositionZ(float position) { this->position.z = position; }
+ virtual glm::vec3 getPosition() const { return this->position; }
+ virtual float getPositionX() const { return this->position.x; }
+ virtual float getPositionY() const { return this->position.y; }
+ virtual float getPositionZ() const { return this->position.z; }
- void setScale(glm::vec3 scale) { this->scale = scale; }
- void setScaleX(float scale) { this->scale.x = scale; }
- void setScaleY(float scale) { this->scale.y = scale; }
- void setScaleZ(float scale) { this->scale.z = scale; }
- glm::vec3 getScale() const { return this->scale; }
- float getScaleX() const { return this->scale.x; }
- float getScaleY() const { return this->scale.y; }
- float getScaleZ() const { return this->scale.z; }
+ virtual void setScale(glm::vec3 scale) { this->scale = scale; }
+ virtual void setScaleX(float scale) { this->scale.x = scale; }
+ virtual void setScaleY(float scale) { this->scale.y = scale; }
+ virtual void setScaleZ(float scale) { this->scale.z = scale; }
+ virtual glm::vec3 getScale() const { return this->scale; }
+ virtual float getScaleX() const { return this->scale.x; }
+ virtual float getScaleY() const { return this->scale.y; }
+ virtual float getScaleZ() const { return this->scale.z; }
- void setVisible(bool visible) { this->visible = visible; }
- bool getVisible() const { return this->visible; }
+ virtual void setVisible(bool visible) { this->visible = visible; }
+ virtual bool getVisible() const { return this->visible; }
virtual ~ModelProtocol() {};
};
@@ -62,7 +62,7 @@ namespace sus3d
public:
std::vector meshes;
static Model* create(const aiScene* scene);
- void render(
+ virtual void render(
ShaderProgram* shaderProgram,
const glm::mat4& view,
const glm::vec3& lightPos,
diff --git a/Geome3Dash/src/hook/LoadingLayer.cpp b/Geome3Dash/src/hook/LoadingLayer.cpp
index 35ba72f8..39dd2c08 100644
--- a/Geome3Dash/src/hook/LoadingLayer.cpp
+++ b/Geome3Dash/src/hook/LoadingLayer.cpp
@@ -99,6 +99,13 @@ namespace g3d
m_fields->queuedModels.push(entry.path());
}
}
+ for (const auto& entry : std::filesystem::recursive_directory_iterator(bms->getABP()))
+ {
+ if (entry.is_regular_file() && entry.path().extension() == ".obj")
+ {
+ m_fields->queuedModels.push(entry.path());
+ }
+ }
}
void initCleanup(ModelManager* bms)
diff --git a/Geome3Dash/src/impl/engine/AnimatedModel.cpp b/Geome3Dash/src/impl/engine/AnimatedModel.cpp
new file mode 100644
index 00000000..fa150ff6
--- /dev/null
+++ b/Geome3Dash/src/impl/engine/AnimatedModel.cpp
@@ -0,0 +1,153 @@
+#include "pch.h"
+
+#include "AnimatedModel.h"
+
+#include "helper/CommonHelper.h"
+#include "manager/ModelManager.h"
+
+namespace g3d
+{
+ bool AnimatedModelInner::setup(const std::filesystem::path& base) {
+ if (!CCNode::init()) { return false; }
+ this->basePath = base;
+ std::cout << "AnimatedModelInner path : " << basePath.string() << '\n';
+ this->fps = std::stof(utils::read_from_file(base / "fps.txt"));
+ size_t indexFrame = 0u;
+ const auto getIdxFrame = [this](const size_t i) { return this->basePath / "frame" / std::to_string(i) / "model.obj"; };
+ while (std::filesystem::exists(getIdxFrame(indexFrame))) {
+ this->models.emplace_back(ModelManager::get()->getModel(getIdxFrame(indexFrame)));
+ indexFrame++;
+ }
+ this->scheduleUpdate();
+ return true;
+ }
+
+ AnimatedModelInner* AnimatedModelInner::create(const std::filesystem::path& base) {
+ auto ret = new AnimatedModelInner();
+ if (!ret || !ret->setup(base)) {
+ delete ret;
+ return nullptr;
+ }
+ return ret;
+ }
+
+ void AnimatedModelInner::update(float dt) {
+ float frameTime = 1.0f / fps;
+ timeAccumulator += dt;
+
+ while (timeAccumulator >= frameTime) {
+ // go into next model
+ timeAccumulator -= frameTime;
+ currentModelIndex = (currentModelIndex + 1) % models.size();
+ }
+ }
+
+ bool AnimatedModel::setup(const std::filesystem::path& base, PlayerObject* player) {
+ if (auto cnode = AnimatedModelInner::create(base)) {
+ this->node = cnode;
+ player->addChild(this->node);
+ return true;
+ }
+ return false;
+ }
+
+ AnimatedModel* AnimatedModel::create(const std::filesystem::path& base, PlayerObject* player) {
+ AnimatedModel* ret = new AnimatedModel();
+ if (!ret || !ret->setup(base, player)) {
+ delete ret;
+ return nullptr;
+ }
+ return ret;
+ }
+
+ void AnimatedModel::setRotation(glm::vec3 rotation) {
+ sus3d::Model::setRotation(rotation);
+ for (auto& model : node->models) {
+ model->setRotation(rotation);
+ }
+ }
+
+ void AnimatedModel::setRotationX(float rotation) {
+ sus3d::Model::setRotationX(rotation);
+ for (auto& model : node->models) {
+ model->setRotationX(rotation);
+ }
+ }
+
+ void AnimatedModel::setRotationY(float rotation) {
+ sus3d::Model::setRotationY(rotation);
+ for (auto& model : node->models) {
+ model->setRotationY(rotation);
+ }
+ }
+
+ void AnimatedModel::setRotationZ(float rotation) {
+ sus3d::Model::setRotationZ(rotation);
+ for (auto& model : node->models) {
+ model->setRotationZ(rotation);
+ }
+ }
+
+ void AnimatedModel::setPosition(glm::vec3 position) {
+ sus3d::Model::setPosition(position);
+ for (auto& model : node->models) {
+ model->setPosition(position);
+ }
+ }
+
+ void AnimatedModel::setPositionX(float position) {
+ sus3d::Model::setPositionX(position);
+ for (auto& model : node->models) {
+ model->setPositionX(position);
+ }
+ }
+
+ void AnimatedModel::setPositionY(float position) {
+ sus3d::Model::setPositionY(position);
+ for (auto& model : node->models) {
+ model->setPositionY(position);
+ }
+ }
+
+ void AnimatedModel::setPositionZ(float position) {
+ sus3d::Model::setPositionZ(position);
+ for (auto& model : node->models) {
+ model->setPositionZ(position);
+ }
+ }
+
+ void AnimatedModel::setScale(glm::vec3 scale) {
+ sus3d::Model::setScale(scale);
+ for (auto& model : node->models) {
+ model->setScale(scale);
+ }
+ }
+
+ void AnimatedModel::setScaleX(float scale) {
+ sus3d::Model::setScaleX(scale);
+ for (auto& model : node->models) {
+ model->setScaleX(scale);
+ }
+ }
+
+ void AnimatedModel::setScaleY(float scale) {
+ sus3d::Model::setScaleY(scale);
+ for (auto& model : node->models) {
+ model->setScaleY(scale);
+ }
+ }
+
+ void AnimatedModel::setScaleZ(float scale) {
+ sus3d::Model::setScaleZ(scale);
+ for (auto& model : node->models) {
+ model->setScaleZ(scale);
+ }
+ }
+
+ void AnimatedModel::setVisible(bool visible) {
+ sus3d::Model::setVisible(visible);
+ for (auto& model : node->models) {
+ model->setVisible(visible);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Geome3Dash/src/impl/engine/AnimatedModel.h b/Geome3Dash/src/impl/engine/AnimatedModel.h
new file mode 100644
index 00000000..3baefd68
--- /dev/null
+++ b/Geome3Dash/src/impl/engine/AnimatedModel.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "engine/sus3d/Mesh.h"
+#include "engine/sus3d/Model.h"
+#include "engine/sus3d/ShaderProgram.h"
+
+namespace g3d
+{
+ class AnimatedModelInner : public CCNode
+ {
+ protected:
+ std::vector