Version changed

Minor issues fixed

Author: eprikazchikov

.github/workflows/main.yml

@@ -17,7 +17,7 @@ on:
 env:
   QT_VERSION: 5.15.2
   QTCREATOR_VERSION: 11.0.3
-  VERSION: 2024.2
+  VERSION: 2024.3
   THUNDER_RELEASE: ${{ startsWith(github.ref, 'refs/tags/2') }}
 
 jobs:

modules/editor/shadertools/shaders/Default.frag

@@ -10,7 +10,7 @@ void main(void) {
 #pragma instance
 
 #ifdef VISIBILITY_BUFFER
-    color = vec4(objectId);
+    color = objectId;
     return;
 #endif
 

modules/editor/shadertools/shaders/Shader.frag

@@ -54,7 +54,7 @@ void main(void) {
     vec3 emit = Emissive * _color.xyz;
 
 #ifdef VISIBILITY_BUFFER
-    gbuffer0 = vec4(objectId);
+    gbuffer0 = objectId;
     return;
 #endif
 

modules/vms/angel/src/angelsystem.cpp

@@ -33,6 +33,18 @@
 #define TEMPALTE "AngelBinary"
 #define URI "thor://Components/"
 
+void replace(std::string &srcStr, const std::string &findStr,
+                               const std::string &replaceStr) {
+    std::size_t replaceStrLen = replaceStr.length();
+    for (std::size_t pos = 0; pos != std::string::npos; pos += replaceStrLen) {
+        if ((pos = srcStr.find(findStr, pos)) != std::string::npos) {
+            srcStr.replace(pos, findStr.length(), replaceStr);
+        } else {
+            break;
+        }
+    }
+}
+
 class AngelStream : public asIBinaryStream {
 public:
     explicit AngelStream(ByteArray &ptr) :
@@ -403,6 +415,7 @@ void AngelSystem::bindMetaType(asIScriptEngine *engine, const MetaType::Table &t
                         it = '@';
                     }
                 }
+                replace(signature, "std::", "");
 
                 if(method.table()->type == MetaMethod::Static) {
                     engine->SetDefaultNamespace(typeName);

version.cfg

@@ -1 +1 @@
-2024.2
+2024.3

worldeditor/bin/engine/materials/DefaultFont.shader

@@ -58,7 +58,7 @@ void main() {
     }
 
 #ifdef VISIBILITY_BUFFER
-    color = vec4(objectId);
+    color = objectId;
     return;
 #endif
 

worldeditor/bin/engine/materials/DefaultMesh.shader

@@ -32,7 +32,7 @@ void main() {
     float model = 0.333f;
 
 #ifdef VISIBILITY_BUFFER
-    gbuffer0 = vec4(objectID);
+    gbuffer0 = objectId;
     return;
 #endif
 

worldeditor/bin/engine/materials/DefaultSprite.shader

@@ -29,7 +29,7 @@ void main() {
     }
 
 #ifdef VISIBILITY_BUFFER
-    color = vec4(objectId);
+    color = objectId;
     return;
 #endif