AS Bindings: Renaming files for consistency (#2801)

Source/Tools/BindingGenerator/ASResult.cpp

@@ -52,7 +52,7 @@ void ASGeneratedFile_Members::Save()
         "#include \"../Precompiled.h\"\n"
         "#include \"../AngelScript/APITemplates.h\"\n"
         "\n"
-        "#include \"../AngelScript/GeneratedIncludes.h\"\n"
+        "#include \"../AngelScript/Generated_Includes.h\"\n"
         "#include \"../AngelScript/Manual.h\"\n"
         "\n"
         "namespace Urho3D\n"
@@ -89,7 +89,7 @@ void ASGeneratedFile_Templates::Save()
         "#include \"../Precompiled.h\"\n"
         "#include \"../AngelScript/APITemplates.h\"\n"
         "\n"
-        "#include \"../AngelScript/GeneratedIncludes.h\"\n"
+        "#include \"../AngelScript/Generated_Includes.h\"\n"
         "\n"
         "#include \"../AngelScript/Manual.h\"\n"
         "\n"
@@ -159,12 +159,12 @@ namespace Result
 {
     vector<ProcessedEnum> enums_;
 
-    // Write result to GeneratedEnums.cpp
+    // Write result to Generated_Enums.cpp
     static void SaveEnums()
     {
         sort(enums_.begin(), enums_.end());
 
-        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/GeneratedEnums.cpp");
+        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/Generated_Enums.cpp");
 
         ofs <<
             "// DO NOT EDIT. This file is generated\n"
@@ -174,7 +174,7 @@ namespace Result
             "#include \"../Precompiled.h\"\n"
             "#include \"../AngelScript/APITemplates.h\"\n"
             "\n"
-            "#include \"../AngelScript/GeneratedIncludes.h\"\n"
+            "#include \"../AngelScript/Generated_Includes.h\"\n"
             "\n"
             "namespace Urho3D\n"
             "{\n"
@@ -244,12 +244,12 @@ namespace Result
 
     vector<ProcessedGlobalFunction> globalFunctions_;
 
-    // Write result to GlobalFunctions.cpp
+    // Write result to Generated_GlobalFunctions.cpp
     static void SaveGlobalFunctions()
     {
         sort(globalFunctions_.begin(), globalFunctions_.end());
 
-        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/GeneratedGlobalFunctions.cpp");
+        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/Generated_GlobalFunctions.cpp");
 
         ofs <<
             "// DO NOT EDIT. This file is generated\n"
@@ -257,7 +257,7 @@ namespace Result
             "#include \"../Precompiled.h\"\n"
             "#include \"../AngelScript/APITemplates.h\"\n"
             "\n"
-            "#include \"../AngelScript/GeneratedIncludes.h\"\n"
+            "#include \"../AngelScript/Generated_Includes.h\"\n"
             "\n"
             "namespace Urho3D\n"
             "{\n"
@@ -327,12 +327,12 @@ namespace Result
 
     vector<ProcessedGlobalVariable> globalVariables_;
 
-    // Write result to GlobalVariables.cpp
+    // Write result to Generated_GlobalVariables.cpp
     static void SaveGlobalVariables()
     {
         sort(globalVariables_.begin(), globalVariables_.end());
 
-        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/GeneratedGlobalVariables.cpp");
+        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/Generated_GlobalVariables.cpp");
 
         ofs <<
             "// DO NOT EDIT. This file is generated\n"
@@ -340,7 +340,7 @@ namespace Result
             "#include \"../Precompiled.h\"\n"
             "#include \"../AngelScript/APITemplates.h\"\n"
             "\n"
-            "#include \"../AngelScript/GeneratedIncludes.h\"\n"
+            "#include \"../AngelScript/Generated_Includes.h\"\n"
             "\n"
             "// Some headers could re-define M_PI, ensure that it's undefined\n"
             "#undef M_PI\n"
@@ -393,10 +393,10 @@ namespace Result
 
     vector<ProcessedClass> classes_;
 
-    // Write result to GeneratedObjectTypes.cpp
+    // Write result to Generated_ObjectTypes.cpp
     static void SaveObjectTypes()
     {
-        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/GeneratedObjectTypes.cpp");
+        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/Generated_ObjectTypes.cpp");
 
         ofs <<
             "// DO NOT EDIT. This file is generated\n"
@@ -406,7 +406,7 @@ namespace Result
             "#include \"../Precompiled.h\"\n"
             "#include \"../AngelScript/APITemplates.h\"\n"
             "\n"
-            "#include \"../AngelScript/GeneratedIncludes.h\"\n"
+            "#include \"../AngelScript/Generated_Includes.h\"\n"
             "\n"
             "namespace Urho3D\n"
             "{\n"
@@ -450,10 +450,10 @@ namespace Result
             "}\n";
     }
 
-    // Write result to GeneratedDefaultConstructors.cpp
+    // Write result to Generated_DefaultConstructors.cpp
     static void SaveDefaultConstructors()
     {
-        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/GeneratedDefaultConstructors.cpp");
+        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/Generated_DefaultConstructors.cpp");
 
         ofs <<
             "// DO NOT EDIT. This file is generated\n"
@@ -463,7 +463,7 @@ namespace Result
             "#include \"../Precompiled.h\"\n"
             "#include \"../AngelScript/APITemplates.h\"\n"
             "\n"
-            "#include \"../AngelScript/GeneratedIncludes.h\"\n"
+            "#include \"../AngelScript/Generated_Includes.h\"\n"
             "\n"
             "namespace Urho3D\n"
             "{\n";
@@ -549,10 +549,10 @@ namespace Result
             "}\n";
     }
 
-    // Write result to GeneratedClasses.cpp
+    // Write result to Generated_Classes.cpp
     static void SaveGeneratedClasses()
     {
-        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/GeneratedClasses.cpp");
+        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/Generated_Classes.cpp");
 
         ofs <<
             "// DO NOT EDIT. This file is generated\n"
@@ -560,7 +560,7 @@ namespace Result
             "#include \"../Precompiled.h\"\n"
             "#include \"../AngelScript/APITemplates.h\"\n"
             "\n"
-            "#include \"../AngelScript/GeneratedIncludes.h\"\n"
+            "#include \"../AngelScript/Generated_Includes.h\"\n"
             "#include \"../AngelScript/Generated_Members.h\"\n"
             "#include \"../AngelScript/Manual.h\"\n"
             "\n"
@@ -818,8 +818,8 @@ namespace Result
                 "#include \"../Precompiled.h\"\n"
                 "#include \"../AngelScript/APITemplates.h\"\n"
                 "\n"
-                "#include \"../AngelScript/GeneratedIncludes.h\"\n"
-                "#include \"../AngelScript/GeneratedClassMembers.h\"\n"
+                "#include \"../AngelScript/Generated_Includes.h\"\n"
+                "#include \"../AngelScript/Generated_ClassMembers.h\"\n"
                 "#include \"../AngelScript/Manual.h\"\n"
                 "\n"
                 "namespace Urho3D\n"
@@ -854,7 +854,7 @@ namespace Result
             "\n"
             "#include \"../AngelScript/APITemplates.h\"\n"
             "\n"
-            "#include \"../AngelScript/GeneratedIncludes.h\"\n"
+            "#include \"../AngelScript/Generated_Includes.h\"\n"
             "#include \"../AngelScript/Manual.h\"\n"
             "\n"
             "namespace Urho3D\n"
@@ -1077,13 +1077,13 @@ namespace Result
         }
     }
 
-    // Write result to GeneratedIncludes.h
+    // Write result to Generated_Includes.h
     static void SaveIncludes()
     {
         sort(headers_.begin(), headers_.end());
         sort(ignoredHeaders_.begin(), ignoredHeaders_.end());
 
-        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/GeneratedIncludes.h");
+        ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/Generated_Includes.h");
 
         ofs <<
             "// DO NOT EDIT. This file is generated\n"

Source/Tools/BindingGenerator/ASTemplateGenerator.cpp

@@ -195,7 +195,7 @@ void WriteFactories(ofstream& ofs)
 
 void GenerateTemplates()
 {
-    ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/Generated_Templates_New.h");
+    ofstream ofs(_sourceDir + "/Source/Urho3D/AngelScript/Generated_Templates.h");
 
     ofs <<
         "// DO NOT EDIT. This file is generated\n"

Source/Urho3D/AngelScript/GeneratedClasses.cpp → Source/Urho3D/AngelScript/Generated_Classes.cpp

@@ -3,7 +3,7 @@
 #include "../Precompiled.h"
 #include "../AngelScript/APITemplates.h"
 
-#include "../AngelScript/GeneratedIncludes.h"
+#include "../AngelScript/Generated_Includes.h"
 #include "../AngelScript/Generated_Members.h"
 #include "../AngelScript/Manual.h"
 

Source/Urho3D/AngelScript/GeneratedDefaultConstructors.cpp → Source/Urho3D/AngelScript/Generated_DefaultConstructors.cpp

@@ -5,7 +5,7 @@
 #include "../Precompiled.h"
 #include "../AngelScript/APITemplates.h"
 
-#include "../AngelScript/GeneratedIncludes.h"
+#include "../AngelScript/Generated_Includes.h"
 
 namespace Urho3D
 {

Source/Urho3D/AngelScript/GeneratedEnums.cpp → Source/Urho3D/AngelScript/Generated_Enums.cpp

@@ -5,7 +5,7 @@
 #include "../Precompiled.h"
 #include "../AngelScript/APITemplates.h"
 
-#include "../AngelScript/GeneratedIncludes.h"
+#include "../AngelScript/Generated_Includes.h"
 
 namespace Urho3D
 {

Source/Urho3D/AngelScript/GeneratedGlobalFunctions.cpp → Source/Urho3D/AngelScript/Generated_GlobalFunctions.cpp

@@ -3,7 +3,7 @@
 #include "../Precompiled.h"
 #include "../AngelScript/APITemplates.h"
 
-#include "../AngelScript/GeneratedIncludes.h"
+#include "../AngelScript/Generated_Includes.h"
 
 namespace Urho3D
 {

Source/Urho3D/AngelScript/GeneratedGlobalVariables.cpp → Source/Urho3D/AngelScript/Generated_GlobalVariables.cpp

@@ -3,7 +3,7 @@
 #include "../Precompiled.h"
 #include "../AngelScript/APITemplates.h"
 
-#include "../AngelScript/GeneratedIncludes.h"
+#include "../AngelScript/Generated_Includes.h"
 
 // Some headers could re-define M_PI, ensure that it's undefined
 #undef M_PI

Source/Urho3D/AngelScript/Generated_Members.h

@@ -4,7 +4,7 @@
 
 #include "../AngelScript/APITemplates.h"
 
-#include "../AngelScript/GeneratedIncludes.h"
+#include "../AngelScript/Generated_Includes.h"
 #include "../AngelScript/Manual.h"
 
 namespace Urho3D
@@ -4432,10 +4432,10 @@ template <class T> void RegisterMembers_Serializer(asIScriptEngine* engine, cons
 // struct ShaderParameter | File: ../Graphics/ShaderVariation.h
 template <class T> void RegisterMembers_ShaderParameter(asIScriptEngine* engine, const char* className)
 {
-    // union ShaderParameter::@0 Urho3D::ShaderParameter::@1
-    // Error: type "union Urho3D::ShaderParameter::@0" can not automatically bind
-    // union ShaderParameter::@2 Urho3D::ShaderParameter::@3
-    // Error: type "union Urho3D::ShaderParameter::@2" can not automatically bind
+    // union ShaderParameter::@4 Urho3D::ShaderParameter::@5
+    // Error: type "union Urho3D::ShaderParameter::@4" can not automatically bind
+    // union ShaderParameter::@6 Urho3D::ShaderParameter::@7
+    // Error: type "union Urho3D::ShaderParameter::@6" can not automatically bind
     // ConstantBuffer* ShaderParameter::bufferPtr_
     // Not registered because pointer
 

Source/Urho3D/AngelScript/GeneratedObjectTypes.cpp → Source/Urho3D/AngelScript/Generated_ObjectTypes.cpp

@@ -5,7 +5,7 @@
 #include "../Precompiled.h"
 #include "../AngelScript/APITemplates.h"
 
-#include "../AngelScript/GeneratedIncludes.h"
+#include "../AngelScript/Generated_Includes.h"
 
 namespace Urho3D
 {

Source/Urho3D/AngelScript/Manual_Scene.h

@@ -22,13 +22,11 @@
 
 #pragma once
 
-//#include "../AngelScript/APITemplates.h"
 #include "../Graphics/Skeleton.h"
 #include "../Scene/Scene.h"
 #include "../Graphics/Octree.h"
 #include "../Graphics/DebugRenderer.h"
 #include "../IO/PackageFile.h"
-//#include "../AngelScript/GeneratedIncludes.h"
 
 namespace Urho3D
 {

Source/Urho3D/AngelScript/RegistrationMacros.h

@@ -26,7 +26,7 @@
 #include "../AngelScript/aswrappedcall.h"
 #endif
 
-#include "../AngelScript/Generated_Templates_New.h"
+#include "../AngelScript/Generated_Templates.h"
 
 namespace Urho3D
 {

Source/Urho3D/CMakeLists.txt

@@ -43,9 +43,9 @@ elseif (MINGW)
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wa,-mbig-obj")
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj")
     elseif (CMAKE_BUILD_TYPE MATCHES Debug)
-        SET_SOURCE_FILES_PROPERTIES(AngelScript/GeneratedClasses.cpp PROPERTIES COMPILE_FLAGS -Os)
-        SET_SOURCE_FILES_PROPERTIES(AngelScript/GeneratedClasses.cpp PROPERTIES LINK_FLAGS -Os)
-        SET_SOURCE_FILES_PROPERTIES(AngelScript/GeneratedClasses.cpp PROPERTIES STATIC_LIBRARY_FLAGS -Os)
+        SET_SOURCE_FILES_PROPERTIES(AngelScript/Generated_Classes.cpp PROPERTIES COMPILE_FLAGS -Os)
+        SET_SOURCE_FILES_PROPERTIES(AngelScript/Generated_Classes.cpp PROPERTIES LINK_FLAGS -Os)
+        SET_SOURCE_FILES_PROPERTIES(AngelScript/Generated_Classes.cpp PROPERTIES STATIC_LIBRARY_FLAGS -Os)
     endif ()
 endif ()
 
@@ -183,15 +183,15 @@ if (URHO3D_GENERATEBINDINGS)
     set (XML_AST_DIR "${CMAKE_BINARY_DIR}/Source/Tools/BindingGenerator/generated/xml")
     set (BINDING_GENERATOR_PATH "${CMAKE_BINARY_DIR}/bin/tool/BindingGenerator")
 
-    set (AS_GENERATED_FILES "AngelScript/GeneratedEnums.cpp"
-                            "AngelScript/GeneratedObjectTypes.cpp"
-                            "AngelScript/GeneratedDefaultConstructors.cpp"
-                            "AngelScript/GeneratedClasses.cpp"
-                            "AngelScript/GeneratedGlobalVariables.cpp"
-                            "AngelScript/GeneratedGlobalFunctions.cpp"
-                            "AngelScript/GeneratedIncludes.h"
+    set (AS_GENERATED_FILES "AngelScript/Generated_Enums.cpp"
+                            "AngelScript/Generated_ObjectTypes.cpp"
+                            "AngelScript/Generated_DefaultConstructors.cpp"
+                            "AngelScript/Generated_Classes.cpp"
+                            "AngelScript/Generated_GlobalVariables.cpp"
+                            "AngelScript/Generated_GlobalFunctions.cpp"
+                            "AngelScript/Generated_Includes.h"
                             "AngelScript/Generated_Members.h"
-                            "AngelScript/Generated_Templates_New.h")
+                            "AngelScript/Generated_Templates.h")
 
     set (AS_GENERATED_FILES_FULL_PATHS "${AS_GENERATED_FILES}")
     # Add "${CMAKE_SOURCE_DIR}/Source/Urho3D/" to every item in list