Unified back into a single resource.h

defold · May 14, 2024 · 1f1ebda · 1f1ebda
1 parent fecdd47
commit 1f1ebda
Show file tree

Hide file tree

Showing 114 changed files with 419 additions and 1,027 deletions.
diff --git a/engine/gameobject/src/gameobject/gameobject.cpp b/engine/gameobject/src/gameobject/gameobject.cpp
@@ -36,8 +36,7 @@
 #include "../proto/gameobject/gameobject_ddf.h"
 
 #include <dmsdk/dlib/vmath.h>
-#include <dmsdk/resource/resource_desc.hpp>
-#include <dmsdk/resource/resource_params.hpp>
+#include <dmsdk/resource/resource.hpp>
 
 DM_PROPERTY_GROUP(rmtp_GameObject, "Gameobjects");
 

diff --git a/engine/gameobject/src/gameobject/res_anim.cpp b/engine/gameobject/src/gameobject/res_anim.cpp
@@ -13,8 +13,6 @@
 // specific language governing permissions and limitations under the License.
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 namespace dmGameObject
 {

diff --git a/engine/gameobject/src/gameobject/res_collection.cpp b/engine/gameobject/src/gameobject/res_collection.cpp
@@ -13,8 +13,6 @@
 // specific language governing permissions and limitations under the License.
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 #include <dlib/dstrings.h>
 #include <dlib/log.h>

diff --git a/engine/gameobject/src/gameobject/res_gameobject.cpp b/engine/gameobject/src/gameobject/res_gameobject.cpp
@@ -17,8 +17,6 @@
 #include <dlib/log.h>
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 #include "gameobject_private.h"
 #include "gameobject_props.h"

diff --git a/engine/gameobject/src/gameobject/res_lua.cpp b/engine/gameobject/src/gameobject/res_lua.cpp
@@ -16,8 +16,6 @@
 #include <dlib/log.h>
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 #include "res_lua.h"
 #include "gameobject_script.h"
 

diff --git a/engine/gameobject/src/gameobject/res_script.cpp b/engine/gameobject/src/gameobject/res_script.cpp
@@ -16,8 +16,6 @@
 #include <script/script.h>
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 #include "res_lua.h"
 #include "../proto/gameobject/lua_ddf.h"

diff --git a/engine/gameobject/src/gameobject/test/bones/test_gameobject_bones.cpp b/engine/gameobject/src/gameobject/test/bones/test_gameobject_bones.cpp
@@ -19,8 +19,7 @@
 #include <dlib/hash.h>
 #include <dlib/log.h>
 #include <dmsdk/dlib/vmath.h>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
+#include <dmsdk/resource/resource.hpp>
 
 #include "../gameobject.h"
 #include "../gameobject_private.h"

diff --git a/engine/gameobject/src/gameobject/test/collection/test_gameobject_collection.cpp b/engine/gameobject/src/gameobject/test/collection/test_gameobject_collection.cpp
@@ -24,8 +24,6 @@
 #include "../gameobject_private.h"
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 using namespace dmVMath;
 

diff --git a/engine/gameobject/src/gameobject/test/component/test_gameobject_component.cpp b/engine/gameobject/src/gameobject/test/component/test_gameobject_component.cpp
@@ -28,8 +28,6 @@
 #include <dmsdk/gameobject/script.h>
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 class ComponentTest : public jc_test_base_class
 {

diff --git a/engine/gameobject/src/gameobject/test/delete/test_gameobject_delete.cpp b/engine/gameobject/src/gameobject/test/delete/test_gameobject_delete.cpp
@@ -23,8 +23,6 @@
 #include "gameobject/test/delete/test_gameobject_delete_ddf.h"
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 class DeleteTest : public jc_test_base_class
 {

diff --git a/engine/gameobject/src/gameobject/test/factory/test_gameobject_factory.cpp b/engine/gameobject/src/gameobject/test/factory/test_gameobject_factory.cpp
@@ -24,8 +24,6 @@
 #include "../gameobject_private.h"
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 using namespace dmVMath;
 

diff --git a/engine/gameobject/src/gameobject/test/input/test_gameobject_input.cpp b/engine/gameobject/src/gameobject/test/input/test_gameobject_input.cpp
@@ -25,8 +25,6 @@
 #include "gameobject/test/input/test_gameobject_input_ddf.h"
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 using namespace dmVMath;
 

diff --git a/engine/gameobject/src/gameobject/test/message/test_gameobject_message.cpp b/engine/gameobject/src/gameobject/test/message/test_gameobject_message.cpp
@@ -28,8 +28,7 @@
 
 #include "../../../proto/gameobject/gameobject_ddf.h"
 
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
+#include <dmsdk/resource/resource.hpp>
 
 void DispatchCallback(dmMessage::Message *message, void* user_ptr);
 

diff --git a/engine/gameobject/src/gameobject/test/props/test_gameobject_props.cpp b/engine/gameobject/src/gameobject/test/props/test_gameobject_props.cpp
@@ -25,8 +25,7 @@
 #include "../proto/gameobject/gameobject_ddf.h"
 #include "../gameobject_props.h"
 
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
+#include <dmsdk/resource/resource.hpp>
 
 using namespace dmVMath;
 

diff --git a/engine/gameobject/src/gameobject/test/reload/test_collection_reload.cpp b/engine/gameobject/src/gameobject/test/reload/test_collection_reload.cpp
@@ -22,8 +22,6 @@
 #include "gameobject/test/reload/test_gameobject_reload_ddf.h"
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 struct ReloadTargetComponent
 {

diff --git a/engine/gameobject/src/gameobject/test/reload/test_gameobject_reload.cpp b/engine/gameobject/src/gameobject/test/reload/test_gameobject_reload.cpp
@@ -24,8 +24,6 @@
 #include "gameobject/test/reload/test_gameobject_reload_ddf.h"
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 using namespace dmVMath;
 

diff --git a/engine/gameobject/src/gameobject/test/spawn_delete/test_gameobject_spawn_delete.cpp b/engine/gameobject/src/gameobject/test/spawn_delete/test_gameobject_spawn_delete.cpp
@@ -28,8 +28,6 @@
 #include "../proto/gameobject/gameobject_ddf.h"
 #include "../proto/gameobject/lua_ddf.h"
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 
 using namespace dmVMath;
 

diff --git a/engine/gamesys/src/gamesys/components/comp_gui.cpp b/engine/gamesys/src/gamesys/components/comp_gui.cpp
@@ -50,7 +50,7 @@
 #include <gui/gui_script.h>
 
 #include <dmsdk/gamesys/gui.h>
-#include <dmsdk/resource/resource_desc.hpp>
+#include <dmsdk/resource/resource.hpp>
 
 DM_PROPERTY_EXTERN(rmtp_Gui);
 DM_PROPERTY_U32(rmtp_GuiVertexCount, 0, FrameReset, "#", &rmtp_Gui);

diff --git a/engine/gamesys/src/gamesys/components/comp_mesh.cpp b/engine/gamesys/src/gamesys/components/comp_mesh.cpp
@@ -40,7 +40,7 @@
 #include <gamesys/mesh_ddf.h>
 #include <dmsdk/gamesys/render_constants.h>
 #include <dmsdk/gamesys/resources/res_material.h>
-#include <dmsdk/resource/resource_desc.hpp>
+#include <dmsdk/resource/resource.hpp>
 
 #include "../resources/res_mesh.h"
 

diff --git a/engine/gamesys/src/gamesys/components/comp_model.cpp b/engine/gamesys/src/gamesys/components/comp_model.cpp
@@ -46,7 +46,7 @@
 #include <gamesys/gamesys_ddf.h>
 #include <gamesys/model_ddf.h>
 #include <dmsdk/gamesys/render_constants.h>
-#include <dmsdk/resource/resource_desc.hpp>
+#include <dmsdk/resource/resource.hpp>
 
 DM_PROPERTY_EXTERN(rmtp_Components);
 DM_PROPERTY_U32(rmtp_Model, 0, FrameReset, "# components", &rmtp_Components);

diff --git a/engine/gamesys/src/gamesys/components/comp_private.cpp b/engine/gamesys/src/gamesys/components/comp_private.cpp
@@ -18,7 +18,7 @@
 #include <dmsdk/dlib/vmath.h>
 #include <render/render.h>
 #include <dmsdk/gamesys/render_constants.h>
-#include <dmsdk/resource/resource_desc.hpp>
+#include <dmsdk/resource/resource.hpp>
 
 namespace dmGameSystem
 {

diff --git a/engine/gamesys/src/gamesys/gamesys.cpp b/engine/gamesys/src/gamesys/gamesys.cpp
@@ -23,8 +23,7 @@
 #include <graphics/graphics.h>
 #include <input/input.h>
 #include <render/render.h>
-#include <dmsdk/resource/resource.h>
-#include <dmsdk/resource/resource_type.hpp>
+#include <dmsdk/resource/resource.hpp>
 
 #include "resources/res_collection_proxy.h"
 #include "resources/res_collision_object.h"

diff --git a/engine/gamesys/src/gamesys/resources/res_animationset.cpp b/engine/gamesys/src/gamesys/resources/res_animationset.cpp
@@ -15,8 +15,6 @@
 #include "res_animationset.h"
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
-#include <dmsdk/resource/resource_type.hpp>
 #include <resource/resource.h>
 #include <dlib/log.h>
 #include <dmsdk/dlib/vmath.h>

diff --git a/engine/gamesys/src/gamesys/resources/res_buffer.cpp b/engine/gamesys/src/gamesys/resources/res_buffer.cpp
@@ -21,7 +21,6 @@
 #include <dlib/memory.h>
 
 #include <render/render.h>
-#include <dmsdk/resource/resource_desc.h>
 
 namespace dmGameSystem
 {

diff --git a/engine/gamesys/src/gamesys/resources/res_buffer.h b/engine/gamesys/src/gamesys/resources/res_buffer.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_RES_BUFFER_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 #include <dmsdk/gamesys/resources/res_buffer.h>
 
 namespace dmGameSystem

diff --git a/engine/gamesys/src/gamesys/resources/res_camera.cpp b/engine/gamesys/src/gamesys/resources/res_camera.cpp
@@ -14,8 +14,6 @@
 
 #include "res_camera.h"
 
-#include <dmsdk/resource/resource_desc.hpp>
-
 namespace dmGameSystem
 {
  dmResource::Result ResCameraCreate(const dmResource::ResourceCreateParams* params)

diff --git a/engine/gamesys/src/gamesys/resources/res_camera.h b/engine/gamesys/src/gamesys/resources/res_camera.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_RES_CAMERA_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 #include <dmsdk/gamesys/resources/res_camera.h>
 
 namespace dmGameSystem

diff --git a/engine/gamesys/src/gamesys/resources/res_collection_factory.cpp b/engine/gamesys/src/gamesys/resources/res_collection_factory.cpp
@@ -20,8 +20,6 @@
 #include <gameobject/gameobject_ddf.h>
 #include <gamesys/gamesys_ddf.h>
 
-#include <dmsdk/resource/resource_desc.hpp>
-
 namespace dmGameSystem
 {
  CollectionFactoryResource& CollectionFactoryResource::operator=(CollectionFactoryResource& other)

diff --git a/engine/gamesys/src/gamesys/resources/res_collection_factory.h b/engine/gamesys/src/gamesys/resources/res_collection_factory.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_RES_COLLECTION_FACTORY_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 #include <dmsdk/gamesys/resources/res_collection_factory.h>
 
 namespace dmGameSystem

diff --git a/engine/gamesys/src/gamesys/resources/res_collection_proxy.cpp b/engine/gamesys/src/gamesys/resources/res_collection_proxy.cpp
@@ -14,8 +14,6 @@
 
 #include "res_collection_proxy.h"
 
-#include <dmsdk/resource/resource_desc.hpp>
-
 namespace dmGameSystem
 {
  dmResource::Result AcquireResource(dmResource::HFactory factory, const void* buffer, uint32_t buffer_size, CollectionProxyResource* resource)

diff --git a/engine/gamesys/src/gamesys/resources/res_collection_proxy.h b/engine/gamesys/src/gamesys/resources/res_collection_proxy.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_RES_COLLECTION_PROXY_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 #include <dmsdk/gamesys/resources/res_collection_proxy.h>
 
 namespace dmGameSystem

diff --git a/engine/gamesys/src/gamesys/resources/res_collision_object.cpp b/engine/gamesys/src/gamesys/resources/res_collision_object.cpp
@@ -21,9 +21,6 @@
 #include "../gamesys.h"
 #include "../resources/res_tilegrid.h"
 
-#include <dmsdk/resource/resource_type.h>
-#include <dmsdk/resource/resource_desc.hpp>
-
 namespace dmGameSystem
 {
  CollisionObjectResource::CollisionObjectResource()

diff --git a/engine/gamesys/src/gamesys/resources/res_collision_object.h b/engine/gamesys/src/gamesys/resources/res_collision_object.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_RES_COLLISION_OBJECT_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 #include <dmsdk/gamesys/resources/res_collision_object.h>
 
 namespace dmGameSystem

diff --git a/engine/gamesys/src/gamesys/resources/res_compute_program.cpp b/engine/gamesys/src/gamesys/resources/res_compute_program.cpp
@@ -17,8 +17,6 @@
 #include <render/render.h>
 #include <render/compute_program_ddf.h>
 
-#include <dmsdk/resource/resource_desc.hpp>
-
 namespace dmGameSystem
 {
  dmResource::Result AcquireResources(dmResource::HFactory factory, dmRenderDDF::ComputeProgramDesc* ddf, void** program)

diff --git a/engine/gamesys/src/gamesys/resources/res_compute_program.h b/engine/gamesys/src/gamesys/resources/res_compute_program.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_RES_COMPUTE_PROGRAM_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 
 namespace dmGameSystem
 {

diff --git a/engine/gamesys/src/gamesys/resources/res_compute_shader.cpp b/engine/gamesys/src/gamesys/resources/res_compute_shader.cpp
@@ -15,8 +15,6 @@
 #include "res_compute_shader.h"
 #include <graphics/graphics.h>
 
-#include <dmsdk/resource/resource_desc.hpp>
-
 namespace dmGameSystem
 {
  static dmResource::Result AcquireResources(dmGraphics::HContext context, dmResource::HFactory factory, dmGraphics::ShaderDesc* ddf, dmGraphics::HComputeProgram* program)

diff --git a/engine/gamesys/src/gamesys/resources/res_compute_shader.h b/engine/gamesys/src/gamesys/resources/res_compute_shader.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_RES_COMPUTE_SHADER_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 
 namespace dmGameSystem
 {

diff --git a/engine/gamesys/src/gamesys/resources/res_convex_shape.cpp b/engine/gamesys/src/gamesys/resources/res_convex_shape.cpp
@@ -19,8 +19,6 @@
 #include "gamesys.h"
 #include <gamesys/physics_ddf.h>
 
-#include <dmsdk/resource/resource_desc.hpp>
-
 /*
  * NOTE: Convex-shape is obsolete and the code below is not currently in use
  * We currently embed external convex shape resources into the collisionshape at compile-time

diff --git a/engine/gamesys/src/gamesys/resources/res_convex_shape.h b/engine/gamesys/src/gamesys/resources/res_convex_shape.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_CONVEX_SHAPE_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 #include <dmsdk/gamesys/resources/res_convex_shape.h>
 
 namespace dmGameSystem

diff --git a/engine/gamesys/src/gamesys/resources/res_display_profiles.cpp b/engine/gamesys/src/gamesys/resources/res_display_profiles.cpp
@@ -18,8 +18,6 @@
 #include <render/render_ddf.h>
 #include <render/display_profiles.h>
 
-#include <dmsdk/resource/resource_desc.hpp>
-
 namespace dmGameSystem
 {
  dmResource::Result AcquireResources(dmResource::HFactory factory, const void* buffer, uint32_t buffer_size, dmRender::HDisplayProfiles profiles, const char* filename)

diff --git a/engine/gamesys/src/gamesys/resources/res_display_profiles.h b/engine/gamesys/src/gamesys/resources/res_display_profiles.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_RES_DISPLAY_PROFILES_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 
 namespace dmGameSystem
 {

diff --git a/engine/gamesys/src/gamesys/resources/res_factory.cpp b/engine/gamesys/src/gamesys/resources/res_factory.cpp
@@ -16,7 +16,6 @@
 #include <dlib/dstrings.h>
 
 #include <gameobject/gameobject.h>
-#include <dmsdk/resource/resource_desc.hpp>
 
 namespace dmGameSystem
 {

diff --git a/engine/gamesys/src/gamesys/resources/res_factory.h b/engine/gamesys/src/gamesys/resources/res_factory.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_RES_FACTORY_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 #include <dmsdk/gamesys/resources/res_factory.h>
 
 namespace dmGameSystem

diff --git a/engine/gamesys/src/gamesys/resources/res_font_map.cpp b/engine/gamesys/src/gamesys/resources/res_font_map.cpp
@@ -23,7 +23,6 @@
 #include <render/font_renderer.h>
 #include <render/render_ddf.h>
 
-#include <dmsdk/resource/resource_desc.hpp>
 #include <dmsdk/gamesys/resources/res_material.h>
 
 namespace dmGameSystem

diff --git a/engine/gamesys/src/gamesys/resources/res_font_map.h b/engine/gamesys/src/gamesys/resources/res_font_map.h
@@ -16,7 +16,6 @@
 #define DM_GAMESYS_RES_FONT_MAP_H
 
 #include <dmsdk/resource/resource.hpp>
-#include <dmsdk/resource/resource_params.hpp>
 #include <dmsdk/gamesys/resources/res_font_map.h>
 
 namespace dmGameSystem