Compare commits

..

3 Commits

42 changed files with 244 additions and 46 deletions

View File

@ -1,3 +1,3 @@
source_md5="1a4cae329dfc4e6bad32d06d0494a770" source_md5="0efe36744f8f26da5928749fe18516ab"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="0847dea813b285011da9b05d89aaa433" source_md5="9546fc88bc5c5cea528501b27f8c32af"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="3531e225e0050ac9e74aae8c7641e6f6" source_md5="c9bfeeb3454ab774eef9d623dfd1aad1"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="ee3458a13e2fbed2c8a26858e5884feb" source_md5="c078db8385c48cd436c0f0558e61f362"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="c0bd23b9bec6ac82f68a4a0fdc110916" source_md5="c147d37f5c4f368e10c651b01cb716f9"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="5f33fb2e6c89172ad3586f9a4f433c02" source_md5="bc065e9c0e1cc9162b2c4ec4ddeba588"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="1a0081dad1b49f22f1e389e8c9a9060a" source_md5="16b3919e0d4a189c5b52e1cf44656681"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="a447bf95df89e01779efce5580adf109" source_md5="1954c7fc0378161f88dbc07631ade0cb"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="3fc365377404a9f2837a16603b966486" source_md5="2007fd20c9c93710fb344d65ae8efc41"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="67fd222e96d854f0b1bd23fb801a6b8c" source_md5="e8ab0b8ccbe5e039d11025b6a99dfe06"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="96de2b0ce5e6f1b7ed7d7e8a214d4945" source_md5="15473f6797c9d05fcd8a5a24af33b8d4"
dest_md5="2df5b327c16afac6af6b3357e4391b7a" dest_md5="bf61a2a7225a0d31838d288991d32fbd"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 0 revision = 1

View File

@ -1,3 +1,3 @@
source_md5="e4cc1a980422edd74999db9389e733de" source_md5="3f7f3028727382d75109ef78c1e20cef"
dest_md5="82c07d5248c11f25bc8f1618e59b01d3" dest_md5="e0e46f2499de748ad67f8c2b67cfb707"

View File

@ -4,4 +4,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
revision = 5 revision = 6

View File

@ -1,3 +1,3 @@
source_md5="cbd7928cf85698fb7bdc5b438147e92e" source_md5="5ad9e16429c8f214f03b62340c45d305"
dest_md5="01ae1686fb2b0f4f32561108eb869fae" dest_md5="01ae1686fb2b0f4f32561108eb869fae"

View File

@ -1,3 +1,3 @@
source_md5="b5d45fe4522233b64903d1245ce26f0d" source_md5="ea9d96a274f30b082d42c78895486cd5"
dest_md5="8269e603b23be064b5c152ebc50d9bfe" dest_md5="ec64f34761079cefddec592435684435"

View File

@ -0,0 +1,3 @@
source_md5="5088a4521e7650d9102cd499c46f0d56"
dest_md5="2d7382245ddb60a6a0b27752a50c4445"

View File

@ -0,0 +1,3 @@
source_md5="85ba8a7810af4735139c30f1f3b1cf28"
dest_md5="e1ae966c0c700512929806b1bbb87ed0"

View File

@ -0,0 +1,19 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://Items/Stick/stick_tex.png" type="Texture" id=1]
[ext_resource path="res://Items/Stick/stick.obj" type="ArrayMesh" id=2]
[ext_resource path="res://Menus/Inventory/Item Rotate.gd" type="Script" id=3]
[sub_resource type="SpatialMaterial" id=1]
albedo_texture = ExtResource( 1 )
[node name="Stick Inventory" type="StaticBody"]
[node name="CSGMesh" type="CSGMesh" parent="."]
transform = Transform( 0.216506, -0.25, 0, 0.125, 0.433013, 0, 0, 0, 0.25, 0.15, -0.5, 0 )
mesh = ExtResource( 2 )
material = SubResource( 1 )
script = ExtResource( 3 )
[node name="Camera" type="Camera" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.5 )

View File

@ -0,0 +1,9 @@
# picocad material
newmtl stick_mtl
ka 1.000000 1.000000 1.000000
kd 1.000000 1.000000 1.000000
ks 0.000000 0.000000 0.000000
tr 1.000000
illum 1
ns 0.000000
map_kd stick_tex.png

View File

@ -0,0 +1,53 @@
# picocad model
mtllib stick.mtl
o stick
v -0.25 2.5 0.25
v 0.25 2.5 0.25
v 0.25 -0.5 0.25
v -0.25 -0.5 0.25
v -0.25 2.5 -0.25
v 0.25 2.5 -0.25
v 0.25 -0.5 -0.25
v -0.25 -0.5 -0.25
vt 0 1
vt 0.0781 1
vt 0.0781 0.9219
vt 0 0.9219
vt -0.0156 1
vt 0.0781 1
vt 0.0781 0.9219
vt 0 0.9219
vt 0.0156 1
vt 0.0781 1
vt 0.0781 0.9375
vt 0.0156 0.9375
vt 0 1
vt 0.0781 1
vt 0.0781 0.9219
vt 0 0.9219
vt 0 1
vt 0.0781 1
vt 0.0781 0.9219
vt 0 0.9219
vt 0 0.9844
vt 0.0625 0.9844
vt 0.0625 0.9219
vt 0 0.9219
vn 0 0 -1
vn 0 0 1
vn 0 1 0
vn -1 0 0
vn 1 0 0
vn 0 -1 0
usemtl stick_mtl
s off
f 4/4/1 3/3/1 2/2/1 1/1/1
f 7/8/2 8/7/2 5/6/2 6/5/2
f 1/12/3 2/11/3 6/10/3 5/9/3
f 8/16/4 4/15/4 1/14/4 5/13/4
f 3/20/5 7/19/5 6/18/5 2/17/5
f 8/24/6 7/23/6 3/22/6 4/21/6

