diff --git a/data/images/kloofendal_cloudy/back.png b/data/images/kloofendal_cloudy/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e212f58a3bb7b907f346c9a47c989ee832ae60c
Binary files /dev/null and b/data/images/kloofendal_cloudy/back.png differ
diff --git a/data/images/kloofendal_cloudy/bottom.png b/data/images/kloofendal_cloudy/bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..64d3096c98cb03ffd9c6ef2f4cad4d5fe47e7c17
Binary files /dev/null and b/data/images/kloofendal_cloudy/bottom.png differ
diff --git a/data/images/kloofendal_cloudy/front.png b/data/images/kloofendal_cloudy/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..55f4e01ab10881318ab30a3bb01dd890a9b7592d
Binary files /dev/null and b/data/images/kloofendal_cloudy/front.png differ
diff --git a/data/images/kloofendal_cloudy/left.png b/data/images/kloofendal_cloudy/left.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa1ca638a8c5177f3b00e4214714ab24aac051e2
Binary files /dev/null and b/data/images/kloofendal_cloudy/left.png differ
diff --git a/data/images/kloofendal_cloudy/right.png b/data/images/kloofendal_cloudy/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..26e3a9f395bb2af097576c8f608b022447a9083f
Binary files /dev/null and b/data/images/kloofendal_cloudy/right.png differ
diff --git a/data/images/kloofendal_cloudy/top.png b/data/images/kloofendal_cloudy/top.png
new file mode 100644
index 0000000000000000000000000000000000000000..18e4c465c4789391f5e5ae69fff68597439bcaa2
Binary files /dev/null and b/data/images/kloofendal_cloudy/top.png differ
diff --git a/data/images/nevada/nevada_bk.tga b/data/images/nevada/nevada_bk.tga
deleted file mode 100644
index 84807f26a54c5fbc473b02a81ac71d03d92cc01a..0000000000000000000000000000000000000000
Binary files a/data/images/nevada/nevada_bk.tga and /dev/null differ
diff --git a/data/images/nevada/nevada_dn.tga b/data/images/nevada/nevada_dn.tga
deleted file mode 100644
index c7321f1bab999826c232cc5f28e365cf4bd00b4e..0000000000000000000000000000000000000000
Binary files a/data/images/nevada/nevada_dn.tga and /dev/null differ
diff --git a/data/images/nevada/nevada_ft.tga b/data/images/nevada/nevada_ft.tga
deleted file mode 100644
index 5fd2f9433c75f231cfbcf85d91bccde925661c61..0000000000000000000000000000000000000000
Binary files a/data/images/nevada/nevada_ft.tga and /dev/null differ
diff --git a/data/images/nevada/nevada_lf.tga b/data/images/nevada/nevada_lf.tga
deleted file mode 100644
index 9d90b68864811a55c5b4a40329e5a5c072b83c93..0000000000000000000000000000000000000000
Binary files a/data/images/nevada/nevada_lf.tga and /dev/null differ
diff --git a/data/images/nevada/nevada_rt.tga b/data/images/nevada/nevada_rt.tga
deleted file mode 100644
index dc6920ebc0416d0d90d40410204a6214ad4e5fda..0000000000000000000000000000000000000000
Binary files a/data/images/nevada/nevada_rt.tga and /dev/null differ
diff --git a/data/images/nevada/nevada_up.tga b/data/images/nevada/nevada_up.tga
deleted file mode 100644
index b56d952386d2b4e651bb55c0e1e8e6eee6d24e4b..0000000000000000000000000000000000000000
Binary files a/data/images/nevada/nevada_up.tga and /dev/null differ
diff --git a/data/images/tron_skybox/back.png b/data/images/tron_skybox/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2589d29db304121c44233d49ba3ff9de12c2d0e
Binary files /dev/null and b/data/images/tron_skybox/back.png differ
diff --git a/data/images/tron_skybox/bottom.png b/data/images/tron_skybox/bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..55d11e7a7656fbb38e6bc654c1c68c96ded9f72b
Binary files /dev/null and b/data/images/tron_skybox/bottom.png differ
diff --git a/data/images/tron_skybox/front.png b/data/images/tron_skybox/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..cad2c663cb3de1f3eb626c56a5091208367166e5
Binary files /dev/null and b/data/images/tron_skybox/front.png differ
diff --git a/data/images/tron_skybox/left.png b/data/images/tron_skybox/left.png
new file mode 100644
index 0000000000000000000000000000000000000000..4924ebd2f4b6c58feda893bae6cf4ab2ee657aa8
Binary files /dev/null and b/data/images/tron_skybox/left.png differ
diff --git a/data/images/tron_skybox/right.png b/data/images/tron_skybox/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..67d60cb351ad4d87257e173fe5cf1fdd6b7cbcdc
Binary files /dev/null and b/data/images/tron_skybox/right.png differ
diff --git a/data/images/tron_skybox/top.png b/data/images/tron_skybox/top.png
new file mode 100644
index 0000000000000000000000000000000000000000..74c1ec3db67c67ec01d23db0b0b1cbd9c8eace92
Binary files /dev/null and b/data/images/tron_skybox/top.png differ
diff --git a/src/edit/src/scene.cpp b/src/edit/src/scene.cpp
index 46656e904de45ae7652ee566d5b5a267b23a2d64..44ce1d18120b2241b44eba7b64c0eed47ce09c3e 100644
--- a/src/edit/src/scene.cpp
+++ b/src/edit/src/scene.cpp
@@ -2,7 +2,6 @@
#include <algo/raycast.hpp>
#include <gfx/material.hpp>
#include <gfx/shapes.hpp>
-// #include <gfx/render.hpp> // for grid vertices
#include <iostream>
@@ -17,13 +16,6 @@ void Scene::createScene()
{
using namespace shapes;
- /* ADD DEFAULT CUBE */
- // Mesh cube(lit_cube_vertices, lit_cube_indices, lit_cube_normals);
-
- // addNode(Node::create());
- // addMesh(scene.back(), cube);
- // scene.back()->setScale(glm::vec3(0.5f, 0.5f, 0.5f));
-
/* ADD LIGHT CUBE AND ITS LIGHT */
Mesh light_cube(lit_cube_vertices,
std::vector<float>{},
@@ -46,23 +38,32 @@ void Scene::createScene()
addLight(scene.back(), glm::vec3(0.0f, 2.0f, 0.0f), true);
/* ADD SKYBOX */
+ // const std::vector<std::filesystem::path> skybox_paths = {
+ // "./data/images/skybox/right.jpg",
+ // "./data/images/skybox/left.jpg",
+ // "./data/images/skybox/top.jpg",
+ // "./data/images/skybox/bottom.jpg",
+ // "./data/images/skybox/front.jpg",
+ // "./data/images/skybox/back.jpg"
+ // };
+
const std::vector<std::filesystem::path> skybox_paths = {
- "./data/images/skybox/right.jpg",
- "./data/images/skybox/left.jpg",
- "./data/images/skybox/top.jpg",
- "./data/images/skybox/bottom.jpg",
- "./data/images/skybox/front.jpg",
- "./data/images/skybox/back.jpg"
+ "./data/images/kloofendal_cloudy/right.png",
+ "./data/images/kloofendal_cloudy/left.png",
+ "./data/images/kloofendal_cloudy/top.png",
+ "./data/images/kloofendal_cloudy/bottom.png",
+ "./data/images/kloofendal_cloudy/front.png",
+ "./data/images/kloofendal_cloudy/back.png"
};
// const std::vector<std::filesystem::path> skybox_paths = {
- // "./data/images/nevada/nevada_ft.tga",
- // "./data/images/nevada/nevada_bk.tga",
- // "./data/images/nevada/nevada_up.tga",
- // "./data/images/nevada/nevada_dn.tga",
- // "./data/images/nevada/nevada_rt.tga",
- // "./data/images/nevada/nevada_lf.tga",
- // };
+ // "./data/images/tron_skybox/front.png",
+ // "./data/images/tron_skybox/back.png",
+ // "./data/images/tron_skybox/top.png",
+ // "./data/images/tron_skybox/bottom.png",
+ // "./data/images/tron_skybox/right.png",
+ // "./data/images/tron_skybox/left.png"
+ // };
addSkyboxNode("./data/models/cubemap_cube.obj", skybox_paths);
@@ -79,8 +80,6 @@ void Scene::createScene()
addMesh(scene.back(), std::move(grid_mesh));
grid = scene.back();
- addMeshNode("./data/models/connector_scaledown.obj", glm::vec3(-5, 1, 3));
-
auto node = addNode(glm::vec3(6.0f, 2.0f, 0.0f));
auto bucket_mesh = addMesh(node, "./data/models/SM_Bucket1.obj", "./data/images/SM_Buckets_and_Tray_Base.png");
bucket_mesh->setMaterial(mat::gold);
@@ -106,13 +105,10 @@ std::vector<mesh_ptr> Scene::getNodeMesh(node_ptr node) const
return result;
}
-void Scene::removeActiveCamera(camera_ptr camera) // TO DO: fix
+void Scene::removeActiveCamera(camera_ptr camera)
{
- // if (!camera)
- // return;
- // auto it = std::find(active_cameras.begin(), active_cameras.end(),camera);
- // if (it != active_cameras.end())
- // active_cameras.erase(it);
+ std::erase_if(active_cameras,
+ [&camera](const camera_weak_ptr &cam) { return cam.lock() == camera; });
}
node_ptr Scene::addNode(node_ptr node)
@@ -323,7 +319,7 @@ void Scene::addSideHighlight(node_ptr node, glm::vec3 side_direction, std::array
std::vector<float> vertices;
for (auto v : side_vertices)
{
- v += 0.01f * side_direction; // moves higlight little bit infront
+ v += 0.01f * side_direction; // moves highlight little bit infront
vertices.emplace_back(v.x);
vertices.emplace_back(v.y);
vertices.emplace_back(v.z);