remerge

.gitignore

@@ -7,4 +7,3 @@ export_presets.cfg
 # Mono-specific ignores
 .mono/
 data_*/
-*.import

AllSkyFree_Skyboxes/Deep Dusk Equirect.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Deep Dusk Equirect.png-a732fb967d7599ca3d0ae5157f5d1042.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://AllSkyFree_Skyboxes/Deep Dusk Equirect.png"
+dest_files=[ "res://.import/Deep Dusk Equirect.png-a732fb967d7599ca3d0ae5157f5d1042.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
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

BlenderStuff/Hand/protohand.obj.import

@@ -0,0 +1,20 @@
+[remap]
+
+importer="wavefront_obj"
+type="Mesh"
+path="res://.import/protohand.obj-df2c0be9df831c7fa49462d3c0106ebf.mesh"
+
+[deps]
+
+files=[ "res://.import/protohand.obj-df2c0be9df831c7fa49462d3c0106ebf.mesh" ]
+
+source_file="res://BlenderStuff/Hand/protohand.obj"
+dest_files=[ "res://.import/protohand.obj-df2c0be9df831c7fa49462d3c0106ebf.mesh", "res://.import/protohand.obj-df2c0be9df831c7fa49462d3c0106ebf.mesh" ]
+
+[params]
+
+generate_tangents=true
+scale_mesh=Vector3( 1, 1, 1 )
+offset_mesh=Vector3( 0, 0, 0 )
+octahedral_compression=true
+optimize_mesh_flags=4286

BlenderStuff/protoenemy.mtl

@@ -1,10 +0,0 @@
-# Blender MTL File: 'protoenemy.blend'
-# Material Count: 1
-
-newmtl None
-Ns 500
-Ka 0.8 0.8 0.8
-Kd 0.8 0.8 0.8
-Ks 0.8 0.8 0.8
-d 1
-illum 2

BlenderStuff/protoenemy.obj.import

@@ -0,0 +1,20 @@
+[remap]
+
+importer="wavefront_obj"
+type="Mesh"
+path="res://.import/protoenemy.obj-680706119047deede7abb945c1f2410a.mesh"
+
+[deps]
+
+files=[ "res://.import/protoenemy.obj-680706119047deede7abb945c1f2410a.mesh" ]
+
+source_file="res://BlenderStuff/protoenemy.obj"
+dest_files=[ "res://.import/protoenemy.obj-680706119047deede7abb945c1f2410a.mesh", "res://.import/protoenemy.obj-680706119047deede7abb945c1f2410a.mesh" ]
+
+[params]
+
+generate_tangents=true
+scale_mesh=Vector3( 1, 1, 1 )
+offset_mesh=Vector3( 0, 0, 0 )
+octahedral_compression=true
+optimize_mesh_flags=4286

BlenderStuff/protohand.obj.import

@@ -0,0 +1,20 @@
+[remap]
+
+importer="wavefront_obj"
+type="Mesh"
+path="res://.import/protohand.obj-59d0503eba007e240cfcf5818d6eb9eb.mesh"
+
+[deps]
+
+files=[ "res://.import/protohand.obj-59d0503eba007e240cfcf5818d6eb9eb.mesh" ]
+
+source_file="res://BlenderStuff/protohand.obj"
+dest_files=[ "res://.import/protohand.obj-59d0503eba007e240cfcf5818d6eb9eb.mesh", "res://.import/protohand.obj-59d0503eba007e240cfcf5818d6eb9eb.mesh" ]
+
+[params]
+
+generate_tangents=true
+scale_mesh=Vector3( 1, 1, 1 )
+offset_mesh=Vector3( 0, 0, 0 )
+octahedral_compression=true
+optimize_mesh_flags=4286

Player.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://Player.gd" type="Script" id=1]
-[ext_resource path="res://BlenderStuff/protohand.obj" type="ArrayMesh" id=2]
+[ext_resource path="res://BlenderStuff/Hand/protohand.obj" type="ArrayMesh" id=2]
 [ext_resource path="res://Textures/kenney_prototype_textures/purple/texture_01.png" type="Texture" id=3]
 
 [sub_resource type="CapsuleShape" id=2]
@@ -32,7 +32,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.343071, -0.253136 )
 
 [node name="Hand" type="MeshInstance" parent="Head"]
 transform = Transform( -0.178665, 0.385633, 0.029372, 0.386578, 0.177104, 0.0262457, 0.0115471, 0.0376592, -0.4242, 1.33036, -0.0718137, -2.73514 )
-cast_shadow = 0
 mesh = ExtResource( 2 )
 skeleton = NodePath("../..")
 material/0 = SubResource( 4 )

Scenes/Enemy.tscn

@@ -1,21 +0,0 @@
-[gd_scene load_steps=4 format=2]
-
-[ext_resource path="res://BlenderStuff/protoenemy.obj" type="ArrayMesh" id=1]
-
-[sub_resource type="BoxShape" id=1]
-
-[sub_resource type="BoxShape" id=2]
-
-[node name="Enemy" type="KinematicBody"]
-
-[node name="MeshInstance" type="MeshInstance" parent="."]
-transform = Transform( 0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 0, 0 )
-mesh = ExtResource( 1 )
-
-[node name="BodyCollision" type="CollisionShape" parent="."]
-transform = Transform( 0.481304, 0, 0, 0, 0.793226, 0, 0, 0, 0.201743, 0, 0.33586, 0 )
-shape = SubResource( 1 )
-
-[node name="Head" type="CollisionShape" parent="."]
-transform = Transform( 0.400588, 0, 0, 0, 0.551904, 0, 0, 0, 0.400588, 0, 1.87761, 0 )
-shape = SubResource( 2 )

Test_Scene.tscn

@@ -1,14 +1,10 @@
-
+[gd_scene load_steps=7 format=2]
-[gd_scene load_steps=15 format=2]
-
 
 [ext_resource path="res://Materials/Dark_ProtoMat.tres" type="Material" id=1]
-[ext_resource path="res://Scenes/Player.tscn" type="PackedScene" id=2]
+[ext_resource path="res://Player.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Materials/Orange_ProtoMat.tres" type="Material" id=3]
 [ext_resource path="res://AllSkyFree_Skyboxes/Epic_BlueSunset_EquiRect_flat.png" type="Texture" id=4]
 
-[ext_resource path="res://Scenes/Enemy.tscn" type="PackedScene" id=5]
-
 [ext_resource path="res://Title Timer.gd" type="Script" id=5]
 [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=6]
 [ext_resource path="res://SlapGauge.gd" type="Script" id=7]
@@ -118,7 +114,7 @@ polygon = PoolVector2Array( 0, 0, -3, 0, 1, 1, 1, 0 )
 material = ExtResource( 3 )
 
 [node name="Player" parent="." instance=ExtResource( 2 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9, 0 )
 
 [node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."]
 environment = SubResource( 2 )

project.godot

@@ -11,7 +11,7 @@ config_version=4
 [application]
 
 config/name="Slap"
-run/main_scene="res://Scenes/Test_Scene.tscn"
+run/main_scene="res://Test_Scene.tscn"
 config/icon="res://icon.png"
 
 [display]