renames in assets manager and entities

ucpu · Oct 29, 2024 · 3a4b44f · 3a4b44f
1 parent 9d679b7
commit 3a4b44f
Show file tree

Hide file tree

Showing 31 changed files with 35 additions and 35 deletions.
diff --git a/externals/cage b/externals/cage
diff --git a/sources/engine/assetManager.cpp b/sources/engine/assetManager.cpp
@@ -1,7 +1,7 @@
 #include <atomic>
 
 #include <cage-core/assetContext.h>
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/concurrent.h>
 #include <cage-core/hashString.h>
 #include <cage-core/logger.h>
@@ -18,7 +18,7 @@ using namespace cage;
 
 std::atomic<bool> destroying;
 Holder<Window> window;
-Holder<AssetManager> assets;
+Holder<AssetsManager> assets;
 
 // asset names
 constexpr const uint32 names[] = {
@@ -77,7 +77,7 @@ int main(int argc, char *args[])
 
 		// asset schemes
 		AssetManagerCreateConfig cfg;
-		assets = newAssetManager(cfg);
+		assets = newAssetsManager(cfg);
 		assets->defineScheme<AssetSchemeIndexPack, AssetPack>(genAssetSchemePack());
 		assets->defineScheme<AssetSchemeIndexShaderProgram, MultiShaderProgram>(genAssetSchemeShaderProgram(1));
 		assets->defineScheme<AssetSchemeIndexTexture, Texture>(genAssetSchemeTexture(1));

diff --git a/sources/engine/rawVrScene.cpp b/sources/engine/rawVrScene.cpp
@@ -1,5 +1,5 @@
 #include <cage-core/assetContext.h>
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/concurrent.h>
 #include <cage-core/hashString.h>
 #include <cage-core/logger.h>
@@ -32,7 +32,7 @@ int main(int argc, char *args[])
 		window->title("cage test virtual reality");
 
 		// assets
-		Holder<AssetManager> assets = newAssetManager(AssetManagerCreateConfig());
+		Holder<AssetsManager> assets = newAssetsManager(AssetManagerCreateConfig());
 		assets->defineScheme<AssetSchemeIndexPack, AssetPack>(genAssetSchemePack());
 		assets->defineScheme<AssetSchemeIndexShaderProgram, MultiShaderProgram>(genAssetSchemeShaderProgram(0));
 		assets->defineScheme<AssetSchemeIndexTexture, Texture>(genAssetSchemeTexture(0));

diff --git a/sources/engine/rawWindow.cpp b/sources/engine/rawWindow.cpp
@@ -1,5 +1,5 @@
 #include <cage-core/assetContext.h>
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/concurrent.h>
 #include <cage-core/hashString.h>
 #include <cage-core/logger.h>
@@ -36,7 +36,7 @@ int main(int argc, char *args[])
 		detail::initializeOpengl();
 
 		// assets
-		Holder<AssetManager> assets = newAssetManager(AssetManagerCreateConfig());
+		Holder<AssetsManager> assets = newAssetsManager(AssetManagerCreateConfig());
 		assets->defineScheme<AssetSchemeIndexPack, AssetPack>(genAssetSchemePack());
 		assets->defineScheme<AssetSchemeIndexShaderProgram, MultiShaderProgram>(genAssetSchemeShaderProgram(0));
 		assets->defineScheme<AssetSchemeIndexTexture, Texture>(genAssetSchemeTexture(0));

diff --git a/sources/gui/gui.h b/sources/gui/gui.h
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>
 #include <cage-core/logger.h>

diff --git a/sources/scenes/game.cpp b/sources/scenes/game.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/color.h>
 #include <cage-core/entities.h>
 #include <cage-core/files.h>

diff --git a/sources/simple/cameraEffects.cpp b/sources/simple/cameraEffects.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>

diff --git a/sources/simple/decals.cpp b/sources/simple/decals.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/collider.h>
 #include <cage-core/entities.h>
 #include <cage-core/geometry.h>

diff --git a/sources/simple/explosions.cpp b/sources/simple/explosions.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/camera.h>
 #include <cage-core/collider.h>
 #include <cage-core/color.h>

diff --git a/sources/simple/formats.cpp b/sources/simple/formats.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/color.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>

diff --git a/sources/simple/gamepads.cpp b/sources/simple/gamepads.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/debug.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>

diff --git a/sources/simple/geometry.cpp b/sources/simple/geometry.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/camera.h>
 #include <cage-core/entities.h>
 #include <cage-core/geometry.h>

diff --git a/sources/simple/guiInWorld.cpp b/sources/simple/guiInWorld.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>
 #include <cage-core/logger.h>

diff --git a/sources/simple/lights.cpp b/sources/simple/lights.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/color.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>

diff --git a/sources/simple/lods.cpp b/sources/simple/lods.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>

diff --git a/sources/simple/manyLights.cpp b/sources/simple/manyLights.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/entitiesVisitor.h>
 #include <cage-core/hashString.h>
 #include <cage-core/logger.h>

diff --git a/sources/simple/material.cpp b/sources/simple/material.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/color.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>

diff --git a/sources/simple/materials.cpp b/sources/simple/materials.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>

diff --git a/sources/simple/mazetdBuildings.cpp b/sources/simple/mazetdBuildings.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/color.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>

diff --git a/sources/simple/mazetdMonsters.cpp b/sources/simple/mazetdMonsters.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/color.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>

diff --git a/sources/simple/music.cpp b/sources/simple/music.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/entities.h>
 #include <cage-core/enumerate.h>
 #include <cage-core/hashString.h>

diff --git a/sources/simple/normals.cpp b/sources/simple/normals.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>

diff --git a/sources/simple/plagueRat.cpp b/sources/simple/plagueRat.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>
 #include <cage-core/logger.h>

diff --git a/sources/simple/renderToTexture.cpp b/sources/simple/renderToTexture.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>

diff --git a/sources/simple/screamers.cpp b/sources/simple/screamers.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/camera.h>
 #include <cage-core/collider.h>
 #include <cage-core/entities.h>

diff --git a/sources/simple/shaderanim.cpp b/sources/simple/shaderanim.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/color.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>

diff --git a/sources/simple/skeletalAnimation.cpp b/sources/simple/skeletalAnimation.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/color.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>

diff --git a/sources/simple/skybox.cpp b/sources/simple/skybox.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>

diff --git a/sources/simple/texts.cpp b/sources/simple/texts.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/entities.h>
 #include <cage-core/hashString.h>
 #include <cage-core/logger.h>

diff --git a/sources/simple/translucent.cpp b/sources/simple/translucent.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/color.h>
 #include <cage-core/config.h>
 #include <cage-core/entities.h>

diff --git a/sources/simple/virtualReality.cpp b/sources/simple/virtualReality.cpp
@@ -1,4 +1,4 @@
-#include <cage-core/assetManager.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/entities.h>
 #include <cage-core/entitiesVisitor.h>
 #include <cage-core/hashString.h>
+31 −6		data/cage/shader/effects/dofApply.glsl
+1 −9		data/cage/shader/effects/dofCollect.glsl
+0 −29		data/cage/shader/effects/dofParams.glsl
+2 −0		externals/glfw/CMakeLists.txt
+0 −5		sources/CMakeLists.txt
+2 −6		sources/asset-database/main.cpp
+1 −4		sources/image-channels/main.cpp
+1 −4		sources/image-convert/main.cpp
+1 −4		sources/image-info/main.cpp
+1 −4		sources/image-resize/main.cpp
+1 −4		sources/image-untile/main.cpp
+5 −5		sources/include/cage-core/assetContext.h
+2 −2		sources/include/cage-core/assetHeader.h
+21 −21		sources/include/cage-core/assetsManager.h
+6 −6		sources/include/cage-core/assetsOnDemand.h
+1 −1		sources/include/cage-core/collider.h
+2 −2		sources/include/cage-core/core.h
+10 −9		sources/include/cage-core/entities.h
+4 −4		sources/include/cage-core/geometry.h
+2 −0		sources/include/cage-core/logger.h
+2 −2		sources/include/cage-core/skeletalAnimation.h
+1 −1		sources/include/cage-core/skeletalAnimationPreparator.h
+1 −1		sources/include/cage-core/texts.h
+1 −1		sources/include/cage-engine/font.h
+1 −1		sources/include/cage-engine/guiManager.h
+4 −0		sources/include/cage-engine/inputs.h
+1 −1		sources/include/cage-engine/model.h
+1 −1		sources/include/cage-engine/renderObject.h
+3 −3		sources/include/cage-engine/renderPipeline.h
+2 −2		sources/include/cage-engine/sceneShadowmapFitting.h
+2 −2		sources/include/cage-engine/screenSpaceEffects.h
+1 −1		sources/include/cage-engine/shaderProgram.h
+1 −1		sources/include/cage-engine/sound.h
+1 −1		sources/include/cage-engine/texture.h
+32 −0		sources/include/cage-engine/winMain.h
+3 −2		sources/include/cage-engine/window.h
+1 −1		sources/include/cage-simple/engine.h
+11 −11		sources/libcore/assets/assetStructs.cpp
+95 −95		sources/libcore/assets/assetsManager.cpp
+18 −18		sources/libcore/assets/assetsOnDemand.cpp
+2 −2		sources/libcore/assets/texts.cpp
+39 −38		sources/libcore/entities.cpp
+8 −8		sources/libcore/entitiesCopy.cpp
+21 −4		sources/libcore/logger.cpp
+4 −4		sources/libcore/mesh/skeletalAnimationPreparator.cpp
+3 −3		sources/libengine/assets/font.cpp
+3 −3		sources/libengine/assets/model.cpp
+3 −3		sources/libengine/assets/renderObject.cpp
+3 −3		sources/libengine/assets/shaderProgram.cpp
+3 −3		sources/libengine/assets/sound.cpp
+3 −3		sources/libengine/assets/texture.cpp
+5 −5		sources/libengine/graphics/renderPipeline.cpp
+27 −37		sources/libengine/graphics/screenSpaceEffects.cpp
+3 −3		sources/libengine/gui/graphics.cpp
+2 −2		sources/libengine/gui/gui.cpp
+2 −2		sources/libengine/gui/items.cpp
+4 −4		sources/libengine/gui/private.h
+2 −2		sources/libengine/sceneShadowmapFitting.cpp
+6 −2		sources/libengine/sound/speaker.cpp
+2 −1		sources/libengine/virtualReality/platforms.cpp
+56 −0		sources/libengine/winMain.cpp
+133 −118		sources/libengine/window/window.cpp
+61 −70		sources/libsimple/fpsCamera.cpp
+4 −4		sources/libsimple/gameloop.cpp
+4 −4		sources/libsimple/graphics.cpp
+3 −3		sources/libsimple/guiInWorld.cpp
+1 −1		sources/libsimple/sound.cpp
+1 −5		sources/mesh-info/main.cpp
+1 −4		sources/test-assets/main.cpp
+35 −35		sources/test-core/assetsManager.cpp
+4 −4		sources/test-core/assetsOnDemand.cpp
+1 −3		sources/test-core/main.cpp
+1 −4		sources/test-entities/main.cpp
+1 −4		sources/test-ginnel/main.cpp
+1 −3		sources/test-install/main.cpp