v0.4.2; update to godot 3.3 and oculus mobile 1.44.0

NeoSpark314 · Apr 24, 2021 · 115dfd1 · 115dfd1
1 parent c0efe22
commit 115dfd1
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuest2/buttons.png b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuest2/buttons.png
diff --git a/OQ_Toolkit/vr_autoload.gd b/OQ_Toolkit/vr_autoload.gd
@@ -4,7 +4,7 @@ extends Node
 
 const UI_PIXELS_TO_METER = 1.0 / 1024; # defines the (auto) size of UI elements in 3D
 
-var toolkit_version = "0.4.1_dev"
+var toolkit_version = "0.4.2"
 
 var inVR = false;
 var active_arvr_interface_name = "Unknown";
@@ -849,7 +849,7 @@ func initialize(initialize_vr = true):
 
 	var available_interfaces = ARVRServer.get_interfaces();
 
-	log_info("Initializing VR");
+	log_info("Initializing VR (Toolkit version %s)" % toolkit_version);
 	log_info("  Available Interfaces are %s: " % str(available_interfaces));
 
 	inVR = false;

diff --git a/addons/godot_ovrmobile/OvrVrApiTypes.gd b/addons/godot_ovrmobile/OvrVrApiTypes.gd
@@ -49,11 +49,11 @@ enum OvrDeviceEmulationMode {
 enum OvrProperty {
 	VRAPI_FOVEATION_LEVEL 			= 15, # Used by apps that want to control swapchain foveation levels.
 	VRAPI_EAT_NATIVE_GAMEPAD_EVENTS = 20, # Used to tell the runtime not to eat gamepad events.  If this is false on a native
-										  # app, the app must be listening for the events.
+	                                      # app, the app must be listening for the events.
 	VRAPI_ACTIVE_INPUT_DEVICE_ID    = 24, # Used by apps to query which input device is most 'active'
-										  # or primary, a -1 means no active input device
+								          # or primary, a -1 means no active input device
 	VRAPI_DEVICE_EMULATION_MODE     = 29  # Used by apps to determine if they are running in an
-										  # emulation mode. Is a ovrDeviceEmulationMode value
+								          # emulation mode. Is a ovrDeviceEmulationMode value
 	VRAPI_DYNAMIC_FOVEATION_ENABLED = 30  # Used by apps to enable / disable dynamic foveation adjustments.
 }
 
@@ -111,9 +111,9 @@ enum OvrSystemProperty {
 	VRAPI_SYS_PROP_DOMINANT_HAND							= 15,
 
 	# Returns VRAPI_TRUE if the system supports orientation tracking.
-	VRAPI_SYS_PROP_HAS_ORIENTATION_TRACKING = 16,
-	# Returns VRAPI_TRUE if the system supports positional tracking.
-	VRAPI_SYS_PROP_HAS_POSITION_TRACKING = 17,
+    VRAPI_SYS_PROP_HAS_ORIENTATION_TRACKING = 16,
+    # Returns VRAPI_TRUE if the system supports positional tracking.
+    VRAPI_SYS_PROP_HAS_POSITION_TRACKING = 17,
 
 
 	# Returns the number of display refresh rates supported by the system.
@@ -129,7 +129,7 @@ enum OvrSystemProperty {
 	VRAPI_SYS_PROP_SUPPORTED_SWAPCHAIN_FORMATS				= 67,
 
 	#enum 128 used to be VRAPI_SYS_PROP_MULTIVIEW_AVAILABLE.
-	# enum 129 used to be VRAPI_SYS_PROP_SRGB_LAYER_SOURCE_AVAILABLE.
+    # enum 129 used to be VRAPI_SYS_PROP_SRGB_LAYER_SOURCE_AVAILABLE.
 
 	# Returns VRAPI_TRUE if on-chip foveated rendering of swapchains is supported
 	# for this system, otherwise VRAPI_FALSE.
@@ -156,7 +156,7 @@ enum OvrSystemStatus {
 
 	VRAPI_SYS_STATUS_FRONT_BUFFER_PROTECTED			= 128,	#< VRAPI_TRUE if the front buffer is allocated in TrustZone memory.
 	VRAPI_SYS_STATUS_FRONT_BUFFER_SRGB              = 130,  #< VRAPI_TRUE if the front buffer uses the sRGB color space.
-	VRAPI_SYS_STATUS_SCREEN_CAPTURE_RUNNING         = 131,  # VRAPI_TRUE if the screen is currently being recorded.
+    VRAPI_SYS_STATUS_SCREEN_CAPTURE_RUNNING         = 131,  # VRAPI_TRUE if the screen is currently being recorded.
 }
 
 

diff --git a/addons/godot_ovrmobile/libs/arm64-v8a/libgodot_ovrmobile.so b/addons/godot_ovrmobile/libs/arm64-v8a/libgodot_ovrmobile.so
diff --git a/addons/godot_ovrmobile/libs/arm64-v8a/libvrapi.so b/addons/godot_ovrmobile/libs/arm64-v8a/libvrapi.so
diff --git a/bin/godot.javascript.opt.zip b/bin/godot.javascript.opt.zip
diff --git a/default_env.tres b/default_env.tres
@@ -5,7 +5,7 @@
 [resource]
 background_mode = 2
 background_sky = SubResource( 1 )
-glow_intensity = 1.93
-glow_strength = 2.0
 ambient_light_color = Color( 1, 1, 1, 1 )
 ambient_light_sky_contribution = 0.0
+glow_intensity = 1.93
+glow_strength = 2.0
diff --git a/export_presets.cfg b/export_presets.cfg
@@ -7,7 +7,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter="*oculussig_*, *.dat"
 exclude_filter=""
-export_path="src_data/exports/godot_oculus_quest_toolkit_demo.apk"
+export_path="src_data/exports/godot_oculus_quest_toolkit_demo_v0.4.2.apk"
 script_export_mode=0
 script_encryption_key=""
 
@@ -28,8 +28,8 @@ keystore/release=""
 keystore/release_user=""
 keystore/release_password=""
 one_click_deploy/clear_previous_install=false
-version/code=4
-version/name="0.4.1_dev"
+version/code=5
+version/name="0.4.2"
 package/unique_name="org.dammertz.vr.godot_oculus_quest_toolkit_demo"
 package/name="Godot Oculus Quest Toolkit Demo "
 package/signed=true

diff --git a/project.godot b/project.godot
@@ -140,7 +140,6 @@ common/physics_jitter_fix=0.0
 [rendering]
 
 quality/driver/driver_name="GLES2"
-quality/intended_usage/framebuffer_allocation=3
 vram_compression/import_etc=true
 vram_compression/import_etc2=false
 quality/directional_shadow/size=2048
@@ -151,8 +150,8 @@ quality/reflections/high_quality_ggx=false
 quality/shading/force_vertex_shading.mobile=false
 quality/shading/force_lambert_over_burley=true
 quality/shading/force_blinn_over_ggx.mobile=false
+quality/lightmapping/use_bicubic_sampling=false
 environment/default_clear_color=Color( 0, 0, 0, 1 )
 quality/filters/msaa=6
 quality/depth/hdr=false
 environment/default_environment="res://default_env.tres"
-quality/lightmapping/use_bicubic_sampling=false