Skip to content

Commit

Permalink
updated to next release version
Browse files Browse the repository at this point in the history
updated readme to contain some of the new features and changed
version code of the demo.
  • Loading branch information
NeoSpark314 committed May 15, 2020
1 parent 4fb5693 commit 1f2d130
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 34 deletions.
20 changes: 5 additions & 15 deletions GameMain.gd
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# This is the main entry point for the demo scenes of the godot oculus quest toolkit
# Please check https://github.com/NeoSpark314/godot_oculus_quest_toolkit for documentation

extends Node



var room_list = [
"res://demo_scenes/UIDemoScene.tscn",
"res://demo_scenes/PhysicsScene.tscn",
Expand All @@ -14,6 +15,7 @@ var room_list = [
var current_room = 0;

func _process(_dt):
# switch back to the UIDemoScene when the menu button is pressed
if (vr.button_just_released(vr.BUTTON.ENTER) ||
(vr.leftController && vr.leftController.is_hand && vr.button_just_released(vr.BUTTON.Y))):
vr.switch_scene(room_list[0]);
Expand All @@ -22,21 +24,9 @@ func _ready():
vr.initialize();

vr.scene_switch_root = self;

#vr.switch_scene("res://demo_scenes/experiments/debug/DebugGrab.tscn"); return;
#vr.switch_scene("res://demo_scenes/experiments/debug/DebugHand.tscn"); return;
#vr.switch_scene("res://demo_scenes/experiments/debug/DebugFalling.tscn"); return;
#vr.switch_scene("res://demo_scenes/experiments/debug/DebugWalkInPlace.tscn"); return;
#vr.switch_scene("res://demo_scenes/experiments/debug/DebugVignette.tscn"); return;
#vr.switch_scene("res://demo_scenes/experiments/debug/DebugRecording.tscn"); return;
#vr.switch_scene("res://demo_scenes/experiments/debug/DebugRendering.tscn"); return;
#vr.switch_scene("res://demo_scenes/WalkInPlaceDemoScene.tscn"); return;
#vr.switch_scene("res://demo_scenes/PlayerCollisionDemoScene.tscn"); return;
#vr.switch_scene("res://demo_scenes/HandTrackingDemoScene.tscn"); return;
#vr.switch_scene("res://demo_scenes/PhysicsScene.tscn"); return;

# Always advertise Godot a bit in the beggining
#if (vr.inVR): vr.switch_scene("res://demo_scenes/GodotSplash.tscn", 0.0, 0.0);
if (vr.inVR): vr.switch_scene("res://demo_scenes/GodotSplash.tscn", 0.0, 0.0);

vr.switch_scene(room_list[current_room], 0.1, 5.0);

Expand Down
2 changes: 2 additions & 0 deletions OQ_Toolkit/vr_autoload.gd
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This file needs to be set as AutoLoad script in your Project Settings and called 'vr'
# It contains all the glue code and helper functions to make individual features work together.
extends Node

const UI_PIXELS_TO_METER = 1.0 / 1024; # defines the (auto) size of UI elements in 3D
Expand Down
32 changes: 21 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The toolkit in this repository requires (at the time of writing) a recent versio
If you have questions or run into problems please open an issue here or contact me at the [official Godot Discord](https://discord.gg/zH7NUgz): @NeoSpark314 in the #XR channel.

## Showcases
A list of some projects and prototypes that use the Oculus Quest Toolkit that I'm aware of. If you are using the toolkit and would like to be here you can ping me or open an issue with a link to your project and I will add it.
A list of links to projects and prototypes that use the Oculus Quest Toolkit that I'm aware of. If you are using the toolkit and would like to be here you can ping me or open an issue with a link to your project and I will add it.

| | | |
| -- | -- | -- |
Expand All @@ -15,23 +15,33 @@ A list of some projects and prototypes that use the Oculus Quest Toolkit that I'



## Features (so far... early alpha)
## Features
- Touch controller button handling and controller models
- 2D UI canvas with controller interaction
- Virtual Keyboard
- Hand Tracking support with included hand models and basic gesture detection
- VR Simulator and VR Recorder (for easier testing on desktop)
- 2D UI canvas with controller interaction and Virtual Keyboard
- Joystick locomotion and rotation (smooth and step)
- Walk in Place detection
- Falling and Climbing logic
- Rigid body grab
- Several utilities to accelerate prototyping and debugging (Log, Labels, ...)
- Basic Player Collision
- Falling and Climbing logic

[![Feature Images](doc/images/feature_overview.jpg?raw=true)](https://youtu.be/-jzkHOum1kU)
![Medieval City Test Scene](doc/images/medieval_city_screenshot.jpg?raw=true)
[![Simple Hand Gestures](doc/images/hand_gestures.jpg?raw=true)](https://twitter.com/NeoSpark314/status/1213443646755934208)
![Feature Images 2](doc/images/feature_overview_2.jpg)

- Oculus Mixed Reality Capture Integration

[![Video of the Godot MRC Plugin in action](https://img.youtube.com/vi/LDKzn48-3cs/0.jpg)](https://www.youtube.com/watch?v=LDKzn48-3cs)

- Hand Tracking support with included hand models and basic gesture detection

[![Simple Hand Gestures](doc/images/hand_gestures.jpg?raw=true)](https://twitter.com/NeoSpark314/status/1213443646755934208)


- VR Simulator and VR Recorder (for easier testing on desktop)
- Several utilities to accelerate prototyping and debugging (Log, Labels, ...)
- Jog in Place detection

![Medieval City Test Scene](doc/images/medieval_city_screenshot.jpg?raw=true)


# Documentation
The documentation is in the [project wiki](https://github.com/NeoSpark314/godot_oculus_quest_toolkit/wiki). It includes
a more detailed getting started section and an overview of the included features.
Expand Down
Binary file modified doc/images/feature_overview_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 9 additions & 8 deletions export_presets.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[preset.0]

name="OculusQuest"
name="Oculus Quest"
platform="Android"
runnable=true
custom_features=""
Expand All @@ -22,10 +22,9 @@ one_click_deploy/clear_previous_install=false
custom_template/debug="bin/android_debug.apk"
custom_template/release=""
custom_template/use_custom_build=false
custom_template/plugins=""
command_line/extra_args=""
version/code=1
version/name="0.3.0_dev"
version/code=2
version/name="0.4.0"
package/unique_name="org.dammertz.vr.godot_oculus_quest_toolkit_demo"
package/name="Godot Oculus Quest Toolkit Demo "
package/signed=true
Expand All @@ -36,9 +35,11 @@ screen/support_normal=true
screen/support_large=true
screen/support_xlarge=true
screen/opengl_debug=false
launcher_icons/main_192x192=""
launcher_icons/adaptive_foreground_432x432=""
launcher_icons/adaptive_background_432x432=""
launcher_icons/xxxhdpi_192x192=""
launcher_icons/xxhdpi_144x144=""
launcher_icons/xhdpi_96x96=""
launcher_icons/hdpi_72x72=""
launcher_icons/mdpi_48x48=""
keystore/debug="bin/debug.keystore"
keystore/debug_user="androiddebugkey"
keystore/debug_password="android"
Expand Down Expand Up @@ -137,7 +138,7 @@ permissions/process_outgoing_calls=false
permissions/read_calendar=false
permissions/read_call_log=false
permissions/read_contacts=false
permissions/read_external_storage=true
permissions/read_external_storage=false
permissions/read_frame_buffer=false
permissions/read_history_bookmarks=false
permissions/read_input_state=false
Expand Down

0 comments on commit 1f2d130

Please sign in to comment.