ggj2020

My game project for Global Game Jam 2020!
git clone git://git.hellocld.com/ggj2020
Log | Files | Refs

commit 7cd96159f6fdd6e633274da562bf34f5d8d813bc
parent cf0198a6f1a0e988721c5d94faae433ba21fd5c4
Author: Christopher Ray Langford <chris@hellocld.com>
Date:   Sun,  2 Feb 2020 14:25:07 -0500

Added a REALLY dumb sky texture (suzanne ftw)

Diffstat:
A.import/suzanne-sky.png-7f813138c2a7e4b83d94acd5d6670e5e.md5 | 3+++
A.import/suzanne-sky.png-7f813138c2a7e4b83d94acd5d6670e5e.stex | 0
MWorlds/CSG_Testing/CSG VR Test.tscn | 65++++++++++++++++-------------------------------------------------
MWorlds/CSG_Testing/Lamp.tscn | 2+-
AWorlds/CSG_Testing/Sculpt.tscn | 46++++++++++++++++++++++++++++++++++++++++++++++
AWorlds/CSG_Testing/suzanne-sky.png | 0
AWorlds/CSG_Testing/suzanne-sky.png.import | 34++++++++++++++++++++++++++++++++++
Mdefault_env.tres | 9++++++---
8 files changed, 106 insertions(+), 53 deletions(-)

