Merge pull request #410 from BastiaanOlij/4.0-rel

XR Tools 3.4.0 port to 4.0.0

.gitattributes

@@ -4,3 +4,4 @@
 *.godot eol=lf
 *.tres eol=lf
 *.import eol=lf
+*.gdshader eol=lf

.github/workflows/build-on-push.yml

@@ -28,11 +28,6 @@ jobs:
           cp demo/godot-xr-tools/VERSIONS.md plugin/godot-xr-tools/addons/godot-xr-tools
           rm -rf demo/godot-xr-tools/.git
           rm -rf demo/godot-xr-tools/.github
-      - name: Add OpenXR Plugin
-        run: |
-          wget --header "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://github.com/GodotVR/godot_openxr/releases/download/1.3.0/godot-openxr.zip"
-          unzip -qq godot-openxr.zip
-          cp -r godot_openxr_1.3.0/addons/godot-openxr demo/godot-xr-tools/addons
       - name: Create XR tools library artifact
         uses: actions/upload-artifact@v2
         with:

.github/workflows/gdlint-on-push.yml

@@ -19,7 +19,8 @@ jobs:
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install 'gdtoolkit==3.*'
+          python -m pip install 'gdtoolkit==4.*'
       - name: Lint Godot XR Tools
         run: |
           gdlint addons/godot-xr-tools
+

.gitignore

@@ -1,13 +1,12 @@
-# Godot files to ignore
+*.o
+*.os
 .import/
-
-# Filesystem files to ignore
+.godot/
+*.dblite
+*.exp
+*.lib
+*.obj
+*.TMP
 logs
 Thumbs.db
-.DS_Store
-
-# Addons sourced externally
-addons/godot-openxr/
-
-# Blender backup files
-*.blend1
+android/

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2023 Bastiaan Olij
+Copyright (c) 2018-2023 Bastiaan Olij and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -28,15 +28,17 @@ This repository now contains a full demo for XR Tools with the XR Tools add on i
 After cloning this repository you will need to install the OpenXR plugin for it to work. The OpenXR plugin is not included within this repository.
 You can obtain the OpenXR plugin [here](https://github.com/GodotVR/godot_openxr/releases) or download it from the asset library within Godot.
 
+Note that the demo in the 4.0-dev branch has been upgraded to work with the most recent 4.0-beta releases.
+
 ### XR Tools library
 
 To obtain just the XR Tools library for your own project, please check [releases](https://github.com/GodotVR/godot-xr-tools/releases) or download it from the asset library within Godot.
 
-### Preventing hiccups
+### Preventing hickups
 
-As many of the functions in this module will hide objects that are later shown as the user performs actions, the user will experience a hiccup as Godot compiles the shader used to draw the object on screen.
+As many of the functions in this module will hide objects that are later shown as the user performs actions, the user will experience a hickup as Godot compiles the shader used to draw the object on screen.
 
-To combat this you will find a scene in this module called `misc/vr_common_shader_cache.tscn`.
+To combat this you will find a scene in this module called `misc/VR_Common_Shader_Cache.tscn`.
 Add this scene as a child node to your ARVRCamera. This will trigger the required shaders being
 compiled the first time your main scene loads.
 

VERSIONS.md

@@ -1,3 +1,9 @@
+# 4.0.0
+- Conversion to Godot 4
+- Fixed footstep resource leak and added jump sounds and footstep signal
+- Added grab-point switching to pickable objects
+- Added return-to-snap-zone feature
+
 # 3.4.0
 - Fixed footstep resource leak and added jump sounds and footstep signal
 - Added grab-point switching to pickable objects

addons/godot-xr-tools/assets/misc/Hold trigger to continue.png.import

@@ -1,37 +1,36 @@
 [remap]
 
 importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.s3tc.stex"
-path.etc="res://.import/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.etc.stex"
+type="CompressedTexture2D"
+uid="uid://ocyj01x5mtt7"
+path.s3tc="res://.godot/imported/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.s3tc.ctex"
+path.etc2="res://.godot/imported/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.etc2.ctex"
 metadata={
-"imported_formats": [ "s3tc", "etc" ],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/godot-xr-tools/assets/misc/Hold trigger to continue.png"
-dest_files=[ "res://.import/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.s3tc.stex", "res://.import/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.etc.stex" ]
+dest_files=["res://.godot/imported/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.s3tc.ctex", "res://.godot/imported/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.etc2.ctex"]
 
 [params]
 
 compress/mode=2
+compress/high_quality=false
 compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
+compress/hdr_compression=1
 compress/normal_map=0
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

addons/godot-xr-tools/assets/misc/progress_bar.png.import

@@ -1,37 +1,36 @@
 [remap]
 
 importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/progress_bar.png-2ef3cbffca173889900be004fdeb1700.s3tc.stex"
-path.etc="res://.import/progress_bar.png-2ef3cbffca173889900be004fdeb1700.etc.stex"
+type="CompressedTexture2D"
+uid="uid://clbtsf0ahb3fm"
+path.s3tc="res://.godot/imported/progress_bar.png-2ef3cbffca173889900be004fdeb1700.s3tc.ctex"
+path.etc2="res://.godot/imported/progress_bar.png-2ef3cbffca173889900be004fdeb1700.etc2.ctex"
 metadata={
-"imported_formats": [ "s3tc", "etc" ],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/godot-xr-tools/assets/misc/progress_bar.png"
-dest_files=[ "res://.import/progress_bar.png-2ef3cbffca173889900be004fdeb1700.s3tc.stex", "res://.import/progress_bar.png-2ef3cbffca173889900be004fdeb1700.etc.stex" ]
+dest_files=["res://.godot/imported/progress_bar.png-2ef3cbffca173889900be004fdeb1700.s3tc.ctex", "res://.godot/imported/progress_bar.png-2ef3cbffca173889900be004fdeb1700.etc2.ctex"]
 
 [params]
 
 compress/mode=2
+compress/high_quality=false
 compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
+compress/hdr_compression=1
 compress/normal_map=0
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0