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

removed md2_model

Browse Source
This commit is contained in:
Sandro Sobczyński
2020-11-01 18:13:24 +01:00
parent 200fa3e4d5
commit 138ab762ba
14 changed files with 154 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/samples/ari/Makefile
+1 -2
View File
@@ -5,7 +5,6 @@ EE_OBJS = \
../../engine/models/math/plane.o \
../../engine/models/math/point.o \
../../engine/models/math/vector3.o \
../../engine/models/md2_model.o \
../../engine/models/mesh_frame.o \
../../engine/models/mesh_material.o \
../../engine/models/mesh.o \
@@ -51,7 +50,7 @@ all: $(EE_BIN)
$(EE_DVP) $< -o $@
clean:
rm -f $(EE_BIN) $(EE_OBJS)
rm -f $(EE_OBJS)
include $(PS2SDK)/samples/Makefile.pref
include $(PS2SDK)/samples/Makefile.eeglobal
src/samples/ari/ari.cpp
+28 -18
View File
@@ -79,14 +79,23 @@ void Ari::onInit()
texRepo = engine.renderer->getTextureRepository();
// engine.audio.play();
Vector3 islandPos = Vector3(0.0F, 10.0F, 0.0F);
island = new Mesh();
island->rotation.x = -1.6F;
island->loadDff("sunnyisl/", "sunnyisl.dff", islandPos, 0.1F);
texRepo->addByMesh("sunnyisl/", *island);
island->shouldBeFrustumCulled = false;
// Vector3 islandPos = Vector3(0.0F, 10.0F, 0.0F);
// island = new Mesh();
// island->rotation.x = -1.6F;
// island->loadDff("sunnyisl/", "sunnyisl.dff", islandPos, 0.1F);
// texRepo->addByMesh("sunnyisl/", *island);
// island->shouldBeFrustumCulled = false;
// island->shouldBeBackfaceCulled = true;
test = new Mesh();
Vector3 initPos = Vector3(0.00F, 00.00F, 0.00F);
test->loadMD2("warrior/", "warrior", initPos, 0.2F, true);
texRepo->addByMesh("warrior/", *test);
test->rotation.x = -1.6F;
test->playAnimation(0, 25);
// test->shouldBeBackfaceCulled = false;
// test->shouldBeFrustumCulled = false;
// islandAddons = new Mesh();
// islandAddons->rotation.x = -1.6F;
// islandAddons->loadDff("sunnyisl/", "sunnyisl3.dff", islandPos, 0.1F);
@@ -104,18 +113,19 @@ void Ari::onInit()
// test->playAnimation(0, 0);
// test->shouldBeBackfaceCulled = true;
// TODO 1 - Merge dff/md2
// TODO 2 - Refactor
// TODO 3 - Destructor
// TODO 4 - Mesh copy();
// TODO 1 - Merge md2
// TODO 2 - Refactor mesh, loaders
// TODO 3 - const & in parameters
// TODO 4 - Destructor
// TODO 5 - Mesh copy();
// test->shouldBeFrustumCulled = true;
skybox = new Mesh();
Vector3 skyboxPos = Vector3(0.0F, 10.0F, 0.0F);
skybox->loadObj("skybox/", "skybox", skyboxPos, 80.0F, 1, false);
skybox->shouldBeFrustumCulled = true;
texRepo->addByMesh("skybox/", *skybox);
// skybox = new Mesh();
// Vector3 skyboxPos = Vector3(0.0F, 10.0F, 0.0F);
// skybox->loadObj("skybox/", "skybox", skyboxPos, 80.0F, 1, false);
// skybox->shouldBeFrustumCulled = true;
// texRepo->addByMesh("skybox/", *skybox);
// waterFloors = new Mesh *[WATER_TILES_COUNT];
// spirals = new Point[WATER_TILES_COUNT];
@@ -153,9 +163,9 @@ void Ari::onUpdate()
if (engine.pad.isCrossClicked)
printf("FPS:%f\n", engine.fps);
camera->update(engine.pad, player->mesh);
// engine.renderer->draw(test);
engine.renderer->draw(skybox);
engine.renderer->draw(island);
engine.renderer->draw(test);
// engine.renderer->draw(skybox);
// engine.renderer->draw(island);
// engine.renderer->draw(islandAddons);
// // engine.renderer->draw(&player->mesh);
// for (u8 i = 0; i < WATER_TILES_COUNT; i++)