diff --git a/Engine/include/SceneData/SceneExporterLayout.h b/Engine/include/SceneData/SceneExporterLayout.h index 0a294e9..2280f34 100644 --- a/Engine/include/SceneData/SceneExporterLayout.h +++ b/Engine/include/SceneData/SceneExporterLayout.h @@ -561,7 +561,7 @@ namespace Prisma Texture texture; if (t.second == "NO_TEXTURE") { - textures.push_back(Prisma::GlobalData::getInstance().defaultBlack()); + textures.push_back(Prisma::GlobalData::getInstance().defaultWhite()); } else { @@ -577,7 +577,7 @@ namespace Prisma Texture texture; if (t.second == "NO_TEXTURE") { - textures.push_back(Prisma::GlobalData::getInstance().defaultBlack()); + textures.push_back(Prisma::GlobalData::getInstance().defaultWhite()); } else { diff --git a/UserEngine/src/PlayerController.cpp b/UserEngine/src/PlayerController.cpp index 40b00e7..7e7a684 100644 --- a/UserEngine/src/PlayerController.cpp +++ b/UserEngine/src/PlayerController.cpp @@ -44,15 +44,6 @@ PlayerController::PlayerController(std::shared_ptr scene) : m_sce m_baseData = m_animatedMesh->parent()->parent()->matrix(); m_animations = IDLE; m_previousAnimations = IDLE; - auto cloud = std::make_shared(); - cloud->name("Cloud"); - cloud->addComponent(std::make_shared()); - m_scene->root->addChild(cloud); - - auto culling = std::make_shared(); - culling->name("Culling"); - culling->addComponent(std::make_shared()); - m_scene->root->addChild(culling); /*auto terrain = std::make_shared(); terrain->name("Terrain"); diff --git a/UserEngine/src/UserEngine.cpp b/UserEngine/src/UserEngine.cpp index baaedb1..5d67b8a 100644 --- a/UserEngine/src/UserEngine.cpp +++ b/UserEngine/src/UserEngine.cpp @@ -14,25 +14,12 @@ void UserEngine::start() { - m_root = Prisma::Engine::getInstance().getScene("../../../Resources/DefaultScene/default.gltf", {true}); + m_root = Prisma::Engine::getInstance().getScene("../../../Resources/DefaultScene/default.prisma", {true}); Prisma::Texture texture; texture.loadEquirectangular("../../../Resources/Skybox/cloudy.hdr"); texture.data({4096, 4096, 3}); Prisma::PipelineSkybox::getInstance().texture(texture, true); - Prisma::NodeHelper nodeHelper; - - nodeHelper.nodeIterator(m_root->root, [](auto mesh, auto parent) - { - auto currentMesh = std::dynamic_pointer_cast(mesh); - if (currentMesh && !std::dynamic_pointer_cast(mesh)) - { - auto physicsComponent = std::make_shared(); - physicsComponent->collisionData({Prisma::Physics::Collider::BOX_COLLIDER, 0.0, false}); - currentMesh->addComponent(physicsComponent); - } - }); - m_player = std::make_shared(m_root); m_player->scene(m_root);