ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use scene module in editor

Browse source
This commit is contained in:
IlyaShurupov 2024-06-18 17:26:44 +03:00
parent 55f5537a67
commit a0a40f1d04
7 changed files with 78 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

9
3DEditor/applications/Entry.cpp
View file

@ -5,18 +5,17 @@
using namespace tp;
bool loadMeshes(tp::Scene& scene, const std::string& objetsPath);
class EditorGUI : public Application {
public:
EditorGUI() {
Vec2F renderResolution = { 1000, 1000 };
auto canvas = this->mGraphics->getCanvas();
mGui = new EditorWidget<EventHandler, Canvas>(canvas, &geometry, renderResolution);
mGui = new EditorWidget<EventHandler, Canvas>(canvas, &mScene, renderResolution);
loadMeshes(geometry, "rsc/scene.obj");
mScene.load("rsc/scene.obj");
geometry.mCamera.lookAtPoint({ 0, 0, 0 }, { 3, 3, 2 }, { 0, 0, 1 });
mScene.mCamera.lookAtPoint({ 0, 0, 0 }, { 3, 3, 2 }, { 0, 0, 1 });
}
~EditorGUI() override { delete mGui; }
@ -33,7 +32,7 @@ public:
void drawFrame(Canvas* canvas) override { mGui->drawWrapper(*canvas); }
private:
Scene geometry;
Scene mScene;
WidgetManager mWidgetManager;
EditorWidget<EventHandler, Canvas>* mGui;
};

41
3DEditor/applications/SceneLoad.cpp
View file

@ -1,41 +0,0 @@
#include "Scene.hpp"
#include "obj/OBJ_Loader.h"
#include <filesystem>
bool loadMeshes(tp::Scene& scene, const std::string& objetsPath) {
using namespace tp;
objl::Loader Loader;
if (!Loader.LoadFile(objetsPath.c_str())) {
std::cout << "Failed to Load File. May have failed to find it or it was not an .obj file.\n";
return false;
}
for (auto& curMesh : Loader.LoadedMeshes) {
scene.mObjects.append(Object());
auto object = &scene.mObjects.last();
for (auto& vertex : curMesh.Vertices) {
// printf("{ %f, %f, %f }, \n", vertex.Position.X, vertex.Position.Y, vertex.Position.Z);
object->mTopology.Points.append(Vec3F{ vertex.Position.X, vertex.Position.Y, vertex.Position.Z });
object->mTopology.Normals.append(Vec3F{ vertex.Normal.X, vertex.Normal.Y, vertex.Normal.Z });
}
for (int j = 0; j < curMesh.Indices.size(); j += 3) {
uint4 idx1 = (int) curMesh.Indices[j];
uint4 idx2 = (int) curMesh.Indices[j + 1];
uint4 idx3 = (int) curMesh.Indices[j + 2];
// printf("{ %i, %i, %i },\n", idx1, idx2, idx3);
object->mTopology.Indexes.append({ idx1, idx2, idx3 });
}
if (object->mTopology.Normals.size() != object->mTopology.Points.size()) {
printf("Logic error loading normals\n");
}
}
return scene.mObjects.size();
}