View File

@ -0,0 +1,19 @@
[remap]
importer="wavefront_obj"
type="Mesh"
path="res://.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh"
[deps]
files=[ "res://.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh" ]
source_file="res://Items/Stick/stick.obj"
dest_files=[ "res://.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh", "res://.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh" ]
[params]
generate_tangents=true
scale_mesh=Vector3( 1, 1, 1 )
offset_mesh=Vector3( 0, 0, 0 )
optimize_mesh=true

Binary file not shown.

After

Width:  |  Height:  |  Size: 805 B

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="StreamTexture"
path.s3tc="res://.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.s3tc.stex"
path.etc2="res://.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.etc2.stex"
metadata={
"imported_formats": [ "s3tc", "etc2" ],
"vram_texture": true
}
[deps]
source_file="res://Items/Stick/stick_tex.png"
dest_files=[ "res://.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.s3tc.stex", "res://.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.etc2.stex" ]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=true
flags/filter=true
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=1
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

View File

@ -0,0 +1,32 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Items/Stick/Stick Inventory.tscn" type="PackedScene" id=1]
[sub_resource type="World" id=1]
[node name="Inventory" type="CanvasLayer"]
follow_viewport_enable = true
[node name="MarginContainer" type="MarginContainer" parent="."]
margin_right = 1004.0
margin_bottom = 590.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Slot 1" type="ViewportContainer" parent="MarginContainer"]
margin_right = 1004.0
margin_bottom = 590.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Slot 1 Viewport" type="Viewport" parent="MarginContainer/Slot 1"]
size = Vector2( 100, 100 )
own_world = true
world = SubResource( 1 )
transparent_bg = true
handle_input_locally = false
render_target_update_mode = 3
[node name="KinematicBody" parent="MarginContainer/Slot 1/Slot 1 Viewport" instance=ExtResource( 1 )]

View File

@ -0,0 +1,20 @@
extends CSGMesh
# Declare member variables here. Examples:
var rotational_point = Vector3(0,0,0)
var axis = Vector3(0,1,0)
var last_angle = 0
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
# pass
#last_angle+=delta
transform = transform.rotated(axis, delta)

View File

@ -1,16 +1,17 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=6 format=2]
[ext_resource path="res://Player/Player.gd" type="Script" id=1] [ext_resource path="res://Player/Player.gd" type="Script" id=1]
[ext_resource path="res://Menus/Inventory/Inventory.tscn" type="PackedScene" id=2]
[sub_resource type="CapsuleMesh" id=2] [sub_resource type="CapsuleMesh" id=1]
mid_height = 4.0 mid_height = 4.0
radial_segments = 6 radial_segments = 6
rings = 1 rings = 1
[sub_resource type="CapsuleShape" id=3] [sub_resource type="CapsuleShape" id=2]
height = 4.0 height = 4.0
[sub_resource type="CapsuleShape" id=4] [sub_resource type="CapsuleShape" id=3]
radius = 1.1 radius = 1.1
height = 4.0 height = 4.0
@ -22,18 +23,21 @@ script = ExtResource( 1 )
[node name="Camera" type="Camera" parent="Spatial"] [node name="Camera" type="Camera" parent="Spatial"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -0.866904 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -0.866904 )
cull_mask = 1048543
fov = 90.0 fov = 90.0
far = 250.0 far = 250.0
[node name="Inventory" parent="Spatial/Camera" instance=ExtResource( 2 )]
[node name="MeshInstance" type="MeshInstance" parent="Spatial"] [node name="MeshInstance" type="MeshInstance" parent="Spatial"]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 ) transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 )
visible = false visible = false
mesh = SubResource( 2 ) mesh = SubResource( 1 )
material/0 = null material/0 = null
[node name="CollisionShape" type="CollisionShape" parent="."] [node name="CollisionShape" type="CollisionShape" parent="."]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 ) transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 )
shape = SubResource( 3 ) shape = SubResource( 2 )
[node name="Timer" type="Timer" parent="."] [node name="Timer" type="Timer" parent="."]
wait_time = 2.0 wait_time = 2.0
@ -45,7 +49,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="KillBox"] [node name="CollisionShape" type="CollisionShape" parent="KillBox"]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 ) transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 )
shape = SubResource( 4 ) shape = SubResource( 3 )
[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]
[connection signal="body_entered" from="KillBox" to="." method="_on_KillBox_body_entered"] [connection signal="body_entered" from="KillBox" to="." method="_on_KillBox_body_entered"]