Merge branch 'master' of https://git.sjkillen.ca/sjkillen/hurrmmm

godot/cake.glb.import

@@ -0,0 +1,53 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://djj412h1ien4o"
+path="res://.godot/imported/cake.glb-e60e073e8642f273d1a78ec90c85894b.scn"
+
+[deps]
+
+source_file="res://cake.glb"
+dest_files=["res://.godot/imported/cake.glb-e60e073e8642f273d1a78ec90c85894b.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path="res://physics/import_billiard.gd"
+_subresources={
+"materials": {
+"cake": {
+"use_external/enabled": true,
+"use_external/path": "res://cake.tres"
+},
+"candles": {
+"use_external/enabled": true,
+"use_external/path": "res://candles.tres"
+}
+},
+"nodes": {
+"PATH:cake2": {
+"generate/physics": true,
+"physics/body_type": 1,
+"physics/shape_type": 5,
+"primitive/height": 0.244,
+"primitive/position": Vector3(0, 0.042, 0),
+"primitive/radius": 0.219
+}
+}
+}
+gltf/embedded_image_handling=1

godot/cake.tres

@@ -0,0 +1,13 @@
+[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://b8htfw5f1a4wf"]
+
+[ext_resource type="Texture2D" uid="uid://dhyh1g25bmhtf" path="res://cake_cake_albedo.png" id="1_jefwg"]
+[ext_resource type="Texture2D" uid="uid://cer3pk0fspi1c" path="res://cake_cake_normals.png" id="2_55xkl"]
+
+[resource]
+resource_name = "cake"
+cull_mode = 2
+vertex_color_use_as_albedo = true
+albedo_texture = ExtResource("1_jefwg")
+roughness = 0.5
+normal_enabled = true
+normal_texture = ExtResource("2_55xkl")

godot/cake.tscn

@@ -0,0 +1,8 @@
+[gd_scene load_steps=2 format=3 uid="uid://cx4ohbn84hmc3"]
+
+[ext_resource type="PackedScene" uid="uid://djj412h1ien4o" path="res://cake.glb" id="1_q3mni"]
+
+[node name="cake" instance=ExtResource("1_q3mni")]
+
+[node name="CollisionShape3D" parent="." index="4"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0367587, 0)

godot/cake_cake_albedo.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dhyh1g25bmhtf"
+path.bptc="res://.godot/imported/cake_cake_albedo.png-8e7e933b04d67a69b2a262d9cdfe2bb0.bptc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+generator_parameters={}
+
+[deps]
+
+source_file="res://cake_cake_albedo.png"
+dest_files=["res://.godot/imported/cake_cake_albedo.png-8e7e933b04d67a69b2a262d9cdfe2bb0.bptc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=true
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

godot/cake_cake_normals.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cer3pk0fspi1c"
+path.bptc="res://.godot/imported/cake_cake_normals.png-85023f0c4cf5997d4101eb078e7a1400.bptc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+generator_parameters={}
+
+[deps]
+
+source_file="res://cake_cake_normals.png"
+dest_files=["res://.godot/imported/cake_cake_normals.png-85023f0c4cf5997d4101eb078e7a1400.bptc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=true
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=1
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=1
+roughness/src_normal="res://cake_cake_normals.png"
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

godot/candles.tres

@@ -0,0 +1,8 @@
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://li4gdaji6poj"]
+
+[resource]
+resource_name = "candles"
+cull_mode = 2
+vertex_color_use_as_albedo = true
+albedo_color = Color(0.453326, 0, 0.0696221, 1)
+roughness = 0.5

godot/control_scheme/control_target_overlay.gdshader

@@ -11,7 +11,7 @@ void vertex() {
 void fragment() {
 	float scale = 50.0;
 	float speed = 1000.0;
-	float f = random2(round(UV * scale)/scale + round(TIME*speed)/speed);
+	float f = random2(UV + round(TIME*speed)/speed);
 	if (f > 0.1) {
 		discard;
 	}

godot/control_scheme/is_targetable.gd

@@ -36,7 +36,7 @@ func change_all_materials(mesh: MeshInstance3D):
 		layer2.render_priority = 30
 		
 		layer0.no_depth_test = true
-		layer0.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA_DEPTH_PRE_PASS
+		layer0.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA_HASH
 		layer0.grow = true
 		layer0.grow_amount = -0.001
 		layer0.albedo_color = layer0.albedo_color.darkened(0.5)

godot/tests/control_scheme/test_basic_controls.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=6 format=3 uid="uid://70bb2yncbl"]
+[gd_scene load_steps=7 format=3 uid="uid://70bb2yncbl"]
 
 [ext_resource type="PackedScene" uid="uid://bua7f25rpewkp" path="res://small_room.glb" id="1_2ticn"]
 [ext_resource type="PackedScene" uid="uid://drmb4sitb74fx" path="res://control_scheme/controller.tscn" id="2_dcvuq"]
 [ext_resource type="PackedScene" uid="uid://c43pr474qofhl" path="res://physics/grape.tscn" id="3_gijly"]
 [ext_resource type="PackedScene" uid="uid://b1uf31ed6h0ir" path="res://UI/TAS UI/TAS UI.tscn" id="4_8yatx"]
+[ext_resource type="PackedScene" uid="uid://cx4ohbn84hmc3" path="res://cake.tscn" id="5_udc7s"]
 
 [sub_resource type="Environment" id="Environment_f0m14"]
 ambient_light_source = 2
@@ -32,3 +33,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.115958, 1.77839, -0.189013)
 
 [node name="Camera3D" type="Camera3D" parent="." index="7"]
 current = true
+
+[node name="cake" parent="." index="8" instance=ExtResource("5_udc7s")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.45077, 0)