Merge branch 'dev-21'

JujuAdams · Dec 9, 2023 · b9ff2f0 · b9ff2f0
2 parents 56c618a + cdcab4b
commit b9ff2f0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <p align="center"><img src="https://raw.githubusercontent.com/JujuAdams/Bulb/master/LOGO.png" style="display:block; margin:auto; width:300px"></p>
 
-<h1 align="center">Bulb 21.0.0</h1>
+<h1 align="center">Bulb 21.0.1</h1>
 
 <p align="center">2D lighting and shadows for GameMaker 2022 LTS</p>
 

diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy
@@ -4,7 +4,7 @@
   "name": "Windows",
   "option_windows_display_name": "Bulb",
   "option_windows_executable_name": "${project_name}",
-  "option_windows_version": "21.0.0.0",
+  "option_windows_version": "21.0.1.0",
   "option_windows_company_info": "Juju Adams",
   "option_windows_product_info": "Bulb",
   "option_windows_copyright_info": "Juju Adams (c) 2023",

diff --git a/scripts/BulbRenderer/BulbRenderer.gml b/scripts/BulbRenderer/BulbRenderer.gml
@@ -395,7 +395,7 @@ function BulbRenderer(_ambientColour, _mode, _smooth) constructor
             //Add static shadow caster vertices to the relevant vertex buffer
             if (mode == BULB_MODE.SOFT_BM_ADD)
             {
-                vertex_begin(__staticVBuffer, global.__bulb_format_3d_normal_tex);
+                vertex_begin(__staticVBuffer, global.__bulbFormat3DNormalTex);
 
                 var _array = __staticOccludersArray;
                 var _i = 0;
@@ -415,7 +415,7 @@ function BulbRenderer(_ambientColour, _mode, _smooth) constructor
             }
             else
             {
-                vertex_begin(__staticVBuffer, global.__bulb_format_3d_normal);
+                vertex_begin(__staticVBuffer, global.__bulbFormat3DNormal);
 
                 var _array = __staticOccludersArray;
                 var _i = 0;
@@ -447,7 +447,7 @@ function BulbRenderer(_ambientColour, _mode, _smooth) constructor
         //Add dynamic occluder vertices to the relevant vertex buffer
         if (mode == BULB_MODE.SOFT_BM_ADD)
         {
-            vertex_begin(_dynamicVBuffer, global.__bulb_format_3d_normal_tex);
+            vertex_begin(_dynamicVBuffer, global.__bulbFormat3DNormalTex);
 
             var _array = __dynamicOccludersArray;
             var _i = 0;
@@ -471,7 +471,7 @@ function BulbRenderer(_ambientColour, _mode, _smooth) constructor
         }
         else
         {
-            vertex_begin(_dynamicVBuffer, global.__bulb_format_3d_normal);
+            vertex_begin(_dynamicVBuffer, global.__bulbFormat3DNormal);
 
             var _array = __dynamicOccludersArray;
             var _i = 0;
@@ -909,6 +909,10 @@ function BulbRenderer(_ambientColour, _mode, _smooth) constructor
                             }
                             else
                             {
+                                //Ensure any previous changes to the z-buffer don't leak across
+                                gpu_set_colorwriteenable(true, true, true, false);
+                                gpu_set_zfunc(cmpfunc_always);
+
                                 //Just draw the sprite, no fancy stuff here
                                 draw_sprite_ext(sprite, image,
                                                 x, y,

diff --git a/scripts/__BulbSystem/__BulbSystem.gml b/scripts/__BulbSystem/__BulbSystem.gml
@@ -1,20 +1,20 @@
-#macro __BULB_VERSION         "21.0.0"
-#macro __BULB_DATE            "2023-12-09"
-#macro __BULB_ZFAR            1
+#macro __BULB_VERSION  "21.0.1"
+#macro __BULB_DATE     "2023-12-09"
+#macro __BULB_ZFAR     1
 
 __BulbTrace("Welcome to Bulb by Juju Adams! This is version " + __BULB_VERSION + ", " + __BULB_DATE);
 
 //Create a couple vertex formats
 vertex_format_begin();
 vertex_format_add_position_3d();
 vertex_format_add_normal();
-global.__bulb_format_3d_normal = vertex_format_end();
+global.__bulbFormat3DNormal = vertex_format_end();
 
 vertex_format_begin();
 vertex_format_add_position_3d();
 vertex_format_add_normal();
 vertex_format_add_texcoord();
-global.__bulb_format_3d_normal_tex = vertex_format_end();
+global.__bulbFormat3DNormalTex = vertex_format_end();