save/load scene fix

Author: Cheaterdev

sources/DirectXFramework/DX12/Buffer.h

@@ -552,6 +552,9 @@ namespace DX12
 			size_t size;
 		};
 		std::list<update_data> update_list;
+
+		update_tiling_info updates;
+
 	public:
 
 		typename StructuredBuffer<Type>::ptr buffer;
@@ -577,7 +580,7 @@ namespace DX12
 			TypedHandle<T> result = Base::Allocate(n);
 
 
-			buffer->map_buffer_part(result.get_offset() * sizeof(T), n * sizeof(T));
+			buffer->map_buffer_part(updates, result.get_offset() * sizeof(T), n * sizeof(T));
 			return result;
 		}
 
@@ -587,7 +590,7 @@ namespace DX12
 
 			result.Free();
 			result = Base::Allocate(n);
-			buffer->map_buffer_part( result.get_offset() * sizeof(T), n * sizeof(T));
+			buffer->map_buffer_part(updates, result.get_offset() * sizeof(T), n * sizeof(T));
 		}
 	/*
 		T* map_elements(size_t offset, size_t size = 1)
@@ -601,7 +604,10 @@ namespace DX12
 		void reserve(CommandList& list, size_t offset)
 		{
 			std::lock_guard<std::mutex> g(m);
-			buffer->map_buffer_part( 0, offset * sizeof(T));
+			buffer->map_buffer_part(updates, 0, offset * sizeof(T));
+
+			updates.resource = buffer.get();
+			list.update_tilings(std::move(updates));
 		}
 
 
@@ -634,6 +640,8 @@ namespace DX12
 		{
 			std::lock_guard<std::mutex> g(m);
 
+			updates.resource = buffer.get();
+			list->update_tilings(std::move(updates));
 			for (auto& elems : update_list)
 			{
 				buffer->set_data(list, (UINT)elems.offset * sizeof(T), elems.data.data(), (UINT)elems.size);

sources/DirectXFramework/DX12/CommandList.cpp

@@ -69,6 +69,10 @@ namespace DX12
 
 	void CommandList::begin(std::string name, Timer* t)
 	{
+#ifdef DEV
+		begin_stack = Exceptions::get_stack_trace();
+#endif
+
 		first_debug_log = true;
 		executed = false;
 		id = Device::get().id_generator.get();

sources/DirectXFramework/DX12/CommandList.h

@@ -620,7 +620,9 @@ namespace DX12
 		virtual  void on_start(Timer* timer) override;
 		virtual  void on_end(Timer* timer)override;
 	protected:
-
+#ifdef DEV
+		Exceptions::stack_trace begin_stack;
+#endif
 		std::string name;
 		void reset();
 		void begin(std::string name, Timer* t = nullptr);
@@ -769,6 +771,8 @@ namespace DX12
 	public:	void update_tilings(update_tiling_info&& info)
 	{
 		tile_updates.emplace_back(std::move(info));
+
+		use_resource(info.resource);
 	}
 		ptr get_sub_list();
 		FrameResources::ptr frame_resources;

sources/DirectXFramework/DX12/Tiling.cpp

@@ -2,11 +2,13 @@
 
 namespace DX12 {
 
-	void TiledResourceManager::map_buffer_part(size_t offset, size_t size)
+	void TiledResourceManager::map_buffer_part(update_tiling_info& target, size_t offset, size_t size)
 	{
 		size_t begin = Math::AlignDown(offset, 64 * 1024) / (64 * 1024);
 		size_t end = Math::AlignUp(offset + size, 64 * 1024) / (64 * 1024);
-		load_tiles(nullptr, { begin,0,0 }, { end,0,0 });
+
+		load_tiles_internal(target, { begin,0,0 }, { end,0,0 }, 0, false);
+		//load_tiles(target, { begin,0,0 }, { end,0,0 });
 	}
 
 	void TiledResourceManager::load_tile(update_tiling_info& target, ivec3 pos, uint subres, bool recursive)

sources/DirectXFramework/DX12/Tiling.h

@@ -34,7 +34,7 @@ namespace DX12
 
 		ivec3 get_tiles_count(int mip_level = 0);
 		ivec3 get_tile_shape();
-		void map_buffer_part( size_t offset, size_t size);
+		void map_buffer_part(update_tiling_info& target, size_t offset, size_t size);
 
 		void load_tiles(CommandList* list, ivec3 from, ivec3 to, uint subres = 0);
 		void zero_tiles(CommandList* list, ivec3 from, ivec3 to);

sources/RenderSystem/Scene/Scene.h

@@ -41,7 +41,10 @@ class Scene : public scene_object, Events::prop_handler
     using ptr = s_ptr<Scene>;
     using wptr = w_ptr<Scene>;
 
-    //		std::set<MaterialAsset*> materials;
+    virtual ~Scene()
+    {
+        remove_all();
+    }
     Scene() 
     {
         scene = this;

sources/Spectrum/main.cpp

@@ -1464,10 +1464,10 @@ resource_stages[&res.second] = input;
 								{
 									auto f = FileSystem::get().get_file("scene.dat")->load_all();
 
-									Scene::ptr scene(new Scene());
+									//Scene::ptr scene(new Scene());
 
-									Serializer::deserialize(f, *scene);
-									//	drawer->scene = scene;
+									Serializer::deserialize(f, *drawer->scene);
+									//drawer->scene = scene;
 								}
 								catch (std::exception e)
 								{

workdir/scene.dat

@@ -17,6 +17,7 @@ void calc(inout float4 color)
 	color.rgb/= color.w + 0.5;
 	color.w = (color.w/4);
 
+	//todo: investigate negative values
 	color = max(0, color);
 }