MiniScript: some more WIP

andreasdr · Nov 12, 2023 · 4863511 · 4863511
1 parent 431f950
commit 4863511
Show file tree

Hide file tree

Showing 34 changed files with 3,529 additions and 3,083 deletions.
diff --git a/Makefile b/Makefile
@@ -640,7 +640,15 @@ SRCS = \
 	src/tdme/utilities/Hex.cpp \
 	src/tdme/utilities/Integer.cpp \
 	src/tdme/utilities/MiniScript.cpp \
+	src/tdme/utilities/MiniScriptArray.cpp \
+	src/tdme/utilities/MiniScriptBase.cpp \
+	src/tdme/utilities/MiniScriptConsole.cpp \
+	src/tdme/utilities/MiniScriptJSON.cpp \
+	src/tdme/utilities/MiniScriptMap.cpp \
 	src/tdme/utilities/MiniScriptMath.cpp \
+	src/tdme/utilities/MiniScriptScript.cpp \
+	src/tdme/utilities/MiniScriptSet.cpp \
+	src/tdme/utilities/MiniScriptString.cpp \
 	src/tdme/utilities/MiniScriptTransform.cpp \
 	src/tdme/utilities/MiniScriptTranspiler.cpp \
 	src/tdme/utilities/MiniScriptMatrix3x3.cpp \
@@ -649,6 +657,8 @@ SRCS = \
 	src/tdme/utilities/MiniScriptVector2.cpp \
 	src/tdme/utilities/MiniScriptVector3.cpp \
 	src/tdme/utilities/MiniScriptVector4.cpp \
+	src/tdme/utilities/MiniScriptTime.cpp \
+	src/tdme/utilities/MiniScriptXML.cpp \
 	src/tdme/utilities/ModelTools.cpp \
 	src/tdme/utilities/PathFinding.cpp \
 	src/tdme/utilities/Primitives.cpp \

diff --git a/Makefile.nmake b/Makefile.nmake
@@ -501,7 +501,15 @@ SRCS = \
 	src/tdme/utilities/Hex.cpp \
 	src/tdme/utilities/Integer.cpp \
 	src/tdme/utilities/MiniScript.cpp \
+	src/tdme/utilities/MiniScriptArray.cpp \
+	src/tdme/utilities/MiniScriptBase.cpp \
+	src/tdme/utilities/MiniScriptConsole.cpp \
+	src/tdme/utilities/MiniScriptJSON.cpp \
+	src/tdme/utilities/MiniScriptMap.cpp \
 	src/tdme/utilities/MiniScriptMath.cpp \
+	src/tdme/utilities/MiniScriptScript.cpp \
+	src/tdme/utilities/MiniScriptSet.cpp \
+	src/tdme/utilities/MiniScriptString.cpp \
 	src/tdme/utilities/MiniScriptTransform.cpp \
 	src/tdme/utilities/MiniScriptTranspiler.cpp \
 	src/tdme/utilities/MiniScriptMatrix3x3.cpp \
@@ -510,6 +518,8 @@ SRCS = \
 	src/tdme/utilities/MiniScriptVector2.cpp \
 	src/tdme/utilities/MiniScriptVector3.cpp \
 	src/tdme/utilities/MiniScriptVector4.cpp \
+	src/tdme/utilities/MiniScriptTime.cpp \
+	src/tdme/utilities/MiniScriptXML.cpp \
 	src/tdme/utilities/ModelTools.cpp \
 	src/tdme/utilities/PathFinding.cpp \
 	src/tdme/utilities/Primitives.cpp \

diff --git a/README-MiniScript.md b/README-MiniScript.md
@@ -117,7 +117,8 @@ end
 ```
 
 If a argument(variable) is prefixed with a & operator in the function declaration, the variable will not be copied into the function arguments, 
-but a reference will be created, means if this variable changes within the function it will also change in the parent variable scope. 
+but a reference will be created, means if this variable changes within the function it will also change in the parent variable scope.
+Be aware that value by copy variables usually require more instantiation time due to the copy that needs to be made of the variable from parent variable scope to function variable scope. 
 See &$b and &$c.
 ```
 ...
@@ -649,7 +650,10 @@ Please see a example below.
 	#...
 ```
 
-If you want to assign a class member function later, see this example. Note that the first argument needs to be a (const) $this variable, or a "assigned back" $this variable. This argument maps to the class that your code is operating on in your class member function.
+If you want to assign a class member function later, see this example. Note that the first argument needs to be a reference or value by copy $this variable.
+This argument maps to the class that your code is operating on in your class member function.
+
+Be aware that value by copy variables usually require more instantiation time due to the copy that needs to be made of the variable from parent variable scope to function variable scope.  
 
 ```
 ...

