dawn: fix gui image, color picker, and solid color, fix font, fix scene rendering icons; fix fetching submodules from parent project

malytomas · malytomas · commit 528721aaaff8 · 2025-10-30T04:05:19.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,14 +15,13 @@ if(WIN32)
 	message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
 endif()
 
-execute_process(COMMAND "bash" "${CMAKE_CURRENT_LIST_DIR}/submodules.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" COMMAND_ECHO STDOUT COMMAND_ERROR_IS_FATAL ANY)
-
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(cage_all)
 
 if(CMAKE_CURRENT_BINARY_DIR STREQUAL CMAKE_BINARY_DIR)
 	cage_default_init() # standalone build
 else()
+	cage_fetch_cage_externals()
 	cage_disable_source_build()
 	cage_build_configuration()
 endif()
diff --git a/cmake/cage_all.cmake b/cmake/cage_all.cmake
@@ -7,6 +7,7 @@ include(cage_default_init)
 include(cage_directory_link)
 include(cage_disable_source_build)
 include(cage_embed_file)
+include(cage_fetch_cage_externals)
 include(cage_ide_category)
 include(cage_ide_sort_files)
 include(cage_ide_startup_project)
diff --git a/cmake/cage_default_init.cmake b/cmake/cage_default_init.cmake
@@ -1,5 +1,6 @@
 
 macro(cage_default_init)
+	cage_fetch_cage_externals()
 	cage_disable_source_build()
 	cage_build_configuration()
 	cage_build_destination()
diff --git a/cmake/cage_fetch_cage_externals.cmake b/cmake/cage_fetch_cage_externals.cmake
@@ -0,0 +1,5 @@
+
+function(cage_fetch_cage_externals)
+	execute_process(COMMAND "bash" "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../submodules.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/.." COMMAND_ECHO STDOUT COMMAND_ERROR_IS_FATAL ANY)
+endfunction(cage_fetch_cage_externals)
+
diff --git a/data/cage/shaders/engine/fragment.glsl b/data/cage/shaders/engine/fragment.glsl
@@ -158,6 +158,7 @@ vec4 lighting(Material material)
 	// emissive
 	res.rgb += material.albedo * material.emissive;
 
+#ifdef Normals
 	if (dot(normal, normal) > 0.5) // lighting enabled
 	{
 		float ssao = 1;
@@ -197,6 +198,7 @@ vec4 lighting(Material material)
 			}
 		}
 	}
+#endif // Normals
 
 	if (material.fade < 0.5)
 		res.a = material.opacity;
@@ -278,6 +280,8 @@ Material loadMaterial()
 // additionally applies normal map
 void updateNormal()
 {
+#ifdef Normals
+
 	normal = normalize(varNormal);
 
 #if defined(MaterialTexRegular) || defined(MaterialTexArray) || defined(MaterialTexCube)
@@ -299,4 +303,10 @@ void updateNormal()
 	}
 	else
 		normal = vec3(0);
+
+#else
+
+	normal = vec3(0);
+
+#endif // Normals
 }
diff --git a/data/cage/shaders/engine/vertex.glsl b/data/cage/shaders/engine/vertex.glsl
@@ -20,7 +20,11 @@ void propagateInputs()
 {
 	varInstanceId = gl_InstanceIndex;
 	varPosition = inPosition;
+#ifdef Normals
 	varNormal = inNormal;
+#else
+	varNormal = vec3(0);
+#endif // Normals
 	varUv = inUv;
 }
 
diff --git a/data/cage/shaders/gui/colorPicker.glsl b/data/cage/shaders/gui/colorPicker.glsl
@@ -21,8 +21,9 @@ void main()
 {
 	gl_Position.z = 0;
 	gl_Position.w = 1;
-	gl_Position.xy = uniPos.xy + (uniPos.zw - uniPos.xy) * inUv;
-	varUv = inUv;
+	gl_Position.xy = uniPos.xy + (uniPos.zw - uniPos.xy) * inPosition.xy;
+	varUv.x = inUv.x;
+	varUv.y = 1 - inUv.y;
 }
 
 
diff --git a/data/cage/shaders/gui/image.glsl b/data/cage/shaders/gui/image.glsl
@@ -1,6 +1,4 @@
 
