diff --git a/assets b/assets index da56a8d..8ecf8f1 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit da56a8d6b4ce5565198426888b2cf1b47dc4e097 +Subproject commit 8ecf8f1da3a244b134b8d2d324479c07da8b859f diff --git a/cardboard_shader.tres b/cardboard_shader.tres index 418d9d9..8c630c1 100644 --- a/cardboard_shader.tres +++ b/cardboard_shader.tres @@ -1,7 +1,7 @@ [gd_resource type="VisualShader" load_steps=13 format=3 uid="uid://dwd2vgoqby6rd"] -[ext_resource type="Texture2D" uid="uid://cffsdo4cit4i1" path="res://kreb.png" id="1_mkqvf"] -[ext_resource type="Texture2D" uid="uid://d0l1mjrgq6wrq" path="res://paper_tex/paper_0025_color_1k.jpg" id="2_1g1lb"] +[ext_resource type="Texture2D" uid="uid://dast4ubkinjb5" path="res://assets/textures/zombietextures_funny/kreb.png" id="1_fcaxl"] +[ext_resource type="Texture2D" uid="uid://dl2how3ds6db" path="res://assets/textures/zombietextures_paper/paper_0025_ao_1k.jpg" id="2_qm08s"] [ext_resource type="Texture2D" uid="uid://dke8hdaqyfnsn" path="res://assets/textures/zombietextures_paper/paper_0025_normal_opengl_1k.png" id="3_qtx1j"] [sub_resource type="VisualShaderNodeVectorOp" id="VisualShaderNodeVectorOp_xrdx0"] @@ -10,11 +10,12 @@ operator = 2 [sub_resource type="VisualShaderNodeTexture" id="VisualShaderNodeTexture_o5oup"] expanded_output_ports = [0] -texture = ExtResource("1_mkqvf") +texture = ExtResource("1_fcaxl") texture_type = 1 [sub_resource type="VisualShaderNodeTexture" id="VisualShaderNodeTexture_jdjui"] -texture = ExtResource("2_1g1lb") +texture = ExtResource("2_qm08s") +texture_type = 1 [sub_resource type="VisualShaderNodeTexture" id="VisualShaderNodeTexture_kox8j"] output_port_for_preview = 1 @@ -44,7 +45,7 @@ render_mode blend_mix, depth_draw_opaque, cull_disabled, diffuse_lambert, specul uniform sampler2D tex_frg_2 : source_color; uniform sampler2D tex_frg_4 : hint_normal; -uniform sampler2D tex_frg_3; +uniform sampler2D tex_frg_3 : source_color; @@ -97,7 +98,7 @@ void fragment() { } " -graph_offset = Vector2(-400.806, 286.904) +graph_offset = Vector2(-588.944, 111.566) modes/cull = 2 nodes/fragment/0/position = Vector2(800, 100) nodes/fragment/2/node = SubResource("VisualShaderNodeTexture_o5oup") diff --git a/world.tscn b/world.tscn index 70fec16..c32b402 100644 --- a/world.tscn +++ b/world.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://cv8621s5oukrb"] -[ext_resource type="ArrayMesh" uid="uid://dtqoe5wik1u38" path="res://fmlmap.obj" id="1_2cian"] +[ext_resource type="ArrayMesh" uid="uid://clav4e5cjqksv" path="res://assets/maps/fmlmap.obj" id="1_t2dij"] [ext_resource type="PackedScene" uid="uid://dyyf1q12dchhq" path="res://Player.tscn" id="2_jba6q"] [ext_resource type="PackedScene" uid="uid://cp4rwojl3c3y3" path="res://test.tscn" id="3_wlkcu"] @@ -11,7 +11,7 @@ data = PackedVector3Array(-504, -64, 256, -504, -64, 128, -504, -192, 128, -504, [node name="Fmlmap" type="MeshInstance3D" parent="."] transform = Transform3D(0.039, 0, 0, 0, -1.70474e-09, 0.039, 0, -0.039, -1.70474e-09, 0, 0, 0) -mesh = ExtResource("1_2cian") +mesh = ExtResource("1_t2dij") [node name="StaticBody3D" type="StaticBody3D" parent="Fmlmap"]