fixed gi

nem0 · Nov 8, 2024 · dfa6e5d · dfa6e5d
1 parent cf23a15
commit dfa6e5d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 63 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,43 +12,43 @@ jobs:
               run: |
                 mkdir ..\plugins
                 pushd ..\plugins
-                git.exe clone -b bindless https://github.com/nem0/lumixengine_maps.git maps
+                git.exe clone --depth=1 https://github.com/nem0/lumixengine_maps.git maps
             - name: fetch gltf plugin
               working-directory: plugins
               run: |
-                git.exe clone https://github.com/nem0/lumixengine_gltf.git gltf_import
+                git.exe clone --depth=1  https://github.com/nem0/lumixengine_gltf.git gltf_import
             - name: fetch shader_editor plugin
               working-directory: plugins
               run: |
-                git.exe clone https://github.com/nem0/lumixengine_shader_editor.git shader_editor
+                git.exe clone --depth=1 https://github.com/nem0/lumixengine_shader_editor.git shader_editor
             - name: fetch network plugin
               working-directory: plugins
               run: |
-                git.exe clone https://github.com/nem0/lumixengine_net.git net
+                git.exe clone --depth=1 https://github.com/nem0/lumixengine_net.git net
             - name: fetch js plugin
               working-directory: plugins
               run: |
-                git.exe clone -b bindless https://github.com/nem0/lumixengine_js.git js
+                git.exe clone --depth=1 https://github.com/nem0/lumixengine_js.git js
             - name: fetch marketplace plugin
               working-directory: plugins
               run: |
-                git.exe clone -b bindless https://github.com/nem0/lumixengine_market.git market
+                git.exe clone --depth=1 https://github.com/nem0/lumixengine_market.git market
             - name: fetch procedural geometry plugin
               working-directory: plugins
               run: |
-                git.exe clone -b bindless https://github.com/nem0/lumixengine_procedural_geom.git procedural_geom
+                git.exe clone --depth=1 https://github.com/nem0/lumixengine_procedural_geom.git procedural_geom
             - name: fetch visual script plugin
               working-directory: plugins
               run: |
-                git.exe clone https://github.com/nem0/lumixengine_visualscript.git visual_script
+                git.exe clone --depth=1 https://github.com/nem0/lumixengine_visualscript.git visual_script
             - name: fetch livecode plugin
               working-directory: plugins
               run: |
-                git.exe clone -b bindless https://github.com/nem0/lumixengine_livecode.git livecode
+                git.exe clone --depth=1 https://github.com/nem0/lumixengine_livecode.git livecode
             - name: fetch empty plugin template
               working-directory: plugins
               run: |
-                git.exe clone https://github.com/nem0/lumix_plugin_template.git myplugin
+                git.exe clone --depth=1 https://github.com/nem0/lumix_plugin_template.git myplugin
             - name: make VS project with plugins and app
               working-directory: scripts
               run: |

diff --git a/scripts/plugins.bat b/scripts/plugins.bat
@@ -23,51 +23,32 @@ setlocal
 	echo  3. Maps
 	echo  4. Shader editor
 	echo  5. GLTF importer
-	echo  6. DX11 and DX12
-	echo  7. Rml UI
-	echo  8. Network
-	echo  9. JS
-	echo  A. C#
-	echo  B. Visual script
-	echo  C. Procedural geometry
-	echo  D. Marketplace
-	echo  E. LiveCode 
-	echo  F. Basis Universal
+	echo  6. Network
+	echo  7. JS
+	echo  8. C#
+	echo  9. Visual script
+	echo  A. Procedural geometry
+	echo  B. Marketplace
+	echo  C. LiveCode 
+	echo  D. Basis Universal
 	echo ===============================
-	choice /C 123456789ABCDEF /N /M "Your choice:"
+	choice /C 123456789ABCD /N /M "Your choice:"
 	echo.
 	if %errorlevel%==1 exit /B 0
 	if %errorlevel%==2 call :empty_plugin
 	if %errorlevel%==3 call :map_plugin
 	if %errorlevel%==4 call :shader_editor_plugin
 	if %errorlevel%==5 call :glft_import_plugin
-	if %errorlevel%==6 call :dx_plugin
-	if %errorlevel%==7 call :rml_ui_plugin
-	if %errorlevel%==8 call :network_plugin
-	if %errorlevel%==9 call :js_plugin
-	if %errorlevel%==10 call :cs_plugin
-	if %errorlevel%==11 call :visual_script_plugin
-	if %errorlevel%==12 call :procedural_geom_plugin
-	if %errorlevel%==13 call :marketplace_plugin
-	if %errorlevel%==14 call :livecode_plugin
-	if %errorlevel%==15 call :basisu
+	if %errorlevel%==6 call :network_plugin
+	if %errorlevel%==7 call :js_plugin
+	if %errorlevel%==8 call :cs_plugin
+	if %errorlevel%==9 call :visual_script_plugin
+	if %errorlevel%==10 call :procedural_geom_plugin
+	if %errorlevel%==11 call :marketplace_plugin
+	if %errorlevel%==12 call :livecode_plugin
+	if %errorlevel%==13 call :basisu
 goto :begin
 
-:dx_plugin
-	if not exist ..\plugins mkdir ..\plugins
-	pushd ..\plugins
-	if not exist dx (
-		git.exe clone https://github.com/nem0/lumixengine_dx.git dx
-		pushd dx
-		git remote add origin2 git@github.com:nem0/lumixengine_dx.git
-		popd
-	) else (
-		cd dx
-		git pull
-	)
-	popd
-exit /B 0
-
 :glft_import_plugin
 	if not exist ..\plugins mkdir ..\plugins
 	pushd ..\plugins
@@ -83,21 +64,6 @@ exit /B 0
 	popd
 exit /B 0
 
-:rml_ui_plugin
-	if not exist ..\plugins mkdir ..\plugins
-	pushd ..\plugins
-	if not exist rml (
-		git.exe clone https://github.com/nem0/lumixengine_rml.git rml
-		pushd rml
-		git remote add origin2 git@github.com:nem0/lumixengine_rml.git
-		popd
-	) else (
-		cd rml
-		git pull
-	)
-	popd
-exit /B 0
-
 :network_plugin
 	if not exist ..\plugins mkdir ..\plugins
 	pushd ..\plugins

diff --git a/src/core/math.cpp b/src/core/math.cpp
@@ -1289,7 +1289,7 @@ u32 RandomGenerator::rand() {
 static RandomGenerator initRandomGenerator() {
 	// TODO improve entropy
 	thread_local u64 dummy;
-	const u64 seed = uintptr(&dummy) ^ os::Timer::getRawTimestamp();
+	const u64 seed = ((uintptr(&dummy) << 32) | (uintptr(&dummy) >> 32)) ^ os::Timer::getRawTimestamp();
 	RandomGenerator res(u32(seed), u32(seed >> 32));
 	return res;
 }

diff --git a/src/core/path.cpp b/src/core/path.cpp
@@ -32,7 +32,7 @@ char* Path::normalize(char* path) {
 	if (src[0] == '.' && (src[1] == '\\' || src[1] == '/')) src += 2;
 
 	#ifdef _WIN32
-		if (src[0] == '\\' || src[0] == '/') ++src;
+		while (src[0] == '\\' || src[0] == '/') ++src;
 	#endif
 
 	while (*src) {