-$include ../functions/sampleTextureAnimation.glsl
-
 layout(std140, set = 2, binding = 0) uniform Global
 {
 	vec4 uniPos; // x1, y1, x2, y2
@@ -28,6 +26,8 @@ void main()
 
 $define shader fragment
 
+$include ../functions/sampleTextureAnimation.glsl
+
 layout(location = 0) out vec4 outColor;
 
 vec4 delinearize(vec4 ca)
@@ -53,7 +53,7 @@ vec4 desaturateDisabled(vec4 ca)
 
 #ifdef Animated
 
-layout(binding = 0) uniform sampler2DArray texImg;
+layout(set = 2, binding = 1) uniform sampler2DArray texImg;
 
 void main()
 {
@@ -64,7 +64,7 @@ void main()
 
 #else
 
-layout(binding = 0) uniform sampler2D texImg;
+layout(set = 2, binding = 1) uniform sampler2D texImg;
 
 void main()
 {
diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE cage-core-sources "libcore/*" "include/cage-core/*")
 add_library(cage-core SHARED ${cage-core-sources})
 target_compile_features(cage-core PUBLIC cxx_std_${CMAKE_CXX_STANDARD})
 target_include_directories(cage-core PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
-target_link_libraries(cage-core PRIVATE zlib libzstd_static simplefilewatcher fastnoise hsluv png_static cage-jpeg tiff tiffxx tinyexr stb xatlas pmp dualmc dr_libs ogg vorbis vorbisfile vorbisenc samplerate assimp bc7enc_rdo avir quickhull iwasm_static uni-algo cpr)
+target_link_libraries(cage-core PRIVATE zlib libzstd_static simplefilewatcher fastnoise hsluv png_static cage-jpeg tiff tiffxx tinyexr stb xatlas pmp dualmc dr_libs ogg vorbis vorbisfile vorbisenc samplerate assimp bc7enc_rdo avir quickhull iwasm_static uni-algo cpr absl_log)
 target_link_libraries(cage-core PUBLIC svector unordered_dense plf)
 if (cage_use_steam_sockets)
 	target_link_libraries(cage-core PRIVATE GameNetworkingSockets::GameNetworkingSockets)
diff --git a/sources/asset-processor/texture.cpp b/sources/asset-processor/texture.cpp
@@ -194,11 +194,7 @@ namespace
 	void fillAlphaChannel(Image *img)
 	{
 		CAGE_ASSERT(img->channels() == 4);
-		const uint32 w = img->width();
-		const uint32 h = img->height();
-		for (uint32 y = 0; y < h; y++)
-			for (uint32 x = 0; x < w; x++)
-				img->value(x, y, 3, 1);
+		imageFill(img, 3, 1);
 	}
 
 	void overrideColorConfig(AlphaModeEnum alpha, GammaSpaceEnum gamma)
@@ -216,6 +212,13 @@ namespace
 
 	void performDownscale(const uint32 downscale, bool volume3D)
 	{
+		const auto &update = [&](uint32 w)
+		{
+			w = max(w / downscale, 1u);
+			w = (w + 3) & ~3u; // round up to next multiple of 4
+			return w;
+		};
+
 		if (volume3D)
 		{ // downscale image as a whole
 			CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "downscaling whole image (3D)");
@@ -225,7 +228,7 @@ namespace
 		{ // downscale each image separately
 			CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "downscaling each slice separately");
 			for (auto &it : images.parts)
-				imageResize(+it.image, max(it.image->width() / downscale, 1u), max(it.image->height() / downscale, 1u));
+				imageResize(+it.image, update(it.image->width()), update(it.image->height()));
 		}
 	}
 
@@ -355,8 +358,9 @@ namespace
 				for (const auto &layer : face.second)
 					size += layer.second->data.size();
 
+			const uint32 faces = level.second.size();
 			const uint32 layers = level.second.at(0).size();
-			ser << Vec3i(level.second.at(0).at(0)->resolution, layers);
+			ser << Vec3i(level.second.at(0).at(0)->resolution, faces * layers);
 			ser << size;
 			for (const auto &face : level.second)
 				for (const auto &layer : face.second)
@@ -386,8 +390,9 @@ namespace
 				for (const auto &layer : face.second)
 					size += layer.second->rawViewU8().size();
 
+			const uint32 faces = level.second.size();
 			const uint32 layers = level.second.at(0).size();
-			ser << Vec3i(level.second.at(0).at(0)->resolution(), layers);
+			ser << Vec3i(level.second.at(0).at(0)->resolution(), faces * layers);
 			ser << size;
 			for (const auto &face : level.second)
 				for (const auto &layer : face.second)
diff --git a/sources/include/cage-engine/graphicsBindings.h b/sources/include/cage-engine/graphicsBindings.h
@@ -36,14 +36,14 @@ namespace cage
 			uint32 offset = 0;
 			bool dynamic = false;
 		};
-		ankerl::svector<BufferConfig, 4> buffers;
+		ankerl::svector<BufferConfig, 1> buffers;
 
 		struct TextureConfig
 		{
 			Texture *texture = nullptr;
 			uint32 binding = m;
 		};
-		ankerl::svector<TextureConfig, 4> textures;
+		ankerl::svector<TextureConfig, 1> textures;
 	};
 
 	CAGE_ENGINE_API GpuBindings newGpuBindings(GraphicsDevice *device, const BindingsCreateConfig &config);
