Browse Source

world: cleanup

Daniele Bartolini 10 months ago
parent
commit
803a89b4a0
2 changed files with 10 additions and 1 deletions
  1. 7 1
      src/world/render_world.cpp
  2. 3 0
      src/world/render_world.h

+ 7 - 1
src/world/render_world.cpp

@@ -87,15 +87,21 @@ RenderWorld::RenderWorld(Allocator &a
 	_unit_destroy_callback.node.prev = NULL;
 	_unit_destroy_callback.node.prev = NULL;
 	um.register_destroy_callback(&_unit_destroy_callback);
 	um.register_destroy_callback(&_unit_destroy_callback);
 
 
+	// Outlines.
+	_u_unit_id = bgfx::createUniform("u_unit_id", bgfx::UniformType::Vec4);
+
+	// Lighting.
 	_u_lights_num = bgfx::createUniform("u_lights_num", bgfx::UniformType::Vec4, 1);
 	_u_lights_num = bgfx::createUniform("u_lights_num", bgfx::UniformType::Vec4, 1);
 	_u_lights_data = bgfx::createUniform("u_lights_data", bgfx::UniformType::Vec4, 3*32);
 	_u_lights_data = bgfx::createUniform("u_lights_data", bgfx::UniformType::Vec4, 3*32);
-	_u_unit_id = bgfx::createUniform("u_unit_id", bgfx::UniformType::Vec4); // Selection.
 }
 }
 
 
 RenderWorld::~RenderWorld()
 RenderWorld::~RenderWorld()
 {
 {
+	// Destroy lighting uniforms.
 	bgfx::destroy(_u_lights_data);
 	bgfx::destroy(_u_lights_data);
 	bgfx::destroy(_u_lights_num);
 	bgfx::destroy(_u_lights_num);
+
+	// Destroy outlines uniforms.
 	bgfx::destroy(_u_unit_id);
 	bgfx::destroy(_u_unit_id);
 
 
 	_unit_manager->unregister_destroy_callback(&_unit_destroy_callback);
 	_unit_manager->unregister_destroy_callback(&_unit_destroy_callback);

+ 3 - 0
src/world/render_world.h

@@ -431,8 +431,11 @@ struct RenderWorld
 
 
 	UnitDestroyCallback _unit_destroy_callback;
 	UnitDestroyCallback _unit_destroy_callback;
 
 
+	// Outlines.
 	HashSet<UnitId> _selection;
 	HashSet<UnitId> _selection;
 	bgfx::UniformHandle _u_unit_id;
 	bgfx::UniformHandle _u_unit_id;
+
+	// Lighting.
 	bgfx::UniformHandle _u_lights_num;
 	bgfx::UniformHandle _u_lights_num;
 	bgfx::UniformHandle _u_lights_data;
 	bgfx::UniformHandle _u_lights_data;
 };
 };