File data/gdscript/hybrid-control.gd changed (mode: 100644) (index f630e26..c2d30b0) |
... |
... |
export var mouseSensitivity = 0.25 |
9 |
9 |
export var forceAlwaysStrafe = true |
export var forceAlwaysStrafe = true |
10 |
10 |
|
|
11 |
11 |
onready var head = get_node( 'Head' ) |
onready var head = get_node( 'Head' ) |
12 |
|
onready var camera = head.get_node( 'Camera' ) |
|
13 |
12 |
onready var ray = head.get_node( 'RayCast' ) |
onready var ray = head.get_node( 'RayCast' ) |
|
13 |
|
onready var panelM = head.get_node( 'PanelM' ) |
14 |
14 |
onready var panelL = head.get_node( 'PanelL' ) |
onready var panelL = head.get_node( 'PanelL' ) |
15 |
15 |
onready var panelR = head.get_node( 'PanelR' ) |
onready var panelR = head.get_node( 'PanelR' ) |
|
16 |
|
onready var mount = panelM.get_node( 'Viewport/Mount' ) |
16 |
17 |
onready var mount1 = panelL.get_node( 'Viewport/Mount' ) |
onready var mount1 = panelL.get_node( 'Viewport/Mount' ) |
17 |
18 |
onready var mount2 = panelR.get_node( 'Viewport/Mount' ) |
onready var mount2 = panelR.get_node( 'Viewport/Mount' ) |
18 |
19 |
onready var vignette = head.get_node( 'Vignette' ) |
onready var vignette = head.get_node( 'Vignette' ) |
|
... |
... |
func _fixed_process( d ): |
145 |
146 |
mv = Vector3( movex, 0, ( int( up ) - int( down ) ) * -1.0 * movementSpeed ) |
mv = Vector3( movex, 0, ( int( up ) - int( down ) ) * -1.0 * movementSpeed ) |
146 |
147 |
|
|
147 |
148 |
var globtrans = head.get_global_transform() |
var globtrans = head.get_global_transform() |
|
149 |
|
mount.set_global_transform( globtrans ) |
148 |
150 |
mount1.set_global_transform( globtrans ) |
mount1.set_global_transform( globtrans ) |
149 |
151 |
mount2.set_global_transform( globtrans ) |
mount2.set_global_transform( globtrans ) |
150 |
152 |
|
|
|
... |
... |
func is_vr(): |
205 |
207 |
func enable_vr( on ): |
func enable_vr( on ): |
206 |
208 |
vr_is_set = true |
vr_is_set = true |
207 |
209 |
if on: |
if on: |
208 |
|
get_node( 'Head/Camera' ).hide() |
|
|
210 |
|
get_node( 'Head/PanelM' ).hide() |
209 |
211 |
get_node( 'Head/PanelL' ).show() |
get_node( 'Head/PanelL' ).show() |
210 |
212 |
get_node( 'Head/PanelR' ).show() |
get_node( 'Head/PanelR' ).show() |
211 |
|
get_node( 'Head/PanelL/Viewport/Mount' ).show() |
|
212 |
|
get_node( 'Head/PanelR/Viewport/Mount' ).show() |
|
213 |
213 |
get_node( 'Head/Vignette' ).show() |
get_node( 'Head/Vignette' ).show() |
214 |
214 |
# Disable FXAA (avoids double application bug in Godot 2.1) |
# Disable FXAA (avoids double application bug in Godot 2.1) |
215 |
215 |
set_fxaa( get_node( 'Head/PanelL/Viewport/Mount/Camera' ), false ) |
set_fxaa( get_node( 'Head/PanelL/Viewport/Mount/Camera' ), false ) |
|
... |
... |
func enable_vr( on ): |
217 |
217 |
pitmode = Globals.get( 'pitmode' ) |
pitmode = Globals.get( 'pitmode' ) |
218 |
218 |
if forceAlwaysStrafe: pitmode = true |
if forceAlwaysStrafe: pitmode = true |
219 |
219 |
else: |
else: |
220 |
|
get_node( 'Head/Camera' ).show() |
|
|
220 |
|
get_node( 'Head/PanelM' ).show() |
221 |
221 |
get_node( 'Head/PanelL' ).hide() |
get_node( 'Head/PanelL' ).hide() |
222 |
222 |
get_node( 'Head/PanelR' ).hide() |
get_node( 'Head/PanelR' ).hide() |
223 |
|
get_node( 'Head/PanelL/Viewport/Mount' ).hide() |
|
224 |
|
get_node( 'Head/PanelR/Viewport/Mount' ).hide() |
|
225 |
223 |
get_node( 'Head/Vignette' ).hide() |
get_node( 'Head/Vignette' ).hide() |
226 |
224 |
# Enable FXAA |
# Enable FXAA |
227 |
|
set_fxaa( get_node( 'Head/Camera' ), true ) |
|
|
225 |
|
set_fxaa( get_node( 'Head/PanelM/Viewport/Mount/Camera' ), true ) |
228 |
226 |
pitmode = true |
pitmode = true |
229 |
227 |
|
|
230 |
228 |
|
|
File data/scenes/player.tscn changed (mode: 100644) (index c0d3f6a..ad4a4f8) |
... |
... |
movementSpeed = 5.0 |
42 |
42 |
mouseSensitivity = 0.25 |
mouseSensitivity = 0.25 |
43 |
43 |
forceAlwaysStrafe = true |
forceAlwaysStrafe = true |
44 |
44 |
|
|
45 |
|
[node name="debug" type="Label" parent="."] |
|
46 |
|
|
|
47 |
|
focus/ignore_mouse = true |
|
48 |
|
focus/stop_mouse = true |
|
49 |
|
size_flags/horizontal = 2 |
|
50 |
|
size_flags/vertical = 0 |
|
51 |
|
margin/left = 0.0 |
|
52 |
|
margin/top = 0.0 |
|
53 |
|
margin/right = 40.0 |
|
54 |
|
margin/bottom = 14.0 |
|
55 |
|
percent_visible = 1.0 |
|
56 |
|
lines_skipped = 0 |
|
57 |
|
max_lines_visible = -1 |
|
58 |
|
|
|
59 |
45 |
[node name="CollisionShape" type="CollisionShape" parent="."] |
[node name="CollisionShape" type="CollisionShape" parent="."] |
60 |
46 |
|
|
61 |
47 |
_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) |
_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) |
|
... |
... |
_update_shape_index = 0 |
69 |
55 |
_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) |
_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) |
70 |
56 |
transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.57243, 0 ) |
transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.57243, 0 ) |
71 |
57 |
|
|
72 |
|
[node name="Camera" type="Camera" parent="Head"] |
|
73 |
|
|
|
74 |
|
_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) |
|
75 |
|
transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.09525, 0 ) |
|
76 |
|
projection = 0 |
|
77 |
|
fov = 70.0 |
|
78 |
|
near = 0.1 |
|
79 |
|
far = 200.0 |
|
80 |
|
keep_aspect = 1 |
|
81 |
|
current = false |
|
82 |
|
visible_layers = 1048575 |
|
83 |
|
environment = null |
|
84 |
|
h_offset = 0.0 |
|
85 |
|
v_offset = 0.0 |
|
86 |
|
|
|
87 |
58 |
[node name="Listener" type="Listener" parent="Head"] |
[node name="Listener" type="Listener" parent="Head"] |
88 |
59 |
|
|
89 |
60 |
_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) |
_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) |
|
... |
... |
cast_to = Vector3( 0, 0, -2 ) |
100 |
71 |
layer_mask = 3 |
layer_mask = 3 |
101 |
72 |
type_mask = 15 |
type_mask = 15 |
102 |
73 |
|
|
|
74 |
|
[node name="PanelM" type="Panel" parent="Head"] |
|
75 |
|
|
|
76 |
|
editor/display_folded = true |
|
77 |
|
anchor/left = 2 |
|
78 |
|
anchor/top = 2 |
|
79 |
|
anchor/right = 2 |
|
80 |
|
anchor/bottom = 2 |
|
81 |
|
focus/ignore_mouse = false |
|
82 |
|
focus/stop_mouse = true |
|
83 |
|
size_flags/horizontal = 2 |
|
84 |
|
size_flags/vertical = 2 |
|
85 |
|
margin/left = 0.0 |
|
86 |
|
margin/top = 0.0 |
|
87 |
|
margin/right = 1.0 |
|
88 |
|
margin/bottom = 1.0 |
|
89 |
|
|
|
90 |
|
[node name="Viewport" type="Viewport" parent="Head/PanelM"] |
|
91 |
|
|
|
92 |
|
editor/display_folded = true |
|
93 |
|
rect = Rect2( 0, 0, 1024, 600 ) |
|
94 |
|
own_world = false |
|
95 |
|
world = null |
|
96 |
|
transparent_bg = false |
|
97 |
|
render_target/enabled = false |
|
98 |
|
render_target/v_flip = false |
|
99 |
|
render_target/clear_on_new_frame = true |
|
100 |
|
render_target/filter = false |
|
101 |
|
render_target/gen_mipmaps = false |
|
102 |
|
render_target/update_mode = 2 |
|
103 |
|
audio_listener/enable_2d = false |
|
104 |
|
audio_listener/enable_3d = false |
|
105 |
|
physics/object_picking = false |
|
106 |
|
gui/disable_input = false |
|
107 |
|
|
|
108 |
|
[node name="Mount" type="Spatial" parent="Head/PanelM/Viewport"] |
|
109 |
|
|
|
110 |
|
editor/display_folded = true |
|
111 |
|
_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) |
|
112 |
|
visibility/visible = false |
|
113 |
|
|
|
114 |
|
[node name="Camera" type="Camera" parent="Head/PanelM/Viewport/Mount"] |
|
115 |
|
|
|
116 |
|
_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) |
|
117 |
|
transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.09525, -0.0889 ) |
|
118 |
|
projection = 0 |
|
119 |
|
fov = 70.0 |
|
120 |
|
near = 0.1 |
|
121 |
|
far = 200.0 |
|
122 |
|
keep_aspect = 1 |
|
123 |
|
current = true |
|
124 |
|
visible_layers = 1048575 |
|
125 |
|
environment = null |
|
126 |
|
h_offset = 0.0 |
|
127 |
|
v_offset = 0.0 |
|
128 |
|
|
103 |
129 |
[node name="PanelL" type="Panel" parent="Head"] |
[node name="PanelL" type="Panel" parent="Head"] |
104 |
130 |
|
|
105 |
131 |
editor/display_folded = true |
editor/display_folded = true |
|
... |
... |
transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.03175, 0.09525, -0.08 |
145 |
171 |
projection = 0 |
projection = 0 |
146 |
172 |
fov = 70.0 |
fov = 70.0 |
147 |
173 |
near = 0.1 |
near = 0.1 |
148 |
|
far = 100.0 |
|
|
174 |
|
far = 200.0 |
149 |
175 |
keep_aspect = 0 |
keep_aspect = 0 |
150 |
176 |
current = true |
current = true |
151 |
177 |
visible_layers = 1048575 |
visible_layers = 1048575 |
|
... |
... |
transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.03175, 0.09525, -0.088 |
199 |
225 |
projection = 0 |
projection = 0 |
200 |
226 |
fov = 70.0 |
fov = 70.0 |
201 |
227 |
near = 0.1 |
near = 0.1 |
202 |
|
far = 100.0 |
|
|
228 |
|
far = 200.0 |
203 |
229 |
keep_aspect = 0 |
keep_aspect = 0 |
204 |
230 |
current = true |
current = true |
205 |
231 |
visible_layers = 1048575 |
visible_layers = 1048575 |