nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[request] per-subset surfaceName identifier

Browse Source
This commit is contained in:
Turánszki János
2024-09-14 10:57:53 +02:00
parent 24d66d920e
commit 6567af74b2
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/wiScene.h
+1 -1
View File
@@ -33,7 +33,7 @@ namespace wi::scene
wi::ecs::ComponentManager<TransformComponent>& transforms = componentLibrary.Register<TransformComponent>("wi::scene::Scene::transforms");
wi::ecs::ComponentManager<HierarchyComponent>& hierarchy = componentLibrary.Register<HierarchyComponent>("wi::scene::Scene::hierarchy");
wi::ecs::ComponentManager<MaterialComponent>& materials = componentLibrary.Register<MaterialComponent>("wi::scene::Scene::materials", 8); // version = 8
wi::ecs::ComponentManager<MeshComponent>& meshes = componentLibrary.Register<MeshComponent>("wi::scene::Scene::meshes", 3); // version = 3
wi::ecs::ComponentManager<MeshComponent>& meshes = componentLibrary.Register<MeshComponent>("wi::scene::Scene::meshes", 4); // version = 4
wi::ecs::ComponentManager<ImpostorComponent>& impostors = componentLibrary.Register<ImpostorComponent>("wi::scene::Scene::impostors");
wi::ecs::ComponentManager<ObjectComponent>& objects = componentLibrary.Register<ObjectComponent>("wi::scene::Scene::objects", 4); // version = 4
wi::ecs::ComponentManager<RigidBodyPhysicsComponent>& rigidbodies = componentLibrary.Register<RigidBodyPhysicsComponent>("wi::scene::Scene::rigidbodies", 4); // version = 4
WickedEngine/wiScene_Components.h
+1
View File
@@ -391,6 +391,7 @@ namespace wi::scene
struct MeshSubset
{
std::string surfaceName; // custom identifier for user, not used by engine
wi::ecs::Entity materialID = wi::ecs::INVALID_ENTITY;
uint32_t indexOffset = 0;
uint32_t indexCount = 0;
WickedEngine/wiScene_Serializers.cpp
+8
View File
@@ -445,6 +445,10 @@ namespace wi::scene
SerializeEntity(archive, subsets[i].materialID, seri);
archive >> subsets[i].indexOffset;
archive >> subsets[i].indexCount;
if (seri.GetVersion() >= 4)
{
archive >> subsets[i].surfaceName;
}
}
archive >> tessellationFactor;
@@ -535,6 +539,10 @@ namespace wi::scene
SerializeEntity(archive, subsets[i].materialID, seri);
archive << subsets[i].indexOffset;
archive << subsets[i].indexCount;
if (seri.GetVersion() >= 4)
{
archive << subsets[i].surfaceName;
}
}
archive << tessellationFactor;
WickedEngine/wiVersion.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ namespace wi::version
// minor features, major updates, breaking compatibility changes
const int minor = 71;
// minor bug fixes, alterations, refactors, updates
const int revision = 568;
const int revision = 569;
const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);