Skip to content

Commit

Permalink
Added Milkyway sky environment to fix HMD freezes.
Browse files Browse the repository at this point in the history
  • Loading branch information
georgewsinger committed Nov 11, 2019
1 parent 07d09e8 commit 1f2993c
Show file tree
Hide file tree
Showing 10 changed files with 68 additions and 4 deletions.
Binary file added Milkyway.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Milkyway.png.import
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/Milkyway.png-c8038416f38c889c516f7e41b5681a1a.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Milkyway.png"
dest_files=[ "res://.import/Milkyway.png-c8038416f38c889c516f7e41b5681a1a.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
16 changes: 16 additions & 0 deletions addons/godot-haskell-plugin/demo/Demo.tscn
@@ -1,6 +1,17 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://addons/godot-haskell-plugin/Simula.gdns" type="Script" id=1]
[ext_resource path="res://Milkyway.png" type="Texture" id=2]

[sub_resource type="PanoramaSky" id=1]
panorama = ExtResource( 2 )

[sub_resource type="Environment" id=2]
background_mode = 2
background_sky = SubResource( 1 )
background_color = Color( 0, 0.53833, 0.703125, 1 )
ambient_light_color = Color( 0.328125, 0.328125, 0.328125, 1 )
ssao_blur = 1

[node name="Root" type="Node"]
script = ExtResource( 1 )
Expand All @@ -9,3 +20,8 @@ script = ExtResource( 1 )
transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, -0.62817 )
current = true

[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource( 2 )

[node name="DirectionalLight" type="DirectionalLight" parent="."]
transform = Transform( 0.623013, -0.733525, 0.271654, 0.321394, 0.55667, 0.766044, -0.713134, -0.389948, 0.582563, 0, 100, 0 )
2 changes: 1 addition & 1 deletion addons/godot-haskell-plugin/src/Plugin/VR.hs
Expand Up @@ -58,7 +58,7 @@ initVR node vri =
initSuccess :: IO VRInitResult
initSuccess = do
G.get_viewport node >>= (`G.set_use_arvr` True)
G.get_viewport node >>= (`G.set_hdr` False) -- Not needed with GLES2 renderer
-- G.get_viewport node >>= (`G.set_hdr` False) -- Not needed with GLES2 renderer
getSingleton Godot_OS "OS" >>= (`G.set_use_vsync` False) -- Vsync must be disabled or we're limited to 60fps
getSingleton Godot_Engine "Engine" >>= (`G.set_target_fps` 90) -- Boost FPS to 90 without vsync

Expand Down
3 changes: 3 additions & 0 deletions addons/godot-openvr/icon.png.import
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/icon.png-a89ecb8be28ea6c50eeae0c3cb0cd271.stex"
metadata={
"vram_texture": false
}

[deps]

Expand Down
4 changes: 1 addition & 3 deletions default_env.tres
@@ -1,7 +1,6 @@
[gd_resource type="Environment" load_steps=2 format=2]

[sub_resource type="ProceduralSky" id=1]

sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
sky_curve = 0.25
Expand All @@ -10,7 +9,6 @@ ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
ground_curve = 0.01

[resource]

background_mode = 2
background_sky = SubResource( 1 )

ssao_blur = 1
3 changes: 3 additions & 0 deletions doc/GitterBadge.png.import
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/GitterBadge.png-91472e9ea9a8e4adbac070bee634ad92.stex"
metadata={
"vram_texture": false
}

[deps]

Expand Down
3 changes: 3 additions & 0 deletions doc/SimulaDesktop.png.import
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/SimulaDesktop.png-56340a0015c5ba867207bbcf94dd638f.stex"
metadata={
"vram_texture": false
}

[deps]

Expand Down
3 changes: 3 additions & 0 deletions doc/TEMP_LOGO.png.import
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/TEMP_LOGO.png-1b8b6f6eda78b2647c56c366f38debe3.stex"
metadata={
"vram_texture": false
}

[deps]

Expand Down
4 changes: 4 additions & 0 deletions icon.png.import
Expand Up @@ -4,6 +4,10 @@ importer="texture"
type="StreamTexture"
path.s3tc="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.s3tc.stex"
path.etc2="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.etc2.stex"
metadata={
"imported_formats": [ "s3tc", "etc2" ],
"vram_texture": true
}

[deps]

Expand Down

0 comments on commit 1f2993c

Please sign in to comment.