GPU primitives

CHANGELOG.md

@@ -81,6 +81,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `Attachable` INI and Lua (R/W) properties `InheritsVelWhenDetached` and `InheritsAngularVelWhenDetached`, which determine how much of these velocities an attachable inherits from its parent when detached. Defaults to 1.
 
+- New GPU Renderer using OpenGL+Raylib, draw now takes 0ms in pretty much every instance.
+
+- New Z Order for scene layers and primitives: Background layer sits at z=100, Terrain Background at z=50, Terrain color and MO color at z=0, GUIs sit at z=-100, allowed z range is [-200, +200], in the future this'll be expanded to MO draw as well.
 - Added Lua-accessible bitmap manipulation functions to `MOSprite`s:	
 	```
 	GetSpritePixelIndex(int x, int y, int whichFrame) - Returns the color index of the pixel at the given coordinate on the given frame of the sprite ((0, 0) is the upper left corner!)
@@ -103,6 +106,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `SceneMan` function `CastAllMOsRay(startVector, rayVector, table ignoreMOIDs, ignoreTeam, ignoreMaterial, bool ignoreAllTerrain, int skip)` which returns an iterator with pointers to all the non-ignored MOs met along the ray.
 
+- New parameter `depth` for all primitives sets draw depth of the drawn primitive. The default depth is -75.0 (lower numbers draw on top, higher numbers in the back). 
+
+- New `DrawDepth` enum for default draw depths:
+   - `Default` = 0.0f (Main draw depth for MOs)
+   - `GUI` = -100.0f (Draw Depth of GUI elements)
+   - `Primitive` = -75.0f (Default Primitive draw depth)
+   - `TerrainBackground` = 50.0f (Draw Depth of Terrain Background layer)
+   - `Background` = 100.0f (Draw Depth of Background layer)
+
 - Added scaling capability to Bitmap primitives.
 	New draw bindings with argument for scale are:
 	```
@@ -168,6 +180,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - `InheritsVel` and its ilk have been uncapped, allowing users to set them outside of 0-1.
 
+- Lua renamed `SceneLayer`->`StaticSceneLayer` due to changed SLBackground base class.
+
 - `Scene` Lua functions `AddNavigatableArea(areaName)` and `ClearNavigatableAreas()` have been renamed/corrected to `AddNavigableArea(areaName)` and `ClearNavigableAreas()`, respectively.
 
 - `MOSRotating` Lua function `AddWound` now additionally accepts the format `MOSRotating:AddWound(AEmitter* woundToAdd, const Vector& parentOffsetToSet, bool checkGibWoundLimit, bool isEntryWound, bool isExitWound)`, allowing modders to specify added wounds as entry- or exit wounds, for the purpose of not playing multiple burst sounds on the same frame. These new arguments are optional.
@@ -204,6 +218,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed an issue where internal Lua functions OriginalDoFile, OriginalLoadFile, and OriginalRequire were polluting the global namespace. They have now been made inaccessible.
 
+- Fixed the palette being mangled to 6bit/color on load.
+
+- Fixed allegro not loading alpha of image with alpha by using SDL_image instead.
 - Fixed `MOSprite:UnRotateOffset()` giving the wrong results on HFLipped sprites.
 
 - Various fixes and improvements to inventory management when dual-wielding or carrying a shield, to stop situations where the actor unexpectedly puts their items away.

Data/Base.rte/Shaders/Background.frag

@@ -1,14 +1,19 @@
-#version 130
+#version 330
+#extension GL_KHR_blend_equation_advanced: enable
+#extension GL_ARB_sample_shading: enable
 
 in vec2 textureUV;
 in vec4 vertexColor;
 
+#ifdef GL_KHR_blend_equation_advanced
+layout(blend_support_all_equations) out;
+#endif
 out vec4 FragColor;
-
 uniform sampler2D rteTexture;
 uniform sampler2D rtePalette;