diff --git a/.import/suzanne-sky.png-7f813138c2a7e4b83d94acd5d6670e5e.md5 b/.import/suzanne-sky.png-7f813138c2a7e4b83d94acd5d6670e5e.md5 @@ -0,0 +1,3 @@ +source_md5="ceb4a36244c17b879671fbb77d74f071" +dest_md5="3b4455ab0f49ba5bded2773024e9e895" + diff --git a/.import/suzanne-sky.png-7f813138c2a7e4b83d94acd5d6670e5e.stex b/.import/suzanne-sky.png-7f813138c2a7e4b83d94acd5d6670e5e.stex Binary files differ. diff --git a/Worlds/CSG_Testing/CSG VR Test.tscn b/Worlds/CSG_Testing/CSG VR Test.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://Worlds/CSG_Testing/TestingMat02.tres" type="Material" id=1] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=2] [ext_resource path="res://Worlds/CSG_Testing/TestingMat01.tres" type="Material" id=3] -[ext_resource path="res://Worlds/CSG_Testing/Concrete.tres" type="Material" id=4] +[ext_resource path="res://Worlds/CSG_Testing/Sculpt.tscn" type="PackedScene" id=4] [ext_resource path="res://Worlds/CSG_Testing/Lamp.tscn" type="PackedScene" id=5] [ext_resource path="res://Worlds/CSG_Testing/CrapTurf.tres" type="Material" id=6] @@ -62,103 +62,70 @@ depth = 26.0 material = ExtResource( 1 ) [node name="Interior" type="CSGBox" parent="Building/Exterior"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.427453, 0 ) operation = 2 width = 34.0 -height = 18.0 +height = 15.0983 depth = 22.0 material = ExtResource( 1 ) [node name="Doorway" type="CSGBox" parent="Building/Exterior/Interior"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 12 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.10644, 12 ) width = 4.0 height = 12.0 depth = 4.0 material = ExtResource( 1 ) [node name="Skywindow" type="CSGBox" parent="Building/Exterior/Interior"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9.34994, 0 ) width = 20.0 height = 4.0 depth = 12.0 material = ExtResource( 1 ) [node name="Window" type="CSGBox" parent="Building/Exterior/Interior"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 1, -12 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -15, -1.744, -12 ) height = 8.0 depth = 4.0 material = ExtResource( 1 ) [node name="Window2" type="CSGBox" parent="Building/Exterior/Interior"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -9, 1, -12 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -9, -1.744, -12 ) height = 8.0 depth = 4.0 material = ExtResource( 1 ) [node name="Window3" type="CSGBox" parent="Building/Exterior/Interior"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 1, -12 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3, -1.744, -12 ) height = 8.0 depth = 4.0 material = ExtResource( 1 ) [node name="Window4" type="CSGBox" parent="Building/Exterior/Interior"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 1, -12 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3, -1.744, -12 ) height = 8.0 depth = 4.0 material = ExtResource( 1 ) [node name="Window5" type="CSGBox" parent="Building/Exterior/Interior"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9, 1, -12 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9, -1.744, -12 ) height = 8.0 depth = 4.0 material = ExtResource( 1 ) [node name="Window6" type="CSGBox" parent="Building/Exterior/Interior"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 1, -12 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15, -1.744, -12 ) height = 8.0 depth = 4.0 material = ExtResource( 1 ) -[node name="Sculpt" type="CSGCombiner" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -26 ) +[node name="Sculpt" parent="." instance=ExtResource( 4 )] -[node name="CSGPolygon" type="CSGPolygon" parent="Sculpt"] -polygon = PoolVector2Array( 0, 0, 0, 1, 3, 1, 4, 0 ) -mode = 1 -spin_degrees = 360.0 -spin_sides = 8 -material = ExtResource( 1 ) +[node name="Sculpt2" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, -11, 0, -20 ) -[node name="CSGCylinder2" type="CSGCylinder" parent="Sculpt/CSGPolygon"] -transform = Transform( 0.502653, -0.864474, -0.00490272, -0.864487, -0.502655, -0.000878814, -0.00170465, 0.00468008, -0.999988, 1.27144, 4.37984, 0 ) -radius = 0.577079 -height = 2.69725 -cone = true -material = ExtResource( 4 ) - -[node name="CSGCylinder3" type="CSGCylinder" parent="Sculpt/CSGPolygon"] -transform = Transform( -0.502653, 0.864474, 0.00490281, -0.864487, -0.502655, -0.000878814, 0.00170469, -0.00468016, 0.999988, -1.271, 4.38, 0 ) -radius = 0.577079 -height = 2.69725 -cone = true -material = ExtResource( 4 ) - -[node name="CSGCylinder" type="CSGCylinder" parent="Sculpt/CSGPolygon"] -transform = Transform( 1, 0, 0, 0, -1, 8.74228e-08, 0, -4.37114e-08, -0.5, 0, 2.16093, 0 ) -height = 4.0 -cone = true -material = ExtResource( 4 ) - -[node name="CSGSphere" type="CSGSphere" parent="Sculpt/CSGPolygon"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0 ) -radius = 0.594801 -material = ExtResource( 4 ) - -[node name="SpotLight" type="SpotLight" parent="Sculpt"] -transform = Transform( 1, 0, 0, 0, 0.298708, -0.954345, 0, 0.954345, 0.298708, 0, -0.0429983, 2.05057 ) -light_energy = 2.72 -spot_range = 10.2 -spot_angle = 27.6 +[node name="Sculpt3" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.5, 0, -0.866025, 0, 1, 0, 0.866025, 0, 0.5, 11, 0, -20 ) [node name="Lamp" parent="." instance=ExtResource( 5 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0, 12 ) diff --git a/Worlds/CSG_Testing/Lamp.tscn b/Worlds/CSG_Testing/Lamp.tscn @@ -29,5 +29,5 @@ radius = 0.203418 [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="."] stream = ExtResource( 1 ) -unit_db = -15.0 +unit_db = -30.0 autoplay = true diff --git a/Worlds/CSG_Testing/Sculpt.tscn b/Worlds/CSG_Testing/Sculpt.tscn @@ -0,0 +1,46 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Worlds/CSG_Testing/TestingMat02.tres" type="Material" id=1] +[ext_resource path="res://Worlds/CSG_Testing/Concrete.tres" type="Material" id=2] + +[node name="Sculpt" type="CSGCombiner"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -26 ) + +[node name="CSGPolygon" type="CSGPolygon" parent="."] +polygon = PoolVector2Array( 0, 0, 0, 1, 3, 1, 4, 0 ) +mode = 1 +spin_degrees = 360.0 +spin_sides = 8 +material = ExtResource( 1 ) + +[node name="CSGCylinder2" type="CSGCylinder" parent="CSGPolygon"] +transform = Transform( 0.502653, -0.864474, -0.00490272, -0.864487, -0.502655, -0.000878814, -0.00170465, 0.00468008, -0.999988, 1.27144, 4.37984, 0 ) +radius = 0.577079 +height = 2.69725 +cone = true +material = ExtResource( 2 ) + +[node name="CSGCylinder3" type="CSGCylinder" parent="CSGPolygon"] +transform = Transform( -0.502653, 0.864474, 0.00490281, -0.864487, -0.502655, -0.000878814, 0.00170469, -0.00468016, 0.999988, -1.271, 4.38, 0 ) +radius = 0.577079 +height = 2.69725 +cone = true +material = ExtResource( 2 ) + +[node name="CSGCylinder" type="CSGCylinder" parent="CSGPolygon"] +transform = Transform( 1, 0, 0, 0, -1, 8.74228e-08, 0, -4.37114e-08, -0.5, 0, 2.16093, 0 ) +height = 4.0 +cone = true +material = ExtResource( 2 ) + +[node name="CSGSphere" type="CSGSphere" parent="CSGPolygon"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0 ) +radius = 0.594801 +material = ExtResource( 2 ) + +[node name="SpotLight" type="SpotLight" parent="."] +transform = Transform( 1, 0, 0, 0, 0.520965, -0.853578, 0, 0.853578, 0.520965, 0, 0.35061, 2.05057 ) +light_energy = 2.72 +shadow_enabled = true +spot_range = 35.0 +spot_angle = 35.6078 diff --git a/Worlds/CSG_Testing/suzanne-sky.png b/Worlds/CSG_Testing/suzanne-sky.png Binary files differ. diff --git a/Worlds/CSG_Testing/suzanne-sky.png.import b/Worlds/CSG_Testing/suzanne-sky.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/suzanne-sky.png-7f813138c2a7e4b83d94acd5d6670e5e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Worlds/CSG_Testing/suzanne-sky.png" +dest_files=[ "res://.import/suzanne-sky.png-7f813138c2a7e4b83d94acd5d6670e5e.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 diff --git a/default_env.tres b/default_env.tres @@ -1,9 +1,12 @@ -[gd_resource type="Environment" load_steps=2 format=2] +[gd_resource type="Environment" load_steps=3 format=2] -[sub_resource type="ProceduralSky" id=1] +[ext_resource path="res://Worlds/CSG_Testing/suzanne-sky.png" type="Texture" id=1] + +[sub_resource type="PanoramaSky" id=1] +panorama = ExtResource( 1 ) [resource] -background_mode = 1 +background_mode = 2 background_sky = SubResource( 1 ) background_color = Color( 0.101961, 0.0862745, 0.12549, 1 ) ambient_light_color = Color( 1, 1, 1, 1 )