diff --git a/sources/include/cage-engine/graphicsEncoder.h b/sources/include/cage-engine/graphicsEncoder.h
@@ -50,8 +50,9 @@ namespace cage
 	{
 		Shader *shader = nullptr;
 		Model *model = nullptr; // material binds to set = 1
+		std::optional<GpuBindings> materialOverride; // binds to set = 1
 		GpuBindings bindings; // binds to set = 2
-		std::array<uint32, 4> dynamicOffsets = {}; // applies to buffers in set = 2
+		ankerl::svector<uint32, 5> dynamicOffsets = {}; // applies to buffers in set = 2
 		uint32 instances = 1;
 		wgpu::CompareFunction depthTest = wgpu::CompareFunction::Less;
 		bool depthWrite = true;
@@ -78,8 +79,9 @@ namespace cage
 
 	public:
 		void nextPass(const PassConfig &config);
-		void draw(const DrawConfig &config);
 
+		//void scissors(Vec2i origin, Vec2i size);
+		void draw(const DrawConfig &config);
 		void execute(wgpu::RenderBundle bundle);
 
 		void submit();
diff --git a/sources/libcore/network/abslLog.cpp b/sources/libcore/network/abslLog.cpp
@@ -1,12 +1,10 @@
-#ifdef CAGE_USE_STEAM_SOCKETS
+#include <absl/log/globals.h>
+#include <absl/log/initialize.h>
+#include <absl/log/log.h>
+#include <absl/log/log_sink.h>
+#include <absl/log/log_sink_registry.h>
 
-	#include <absl/log/globals.h>
-	#include <absl/log/initialize.h>
-	#include <absl/log/log.h>
-	#include <absl/log/log_sink.h>
-	#include <absl/log/log_sink_registry.h>
-
-	#include <cage-core/core.h>
+#include <cage-core/core.h>
 
 namespace cage
 {
@@ -20,7 +18,7 @@ namespace cage
 				absl::EnableLogPrefix(false);
 				absl::SetStderrThreshold(absl::LogSeverity::kFatal);
 				absl::AddLogSink(this);
-				absl::InitializeLog();
+				//absl::InitializeLog();
 				//LOG(INFO) << "absl logging redirected to cage";
 			}
 
@@ -51,8 +49,11 @@ namespace cage
 				const String msg = String(PointerRange<const char>(msgView.data(), msgView.data() + msgView.length()));
 				cage::privat::makeLog(location, severity, "absl", msg, false, false);
 			}
-		} abslLogSinkInstance;
+		};
 	}
-}
 