diff --git a/README.md b/README.md
@@ -415,4 +415,4 @@
     - I even might have system administrator tasks
 
 # 9. Donation 
-- I have to pay my bills and beer, so if you have any use for this open source project, like educational, productive or fun, ..., consider a donation here https://www.paypal.me/andreasdrewke or here https://github.com/sponsors/andreasdr
+- I have to pay my bills, beer and stuff, so if you have any use for this open source project, like educational, productive or fun, ..., consider a donation here https://www.paypal.me/andreasdrewke, here https://github.com/sponsors/andreasdr or via https://www.amazon.de/hz/wishlist/ls/250IBUL4JSZVR?ref_=wl_share
diff --git a/documentation/doxygen.private.config b/documentation/doxygen.private.config
@@ -24,7 +24,7 @@ JAVADOC_AUTOBRIEF	= YES
 OUTPUT_DIRECTORY	= private
 PERL_PATH		= /usr/local/bin/perl
 PROJECT_NAME		= TDME2
-PROJECT_NUMBER		= 1.9.195
+PROJECT_NUMBER		= 1.9.196
 RECURSIVE		= YES
 SEARCHENGINE		= YES
 SERVER_BASED_SEARCH	= NO

diff --git a/documentation/doxygen.public.config b/documentation/doxygen.public.config
@@ -228,7 +228,7 @@ JAVADOC_AUTOBRIEF	= YES
 OUTPUT_DIRECTORY	= public
 PERL_PATH		= /usr/local/bin/perl
 PROJECT_NAME		= TDME2
-PROJECT_NUMBER		= 1.9.195
+PROJECT_NUMBER		= 1.9.196
 RECURSIVE		= NO
 SEARCHENGINE		= YES
 SERVER_BASED_SEARCH	= NO

diff --git a/resources/installer/installer.properties b/resources/installer/installer.properties
@@ -1,5 +1,5 @@
 installer_version=1.9.176
-name=TDME2 1.9.195
+name=TDME2 1.9.196
 diskspace=300MB
 install_path=TDME2
 exe_path=bin/tdme,scripts,platform,.

diff --git a/src/tdme/engine/Version.cpp b/src/tdme/engine/Version.cpp
@@ -9,7 +9,7 @@ using std::string;
 using tdme::engine::Version;
 
 string Version::getVersion() {
-	return "1.9.195";
+	return "1.9.196";
 }
 
 string Version::getCopyright() {

diff --git a/src/tdme/engine/subsystems/renderer/RendererPlugin.h b/src/tdme/engine/subsystems/renderer/RendererPlugin.h
@@ -18,7 +18,7 @@ class tdme::engine::subsystems::renderer::RendererPlugin
 	 * @return renderer version
 	 */
 	inline static const string getRendererVersion() {
-		return "1.9.195";
+		return "1.9.196";
 	}
 
 };
diff --git a/src/tdme/utilities/EngineMiniScript.cpp b/src/tdme/utilities/EngineMiniScript.cpp
@@ -130,7 +130,17 @@ const string EngineMiniScript::getBaseClass() {
 const vector<string> EngineMiniScript::getTranspilationUnits() {
 	return {
 		"src/tdme/utilities/MiniScript.cpp",
+		"src/tdme/utilities/MiniScriptArray.cpp",
+		"src/tdme/utilities/MiniScriptBase.cpp",
+		"src/tdme/utilities/MiniScriptConsole.cpp",
+		"src/tdme/utilities/MiniScriptJSON.cpp",
+		"src/tdme/utilities/MiniScriptMap.cpp",
 		"src/tdme/utilities/MiniScriptMath.cpp",
+		"src/tdme/utilities/MiniScriptScript.cpp",
+		"src/tdme/utilities/MiniScriptSet.cpp",
+		"src/tdme/utilities/MiniScriptString.cpp",
+		"src/tdme/utilities/MiniScriptTime.cpp",
+		"src/tdme/utilities/MiniScriptXML.cpp",
 		"src/tdme/utilities/MiniScriptMatrix3x3.cpp",
 		"src/tdme/utilities/MiniScriptMatrix4x4.cpp",
 		"src/tdme/utilities/MiniScriptQuaternion.cpp",