RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

obj loader refactor

Browse Source
This commit is contained in:
h4570
2022-08-08 21:37:51 +02:00
parent 599d44a491
commit a3e4ee8496
24 changed files with 4517 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tutorials/01-hello/src/tutorial_01.cpp
+6 -7
View File
@@ -10,8 +10,8 @@
#include "tutorial_01.hpp"
#include "file/file_utils.hpp"
#include "loaders/3d/md2/md2_loader.hpp"
#include "loaders/3d/tyrobj/tyrobj_loader.hpp"
#include "loaders/3d/md2_loader/md2_loader.hpp"
#include "loaders/3d/obj_loader/obj_loader.hpp"
#include "thread/threading.hpp"
namespace Tyra {
@@ -201,9 +201,9 @@ StaticMesh* getStaticMesh(Renderer* renderer) {
}
StaticMesh* getSkybox(Renderer* renderer) {
TyrobjLoader loader;
ObjLoader loader;
auto* data =
loader.load(FileUtils::fromCwd("skybox/skybox.tyrobj"), 1, 200.0F, true);
loader.load(FileUtils::fromCwd("skybox/skybox.obj"), 1, 200.0F, true);
auto* result = new StaticMesh(*data);
// result->translation.translateZ(-30.0F);
delete data;
@@ -231,9 +231,8 @@ DynamicMesh* getWarrior(Renderer* renderer) {
}
DynamicMesh* getCube(Renderer* renderer) {
TyrobjLoader loader;
auto* data =
loader.load(FileUtils::fromCwd("untitled.tyrobj"), 2, 3.0F, false);
ObjLoader loader;
auto* data = loader.load(FileUtils::fromCwd("untitled.obj"), 2, 3.0F, false);
auto* result = new DynamicMesh(*data);
result->translation.translateZ(-30.0F);