-#endif // CAGE_USE_STEAM_SOCKETS
+	CAGE_API_EXPORT void initializeAbslLogSink()
+	{
+		static AbslLogSink logSink;
+	}
+}
diff --git a/sources/libcore/network/steam.cpp b/sources/libcore/network/steam.cpp
@@ -19,6 +19,8 @@
 
 namespace cage
 {
+	void initializeAbslLogSink();
+
 	namespace
 	{
 		const ConfigSint32 confDebugLogLevel("cage/steamsocks/logLevel", k_ESteamNetworkingSocketsDebugOutputType_Msg);
@@ -122,6 +124,8 @@ namespace cage
 
 		void initialize(bool useAuth, bool useRelay)
 		{
+			initializeAbslLogSink();
+
 	#if defined(CAGE_USE_STEAM_SOCKETS)
 			struct InitializerSockets
 			{
diff --git a/sources/libengine/assets/texture.cpp b/sources/libengine/assets/texture.cpp
@@ -12,19 +12,19 @@ namespace cage
 {
 	wgpu::TextureViewDimension textureViewDimension(TextureFlags flags);
 
-	namespace
+	namespace detail
 	{
-		void textureLoadLevel(wgpu::Queue &queue, wgpu::Texture &tex, const TextureHeader &header, const Vec3i &resolution, const uint32 mipLevel, PointerRange<const char> data)
+		CAGE_API_EXPORT void textureLoadLevel(wgpu::Queue &queue, wgpu::Texture &tex, const TextureHeader &header, const Vec3i &resolution, const uint32 mipLevel, PointerRange<const char> data)
 		{
 			CAGE_ASSERT(mipLevel > 0 || Vec2i(resolution) == Vec2i(header.resolution));
+			CAGE_ASSERT(header.channels == 1 || header.channels == 2 || header.channels == 4);
 
 			wgpu::TexelCopyTextureInfo dest = {};
 			dest.texture = tex;
 			dest.mipLevel = mipLevel;
 			dest.aspect = wgpu::TextureAspect::All;
 
 			uint32 blockWidth = 1;
-			uint32 blockHeight = 1;
 			uint32 blockBytes = header.channels; // for uncompressed formats
 			switch ((wgpu::TextureFormat)header.format)
 			{
@@ -33,7 +33,6 @@ namespace cage
 				case wgpu::TextureFormat::BC4RUnorm:
 				case wgpu::TextureFormat::BC4RSnorm:
 					blockWidth = 4;
-					blockHeight = 4;
 					blockBytes = 8;
 					break;
 				case wgpu::TextureFormat::BC2RGBAUnorm:
@@ -47,31 +46,28 @@ namespace cage
 				case wgpu::TextureFormat::BC7RGBAUnorm:
 				case wgpu::TextureFormat::BC7RGBAUnormSrgb:
 					blockWidth = 4;
-					blockHeight = 4;
 					blockBytes = 16;
 					break;
+				default:
+					break;
 			}
+			CAGE_ASSERT((resolution[0] % blockWidth) == 0);
+			CAGE_ASSERT((resolution[1] % blockWidth) == 0);
+
 			wgpu::TexelCopyBufferLayout layout = {};
 			layout.bytesPerRow = ((resolution[0] + blockWidth - 1) / blockWidth) * blockBytes;
-			layout.rowsPerImage = (resolution[1] + blockHeight - 1) / blockHeight;
+			layout.rowsPerImage = (resolution[1] + blockWidth - 1) / blockWidth;
 
 			const uint32 copyWidth = max(blockWidth, (uint32)resolution[0]);
-			const uint32 copyHeight = max(blockHeight, (uint32)resolution[1]);
+			const uint32 copyHeight = max(blockWidth, (uint32)resolution[1]);
 			wgpu::Extent3D extents = { copyWidth, copyHeight, numeric_cast<uint32>(resolution[2]) };
 
 			queue.WriteTexture(&dest, data.data(), data.size(), &layout, &extents);
-
-			/*
-			for (uint32 i = 0; i < resolution[2]; i++)
-			{
-				dest.origin.z = i;
-				extents.depthOrArrayLayers = 1;
-				PointerRange sub = data.subRange(layout.bytesPerRow * layout.rowsPerImage * i, layout.bytesPerRow * layout.rowsPerImage);
-				queue.WriteTexture(&dest, sub.data(), sub.size(), &layout, &extents);
-			}
-			*/
 		}
+	}
 
+	namespace
+	{
 		void processLoad(AssetContext *context)
 		{
 			Deserializer des(context->originalData);
@@ -121,7 +117,7 @@ namespace cage
 				Vec3i resolution;
 				uint32 size = 0;
 				des >> resolution >> size;
-				textureLoadLevel(*queue, wtex, header, resolution, mip, des.read(size));
+				detail::textureLoadLevel(*queue, wtex, header, resolution, mip, des.read(size));
 			}
 
 			CAGE_ASSERT(des.available() == 0);
diff --git a/sources/libengine/graphics/bindings.cpp b/sources/libengine/graphics/bindings.cpp
@@ -52,8 +52,9 @@ namespace cage
 				case wgpu::TextureFormat::RGBA32Sint:
 				case wgpu::TextureFormat::RGBA32Uint:
 					return false;
+				default:
+					return true;
 			}
-			return true;
 		}
 
 		wgpu::BindGroupLayout createLayout(GraphicsDevice *device, const BindingsCreateConfig &config)
diff --git a/sources/libengine/graphics/device.cpp b/sources/libengine/graphics/device.cpp
diff --git a/sources/libengine/graphics/encoder.cpp b/sources/libengine/graphics/encoder.cpp
diff --git a/sources/libengine/graphics/font.cpp b/sources/libengine/graphics/font.cpp
diff --git a/sources/libengine/graphics/sceneRender.cpp b/sources/libengine/graphics/sceneRender.cpp
diff --git a/sources/libengine/gui/graphics.cpp b/sources/libengine/gui/graphics.cpp
diff --git a/sources/libengine/gui/private.h b/sources/libengine/gui/private.h
diff --git a/sources/libengine/gui/widgets/colorPicker.cpp b/sources/libengine/gui/widgets/colorPicker.cpp
diff --git a/sources/libengine/gui/widgets/solidColor.cpp b/sources/libengine/gui/widgets/solidColor.cpp

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ vec4 lighting(Material material)`
`158`	`158`	`// emissive`
`159`	`159`	`res.rgb += material.albedo * material.emissive;`
`160`	`160`
	`161`	`+#ifdef Normals`
`161`	`162`	`if (dot(normal, normal) > 0.5) // lighting enabled`
`162`	`163`	`{`
`163`	`164`	`float ssao = 1;`
`@@ -197,6 +198,7 @@ vec4 lighting(Material material)`
`197`	`198`	`}`
`198`	`199`	`}`
`199`	`200`	`}`
	`201`	`+#endif // Normals`
`200`	`202`
`201`	`203`	`if (material.fade < 0.5)`
`202`	`204`	`res.a = material.opacity;`
`@@ -278,6 +280,8 @@ Material loadMaterial()`
`278`	`280`	`// additionally applies normal map`
`279`	`281`	`void updateNormal()`
`280`	`282`	`{`
	`283`	`+#ifdef Normals`
	`284`	`+`
`281`	`285`	`normal = normalize(varNormal);`
`282`	`286`
`283`	`287`	`#if defined(MaterialTexRegular) \|\| defined(MaterialTexArray) \|\| defined(MaterialTexCube)`
`@@ -299,4 +303,10 @@ void updateNormal()`
`299`	`303`	`}`
`300`	`304`	`else`
`301`	`305`	`normal = vec3(0);`
	`306`	`+`
	`307`	`+#else`
	`308`	`+`
	`309`	`+ normal = vec3(0);`
	`310`	`+`
	`311`	`+#endif // Normals`
`302`	`312`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,11 @@ void propagateInputs()`
`20`	`20`	`{`
`21`	`21`	`varInstanceId = gl_InstanceIndex;`
`22`	`22`	`varPosition = inPosition;`
	`23`	`+#ifdef Normals`
`23`	`24`	`varNormal = inNormal;`
	`25`	`+#else`
	`26`	`+ varNormal = vec3(0);`
	`27`	`+#endif // Normals`
`24`	`28`	`varUv = inUv;`
`25`	`29`	`}`
`26`	`30`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@ void main()`
`21`	`21`	`{`
`22`	`22`	`gl_Position.z = 0;`
`23`	`23`	`gl_Position.w = 1;`
`24`		`- gl_Position.xy = uniPos.xy + (uniPos.zw - uniPos.xy) * inUv;`
`25`		`- varUv = inUv;`
	`24`	`+ gl_Position.xy = uniPos.xy + (uniPos.zw - uniPos.xy) * inPosition.xy;`
	`25`	`+ varUv.x = inUv.x;`
	`26`	`+ varUv.y = 1 - inUv.y;`
`26`	`27`	`}`
`27`	`28`
`28`	`29`