-uniform vec4 rteColor;
-uniform bool drawMasked;
+uniform vec4 rteColor = vec4(1.0);
+uniform bool rteBlendInvert = false;
+uniform bool drawMasked = false;
 
 
 vec4 texture2DAA(sampler2D tex, vec2 uv) {
@@ -25,5 +30,9 @@ void main() {
 	if (red==0 && drawMasked) {
 		discard;
 	}
-	FragColor = texture2DAA(rtePalette, vec2(red * rteColor.r * vertexColor.r, 0.0)) * vec4(vec3(1.0), rteColor.a * vertexColor.a);
+	if (!rteBlendInvert) {
+		FragColor = texture2DAA(rtePalette, vec2(red * vertexColor.r, 0.0)) * vec4(rteColor.rgb, rteColor.a * vertexColor.a);
+	} else {
+		FragColor = vec4(vec3(1.0), 0.0) - (texture2DAA(rtePalette, vec2(red * vertexColor.r, 0.0)) * vec4(rteColor.rgb, -rteColor.a * vertexColor.a));
+	}
 }

Data/Base.rte/Shaders/Blit8.vert

@@ -6,11 +6,11 @@ in vec4 rteVertexColor;
 
 out vec2 textureUV;
 out vec4 vertexColor;
-//uniform mat4 rteModelViewProjection;
+uniform mat4 rteView;
 uniform mat4 rteProjection;
 
 void main() {
-	gl_Position = rteProjection * vec4(rteVertexPosition, 1.0);
+	gl_Position = rteProjection * rteView * vec4(rteVertexPosition, 1.0);
 	textureUV = rteVertexTexUV;
 	vertexColor = rteVertexColor;
 }

Data/Base.rte/Shaders/Dissolve.frag

@@ -0,0 +1,52 @@
+#version 130
+
+in vec2 textureUV;
+in vec4 vertexColor;
+
+out vec4 FragColor;
+
+uniform sampler2D rteTexture;
+uniform sampler2D rtePalette;
+uniform vec4 rteColor;
+
+// Pseudo random number generator. 
+float hash( vec2 a )
+{
+    return fract( sin( a.x * 3433.8 + a.y * 3843.98 ) * 45933.8 );
+}
+
+// Value noise courtesy of BigWingz 
+// check his youtube channel he has
+// a video of this one.
+// Succint version by FabriceNeyret
+float noise( vec2 U )
+{
+	vec2 id = floor( U );
+	U = fract( U );
+	U *= U * ( 3. - 2. * U );  
+
+	vec2 A = vec2( hash(id), hash(id + vec2(0,1)) );
+	vec2 B = vec2( hash(id + vec2(1,0)), hash(id + vec2(1,1)) );
+	vec2 C = mix( A, B, U.x);
+
+	return mix( C.x, C.y, U.y );
+}
+
+vec4 texture2DAA(sampler2D tex, vec2 uv) {
+	vec2 texsize = vec2(textureSize(tex, 0));
+	vec2 uv_texspace = uv * texsize;
+	vec2 seam = floor(uv_texspace + .5);
+	uv_texspace = (uv_texspace - seam) / fwidth(uv_texspace) + seam;
+	uv_texspace = clamp(uv_texspace, seam - .5, seam + .5);
+	return texture(tex, uv_texspace / texsize);
+}
+
+void main() {
+	if (noise(gl_FragCoord.xy + textureUV) < 0.5) {
+		discard;
+	}
+	float red = texture2D(rteTexture, textureUV).r;
+	vec4 color = texture2DAA(rtePalette, vec2(red * vertexColor.r, 0.0)) * vec4(rteColor.rgb, rteColor.a * vertexColor.a);
+
+	FragColor = color;
+}

Data/Base.rte/Shaders/PostProcess.vert

@@ -7,11 +7,11 @@ in vec4 rteVertexColor;
 out vec2 textureUV;
 out vec4 vertexColor;
 
-uniform mat4 rteModel;
+uniform mat4 rteView;
 uniform mat4 rteProjection;
 
 void main() {
-	gl_Position = rteProjection * rteModel * vec4(rteVertexPosition, 1.0);
+	gl_Position = rteProjection * rteView * vec4(rteVertexPosition, 1.0);
 	vertexColor = rteVertexColor;
 	textureUV = rteVertexTexUV;
 }

Data/Base.rte/Shaders/ScreenBlit.vert

@@ -5,10 +5,10 @@ in vec2 rteVertexTexUV;
 
 out vec2 textureUV;
 
-uniform mat4 rteModel;
+uniform mat4 rteView;
 uniform mat4 rteProjection;
 
 void main() {
-	gl_Position = rteProjection * rteModel * vec4(rteVertexPosition, 1.0);
+	gl_Position = rteProjection * rteView * vec4(rteVertexPosition, 1.0);
 	textureUV = rteVertexTexUV;
 }

Data/Base.rte/Shaders/Shaders.ini

@@ -17,3 +17,8 @@ AddShader = Shader
 	PresetName = Background
 	VertexShader = Base.rte/Shaders/Blit8.vert
 	FragmentShader = Base.rte/Shaders/Background.frag
+
+AddShader = Shader
+	PresetName = Dissolve
+	VertexShader = Base.rte/Shaders/Blit8.vert
+	FragmentShader = Base.rte/Shaders/Dissolve.frag

RTEA.vcxproj

@@ -801,7 +801,7 @@
     <ClInclude Include="Source\Renderer\GLCheck.h" />
     <ClInclude Include="Source\System\InputMapping.h" />
     <ClInclude Include="Source\System\InputScheme.h" />
-    <ClInclude Include="Source\System\GraphicalPrimitive.h" />
+    <ClInclude Include="Source\Renderer\GraphicalPrimitive.h" />
     <ClInclude Include="Source\System\Gamepad.h" />
     <ClInclude Include="Source\Menus\InventoryMenuGUI.h" />
     <ClInclude Include="Source\System\PieQuadrant.h" />
@@ -1324,7 +1324,7 @@
     <ClCompile Include="Source\Renderer\GLCheck.cpp" />
     <ClCompile Include="Source\System\InputMapping.cpp" />
     <ClCompile Include="Source\System\InputScheme.cpp" />
-    <ClCompile Include="Source\System\GraphicalPrimitive.cpp" />
+    <ClCompile Include="Source\Renderer\GraphicalPrimitive.cpp" />
     <ClCompile Include="Source\System\PieQuadrant.cpp" />
     <ClCompile Include="Source\System\Semver200\Semver200_comparator.cpp" />
     <ClCompile Include="Source\System\Semver200\Semver200_modifier.cpp" />

RTEA.vcxproj.filters

@@ -499,8 +499,8 @@
     <ClInclude Include="Source\Entities\Activity.h">
       <Filter>Entities</Filter>
     </ClInclude>
-    <ClInclude Include="Source\System\GraphicalPrimitive.h">
-      <Filter>System</Filter>
+    <ClInclude Include="Source\Renderer\GraphicalPrimitive.h">
+      <Filter>Renderer</Filter>
     </ClInclude>
     <ClInclude Include="Source\Menus\TitleScreen.h">
       <Filter>Menus</Filter>
@@ -1080,8 +1080,8 @@
     <ClCompile Include="Source\Entities\Activity.cpp">
       <Filter>Entities</Filter>
     </ClCompile>
-    <ClCompile Include="Source\System\GraphicalPrimitive.cpp">
-      <Filter>System</Filter>
+    <ClCompile Include="Source\Renderer\GraphicalPrimitive.cpp">
+      <Filter>Renderer</Filter>
     </ClCompile>
     <ClCompile Include="Source\Menus\TitleScreen.cpp">
       <Filter>Menus</Filter>

Source/Entities/PieMenu.cpp

@@ -636,6 +636,7 @@ void PieMenu::Draw(BITMAP* targetBitmap, const Vector& targetPos) const {
 	Vector drawPos;
 	CalculateDrawPosition(targetBitmap, targetPos, drawPos);
 
+	rlZDepth(c_GuiDepth);
 	if (m_EnabledState != EnabledState::Disabled) {
 		if (m_DrawBackgroundTransparent) {
 			g_FrameMan.SetTransTableFromPreset(TransparencyPreset::MoreTrans);
@@ -646,6 +647,7 @@ void PieMenu::Draw(BITMAP* targetBitmap, const Vector& targetPos) const {
 			DrawTexture(g_GLResourceMan.GetStaticTextureFromBitmap(m_BGBitmap), drawPos.GetFloorIntX() - m_BGBitmap->w / 2, drawPos.GetFloorIntY() - m_BGBitmap->h / 2, {255, 255, 255, 255});
 		}
 	}
+	rlZDepth(c_DefaultDrawDepth);
 
 	if (m_EnabledState == EnabledState::Enabled) {
 		DrawPieIcons(targetBitmap, drawPos);

Source/Entities/SceneLayer.cpp

@@ -432,10 +432,10 @@ void SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::UpdateTargetRegion(const Bo
 		Box bitmapDimensions(Vector(), bitmapWidth, bitmapHeight);
 
 		for (int tiledOffsetX = 0; tiledOffsetX < areaToCoverX;) {
-			float destX = scaledTarget.GetCorner().GetFloorIntX() + tiledOffsetX - scaledOffset.GetFloorIntX();
+			float destX = tiledOffsetX - scaledOffset.GetFloorIntX();
 
 			for (int tiledOffsetY = 0; tiledOffsetY < areaToCoverY;) {
-				float destY = scaledTarget.GetCorner().GetFloorIntY() + tiledOffsetY - scaledOffset.GetFloorIntY();
+				float destY = tiledOffsetY - scaledOffset.GetFloorIntY();
 				Box update = bitmapDimensions.GetIntersection({-Vector(destX, destY), scaledTarget.m_Width, scaledTarget.m_Height});
 				update.m_Corner = update.m_Corner.GetFloored();
 				update.m_Width = std::ceil(update.m_Width) + 1;

Source/Lua/LuaBindingRegisterDefinitions.h

@@ -302,5 +302,6 @@ namespace RTE {
 		LuaBindingRegisterFunctionDeclarationForType(AlarmEvent);
 		LuaBindingRegisterFunctionDeclarationForType(Directions);
 		LuaBindingRegisterFunctionDeclarationForType(DrawBlendMode);
+		LuaBindingRegisterFunctionDeclarationForType(DrawDepth);
 	};
 } // namespace RTE

Source/Lua/LuaBindingsMisc.cpp

@@ -43,3 +43,14 @@ LuaBindingRegisterFunctionDefinitionForType(MiscLuaBindings, DrawBlendMode) {
 	                            luabind::value("Transparency", DrawBlendMode::BlendTransparency),
 	                            luabind::value("BlendModeCount", DrawBlendMode::BlendModeCount)];
 }
+
+LuaBindingRegisterFunctionDefinitionForType(MiscLuaBindings, DrawDepth) {
+	return luabind::class_<draw_depths>("DrawDepth")
+		.enum_("DrawDepth")[
+			luabind::value("Default", c_DefaultDrawDepth),
+			luabind::value("GUI", c_GuiDepth),
+			luabind::value("Primitive", c_PrimitiveDepth),
+			luabind::value("TerrainBackground", c_TerrainBGDepth),
+			luabind::value("Background", c_BackgroundDepth)
+		];
+}

Source/Lua/LuaBindingsPrimitives.cpp

@@ -11,85 +11,100 @@ LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, GraphicalPrimi
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, LinePrimitive) {
 	return luabind::class_<LinePrimitive, GraphicalPrimitive>("LinePrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, const Vector&, float, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, const Vector&, float, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, ArcPrimitive) {
 	return luabind::class_<ArcPrimitive, GraphicalPrimitive>("ArcPrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, float, float, int, int, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, float, float, int, int, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, float, float, int, int, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, SplinePrimitive) {
 	return luabind::class_<SplinePrimitive, GraphicalPrimitive>("SplinePrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, const Vector&, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, const Vector&, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, const Vector&, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, BoxPrimitive) {
 	return luabind::class_<BoxPrimitive, GraphicalPrimitive>("BoxPrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, const Vector&, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, BoxFillPrimitive) {
 	return luabind::class_<BoxFillPrimitive, GraphicalPrimitive>("BoxFillPrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, const Vector&, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, RoundedBoxPrimitive) {
 	return luabind::class_<RoundedBoxPrimitive, GraphicalPrimitive>("RoundedBoxPrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, RoundedBoxFillPrimitive) {
 	return luabind::class_<RoundedBoxFillPrimitive, GraphicalPrimitive>("RoundedBoxFillPrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, CirclePrimitive) {
 	return luabind::class_<CirclePrimitive, GraphicalPrimitive>("CirclePrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, int, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, int, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, int, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, CircleFillPrimitive) {
 	return luabind::class_<CircleFillPrimitive, GraphicalPrimitive>("CircleFillPrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, int, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, int, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, int, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, EllipsePrimitive) {
 	return luabind::class_<EllipsePrimitive, GraphicalPrimitive>("EllipsePrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, int, int, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, int, int, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, int, int, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, EllipseFillPrimitive) {
 	return luabind::class_<EllipseFillPrimitive, GraphicalPrimitive>("EllipseFillPrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, int, int, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, int, int, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, int, int, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, TrianglePrimitive) {
 	return luabind::class_<TrianglePrimitive, GraphicalPrimitive>("TrianglePrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, TriangleFillPrimitive) {
 	return luabind::class_<TriangleFillPrimitive, GraphicalPrimitive>("TriangleFillPrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, TextPrimitive) {
 	return luabind::class_<TextPrimitive, GraphicalPrimitive>("TextPrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, const std::string&, bool, int, float>());
+	    .def(luabind::constructor<int, const Vector&, const std::string&, bool, int, float>())
+	    .def(luabind::constructor<int, const Vector&, const std::string&, bool, int, float, float>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, BitmapPrimitive) {
@@ -98,5 +113,7 @@ LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, BitmapPrimitiv
 	    .def(luabind::constructor<int, const Vector&, const MOSprite*, float, unsigned int, float, bool, bool>())
 	    .def(luabind::constructor<int, const Vector&, const std::string&, float, float, bool, bool>())
 	    .def(luabind::constructor<int, const Vector&, const MOSprite*, float, unsigned int, bool, bool>())
-	    .def(luabind::constructor<int, const Vector&, const std::string&, float, bool, bool>());
+	    .def(luabind::constructor<int, const Vector&, const MOSprite*, float, unsigned int, bool, bool, float>())
+	    .def(luabind::constructor<int, const Vector&, const std::string&, float, bool, bool>())
+	    .def(luabind::constructor<int, const Vector&, const std::string&, float, bool, bool, float>());
 }