ggj2020

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

commit cf0198a6f1a0e988721c5d94faae433ba21fd5c4
parent 2ad50a2af34dc95e91e82eb9300e223e92a504c2
Author: Christopher Ray Langford <chris@hellocld.com>
Date:   Sun,  2 Feb 2020 14:02:45 -0500

More materials, lamp buzz, some new csg models

Diffstat:
A.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.etc.stex | 0
A.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.md5 | 3+++
A.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.s3tc.stex | 0
A.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.stex | 0
M.import/TestTile01.png-67d7ee87536d115e689590587e15689e.md5 | 2+-
M.import/TestTile01.png-67d7ee87536d115e689590587e15689e.stex | 0
A.import/lamp_hum.wav-5a993d2449e27325a9bc201d201e8a06.md5 | 3+++
A.import/lamp_hum.wav-5a993d2449e27325a9bc201d201e8a06.sample | 0
MWorlds/CSG_Testing/CSG VR Test.tscn | 33++++++++++++++++++++++++++++++++-
AWorlds/CSG_Testing/CrapTurf.png | 0
AWorlds/CSG_Testing/CrapTurf.png.import | 34++++++++++++++++++++++++++++++++++
AWorlds/CSG_Testing/CrapTurf.tres | 8++++++++
MWorlds/CSG_Testing/Lamp.tscn | 10++++++++--
MWorlds/CSG_Testing/TestTile01.png.import | 2+-
AWorlds/CSG_Testing/lamp_hum.wav | 0
AWorlds/CSG_Testing/lamp_hum.wav.import | 21+++++++++++++++++++++
16 files changed, 111 insertions(+), 5 deletions(-)

diff --git a/.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.etc.stex b/.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.etc.stex Binary files differ. diff --git a/.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.md5 b/.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.md5 @@ -0,0 +1,3 @@ +source_md5="95cb68f40510f4aadbb1f47539c94aec" +dest_md5="b99204d3cd609735255b2f708211d208" + diff --git a/.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.s3tc.stex b/.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.s3tc.stex Binary files differ. diff --git a/.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.stex b/.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.stex Binary files differ. diff --git a/.import/TestTile01.png-67d7ee87536d115e689590587e15689e.md5 b/.import/TestTile01.png-67d7ee87536d115e689590587e15689e.md5 @@ -1,3 +1,3 @@ source_md5="56c9c445eaf5f9f19a968670dae06117" -dest_md5="3dece7106d327a2da07c93f414731251" +dest_md5="29295391a062ecc09557b308d5037fae" diff --git a/.import/TestTile01.png-67d7ee87536d115e689590587e15689e.stex b/.import/TestTile01.png-67d7ee87536d115e689590587e15689e.stex Binary files differ. diff --git a/.import/lamp_hum.wav-5a993d2449e27325a9bc201d201e8a06.md5 b/.import/lamp_hum.wav-5a993d2449e27325a9bc201d201e8a06.md5 @@ -0,0 +1,3 @@ +source_md5="2c55705cf5858ebf085cd98609fdf62f" +dest_md5="0822a1be5c5485e64d639b7b60ffb7fa" + diff --git a/.import/lamp_hum.wav-5a993d2449e27325a9bc201d201e8a06.sample b/.import/lamp_hum.wav-5a993d2449e27325a9bc201d201e8a06.sample Binary files differ. diff --git a/Worlds/CSG_Testing/CSG VR Test.tscn b/Worlds/CSG_Testing/CSG VR Test.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [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/Lamp.tscn" type="PackedScene" id=5] +[ext_resource path="res://Worlds/CSG_Testing/CrapTurf.tres" type="Material" id=6] [node name="CSG VR Test" type="Spatial"] @@ -19,6 +20,36 @@ omni_attenuation = 1.41421 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, -6 ) width = 80.0 depth = 112.0 +material = ExtResource( 6 ) + +[node name="Sidewalk" type="CSGCombiner" parent="Yard"] + +[node name="Base" type="CSGBox" parent="Yard/Sidewalk"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0902116, 9 ) +width = 4.0 +depth = 26.0 +material = ExtResource( 3 ) + +[node name="CSGBox" type="CSGBox" parent="Yard/Sidewalk/Base"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -14 ) +width = 10.0 +depth = 6.0 +material = ExtResource( 3 ) + +[node name="CSGBox2" type="CSGBox" parent="Yard/Sidewalk/Base/CSGBox"] +transform = Transform( 0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 6, 0, 3.2 ) +operation = 2 +width = 4.0 +height = 4.0 +depth = 4.0 +material = ExtResource( 3 ) + +[node name="CSGBox3" type="CSGBox" parent="Yard/Sidewalk/Base/CSGBox"] +transform = Transform( 0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, -6, 0, 3.2 ) +operation = 2 +width = 4.0 +height = 4.0 +depth = 4.0 material = ExtResource( 3 ) [node name="Building" type="CSGCombiner" parent="."] diff --git a/Worlds/CSG_Testing/CrapTurf.png b/Worlds/CSG_Testing/CrapTurf.png Binary files differ. diff --git a/Worlds/CSG_Testing/CrapTurf.png.import b/Worlds/CSG_Testing/CrapTurf.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Worlds/CSG_Testing/CrapTurf.png" +dest_files=[ "res://.import/CrapTurf.png-24279e755d21e291b3b094bc8c25b066.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=1 +flags/repeat=true +flags/filter=false +flags/mipmaps=true +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=false +svg/scale=1.0 diff --git a/Worlds/CSG_Testing/CrapTurf.tres b/Worlds/CSG_Testing/CrapTurf.tres @@ -0,0 +1,8 @@ +[gd_resource type="SpatialMaterial" load_steps=2 format=2] + +[ext_resource path="res://Worlds/CSG_Testing/CrapTurf.png" type="Texture" id=1] + +[resource] +flags_world_triplanar = true +albedo_texture = ExtResource( 1 ) +uv1_triplanar = true diff --git a/Worlds/CSG_Testing/Lamp.tscn b/Worlds/CSG_Testing/Lamp.tscn @@ -1,7 +1,8 @@ -[gd_scene format=2] +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Worlds/CSG_Testing/lamp_hum.wav" type="AudioStream" id=1] [node name="Lamp" type="CSGCombiner"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 10 ) [node name="OmniLight" type="OmniLight" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.518494, 0 ) @@ -25,3 +26,8 @@ smooth_faces = false [node name="CSGSphere" type="CSGSphere" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.816504, 0 ) radius = 0.203418 + +[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="."] +stream = ExtResource( 1 ) +unit_db = -15.0 +autoplay = true diff --git a/Worlds/CSG_Testing/TestTile01.png.import b/Worlds/CSG_Testing/TestTile01.png.import @@ -18,7 +18,7 @@ compress/mode=0 compress/lossy_quality=1.0 compress/hdr_mode=0 compress/bptc_ldr=0 -compress/normal_map=0 +compress/normal_map=1 flags/repeat=true flags/filter=false flags/mipmaps=true diff --git a/Worlds/CSG_Testing/lamp_hum.wav b/Worlds/CSG_Testing/lamp_hum.wav Binary files differ. diff --git a/Worlds/CSG_Testing/lamp_hum.wav.import b/Worlds/CSG_Testing/lamp_hum.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/lamp_hum.wav-5a993d2449e27325a9bc201d201e8a06.sample" + +[deps] + +source_file="res://Worlds/CSG_Testing/lamp_hum.wav" +dest_files=[ "res://.import/lamp_hum.wav-5a993d2449e27325a9bc201d201e8a06.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=true +compress/mode=0