custom draw component

Author: malytomas

sources/asset-processor/texture.cpp

@@ -465,7 +465,7 @@ void processTexture()
 		const bool pa = toBool(processor->property("premultiplyAlpha"));
 		const bool srgb = toBool(processor->property("srgb"));
 		const bool normal = toBool(processor->property("normal"));
-		const bool mips = toBool(processor->property("mipmaps"));
+		//const bool mips = toBool(processor->property("mipmaps"));
 		if ((h2n || s2s || g2s || normal) && pa)
 			CAGE_THROW_ERROR(Exception, "premultiplied alpha is for colors only");
 		if ((h2n || s2s || g2s || normal) && srgb)

sources/include/cage-engine/sceneCustomDraw.h

@@ -0,0 +1,26 @@
+#ifndef guard_sceneCustomDraw_srui74ko8er
+#define guard_sceneCustomDraw_srui74ko8er
+
+#include <cage-engine/core.h>
+
+namespace cage
+{
+	class Entity;
+	class GraphicsEncoder;
+	struct SceneRenderConfig;
+
+	struct CAGE_ENGINE_API CustomDrawConfig
+	{
+		const SceneRenderConfig *renderConfig = nullptr;
+		GraphicsEncoder *encoder = nullptr;
+		Entity *entity = nullptr;
+	};
+
+	struct CAGE_ENGINE_API CustomDrawComponent
+	{
+		Delegate<void(const CustomDrawConfig &)> callback;
+		sint32 renderLayer = 0;
+	};
+}
+
+#endif // guard_sceneCustomDraw_srui74ko8er

sources/libengine/graphics/sceneRender.cpp

@@ -28,6 +28,7 @@
 #include <cage-engine/model.h>
 #include <cage-engine/renderObject.h>
 #include <cage-engine/scene.h>
+#include <cage-engine/sceneCustomDraw.h>
 #include <cage-engine/sceneRender.h>
 #include <cage-engine/screenSpaceEffects.h>
 #include <cage-engine/shader.h>
@@ -123,9 +124,12 @@ namespace cage
 			Holder<Font> font;
 		};
 
+		struct RenderCustom : private Noncopyable
+		{};
+
 		struct RenderData : private Noncopyable
 		{
-			std::variant<std::monostate, RenderModel, RenderIcon, RenderText> data;
+			std::variant<std::monostate, RenderModel, RenderIcon, RenderText, RenderCustom> data;
 			Mat4 model;
 			Vec4 color = Vec4::Nan(); // linear rgb (NOT alpha-premultiplied), opacity
 			Vec4 animation = Vec4::Nan(); // time (seconds), speed, offset (normalized), unused
@@ -166,6 +170,8 @@ namespace cage
 							return { renderLayer, translucent, depth, +r.mesh, +r.texture, false };
 						if constexpr (std::is_same_v<T, RenderText>)
 							return { renderLayer, translucent, depth, +r.font, nullptr, false };
+						if constexpr (std::is_same_v<T, RenderCustom>)
+							return { renderLayer, translucent, depth, nullptr, nullptr, false };
 						return {};
 					},
 					data);
@@ -660,6 +666,28 @@ namespace cage
 				}
 			}
 
+			void renderCustom(const RenderModeEnum renderMode, const PointerRange<const RenderData> instances) const
+			{
+				CAGE_ASSERT(!instances.empty());
+				const RenderData &rd = instances[0];
+				CAGE_ASSERT(std::holds_alternative<RenderCustom>(rd.data));
+
+				if (renderMode != RenderModeEnum::Color)
+					return;
+
+				for (const auto &it : instances)
+				{
+					const ProfilingScope profiling("custom draw");
+					CAGE_ASSERT(std::holds_alternative<RenderCustom>(it.data));
+					CustomDrawConfig cfg;
+					cfg.renderConfig = this;
+					cfg.entity = it.e;
+					cfg.encoder = +encoder;
+					CAGE_ASSERT(it.e->has<CustomDrawComponent>());
+					it.e->value<CustomDrawComponent>().callback(cfg);
+				}
+			}
+
 			void renderInstances(const RenderModeEnum renderMode, const PointerRange<const RenderData> instances) const
 			{
 				CAGE_ASSERT(!instances.empty());
@@ -676,6 +704,8 @@ namespace cage
 							renderIcons(renderMode, instances);
 						if constexpr (std::is_same_v<T, RenderText>)
 							renderTexts(renderMode, instances);
+						if constexpr (std::is_same_v<T, RenderCustom>)
+							renderCustom(renderMode, instances);
 					},
 					rd.data);
 			}
@@ -706,6 +736,8 @@ namespace cage
 								return { +r.mesh, +r.texture, false, d.translucent };
 							if constexpr (std::is_same_v<T, RenderText>)
 								return { +r.font, nullptr, false, d.translucent };
+							if constexpr (std::is_same_v<T, RenderCustom>)
+								return { d.e, nullptr, false, d.translucent };
 							return {};
 						},
 						d.data);
@@ -886,6 +918,21 @@ namespace cage
 				renderData.push_back(std::move(rd));
 			}
 
+			void prepareCustomDraw(Entity *e, const CustomDrawComponent &cdc)
+			{
+				CAGE_ASSERT(cdc.callback);
+				RenderCustom rc;
+				RenderData rd;
+				rd.e = e;
+				rd.model = Mat4(modelTransform(e));
+				rd.color = initializeColor(e->getOrDefault<ColorComponent>());
+				rd.renderLayer = cdc.renderLayer;
+				rd.translucent = true;
+				rd.depth = (viewProj * (rd.model * Vec4(0, 0, 0, 1)))[2] * -1;
+				rd.data = std::move(rc);
+				renderData.push_back(std::move(rd));
+			}
+
 			CAGE_FORCE_INLINE bool failedMask(Entity *e) const
 			{
 				const uint32 c = e->getOrDefault<SceneComponent>().sceneMask;
@@ -952,6 +999,15 @@ namespace cage
 						prepareText(e, tc);
 					},
 					+scene, false);
+
+				entitiesVisitor(
+					[&](Entity *e, const CustomDrawComponent &cdc)
+					{
+						if (failedMask(e))
+							return;
+						prepareCustomDraw(e, cdc);
+					},
+					+scene, false);
 			}
 
 			void orderRenderData()

sources/libengine/graphics/spirv.cpp

@@ -37,6 +37,7 @@ namespace cage
 					glslang::InitializeProcess();
 					return 0;
 				}();
+				(void)dummy;
 			}
 
 			void importGlsl(const GlslConfig &glsl)

sources/libengine/graphics/texture.cpp

@@ -79,6 +79,8 @@ namespace cage
 						}
 						break;
 					}
+					case ImageFormatEnum::Default:
+						break;
 				}
 			}
 

sources/libengine/gui/graphics.cpp

@@ -24,8 +24,8 @@ namespace cage
 	{
 		if (clipSize[0] >= 1 && clipSize[1] >= 1)
 		{
-			const Vec2i pos = Vec2i(Vec2(clipPos[0], impl->outputResolution[1] - clipPos[1] - clipSize[1]));
-			const Vec2i siz = Vec2i(clipSize);
+			//const Vec2i pos = Vec2i(Vec2(clipPos[0], impl->outputResolution[1] - clipPos[1] - clipSize[1]));
+			//const Vec2i siz = Vec2i(clipSize);
 			//impl->activeQueue->nativeRenderEncoder().SetScissorRect(pos[0], pos[1], siz[0], siz[1]); // todo
 			return true;
 		}

sources/libsimple/gameloop.cpp

@@ -33,6 +33,7 @@
 #include <cage-engine/model.h>
 #include <cage-engine/renderObject.h>
 #include <cage-engine/scene.h>
+#include <cage-engine/sceneCustomDraw.h>
 #include <cage-engine/scenePicking.h>
 #include <cage-engine/sceneScreenSpaceEffects.h>
 #include <cage-engine/sceneVirtualReality.h>
@@ -404,6 +405,7 @@ namespace cage
 					entityMgr->defineComponent(SoundComponent());
 					entityMgr->defineComponent(ListenerComponent());
 					entityMgr->defineComponent(PickableComponent());
+					entityMgr->defineComponent(CustomDrawComponent());
 					entityMgr->defineComponent(VrOriginComponent());
 					entityMgr->defineComponent(VrCameraComponent());
 					entityMgr->defineComponent(VrControllerComponent());