Compare commits

..

5 Commits

Author SHA1 Message Date
63ea62ff74 some greyboxing attempt
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Failing after 3h13m16s
2025-09-15 17:33:48 +02:00
c563390796 Merge branch 'main' of https://git.game-dev.space/minimata/MovementTests
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Failing after 3h5m23s
2025-09-13 19:15:41 +02:00
5f37f39558 deleted useless stuss 2025-09-13 19:15:38 +02:00
4922e597d9 Merge pull request 'test adding a blend file mesh' (#2) from more-rework into main
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Has been cancelled
Reviewed-on: #2
2025-09-13 17:14:19 +00:00
739968afbf test adding a clend file mesh 2025-09-13 19:11:50 +02:00
7 changed files with 136 additions and 6 deletions

Binary file not shown.

View File

@@ -0,0 +1,53 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://b7w8cn15vsiy0"
path="res://.godot/imported/city.blend-135341795722816c412126e50c6067d4.scn"
[deps]
source_file="res://assets/greyboxing/city.blend"
dest_files=["res://.godot/imported/city.blend-135341795722816c412126e50c6067d4.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=14 format=3 uid="uid://dmkw8cmalm5k"]
[gd_scene load_steps=15 format=3 uid="uid://dmkw8cmalm5k"]
[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"]
[ext_resource type="PackedScene" uid="uid://dkr80d2pi0d41" path="res://addons/guide/debugger/guide_debugger.tscn" id="2_uet8a"]
@@ -10,6 +10,7 @@
[ext_resource type="PackedScene" uid="uid://482s38k0yv35" path="res://maps/Components/stairs.tscn" id="8_pxgdh"]
[ext_resource type="PackedScene" uid="uid://cmfagvnymc2yr" path="res://assets/ladder/ladder.fbx" id="9_ukfuy"]
[ext_resource type="PackedScene" uid="uid://bod7boex72igr" path="res://assets/ladder/ladder-top.fbx" id="10_wctvs"]
[ext_resource type="PackedScene" uid="uid://dyw5lds1w724m" path="res://assets/greyboxing/city_col.tscn" id="11_wctvs"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0xm2m"]
sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
@@ -31,7 +32,7 @@ ssil_enabled = true
[node name="Main" type="Node3D"]
[node name="Player" parent="." instance=ExtResource("1_2vsi6")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.7981, 101, 0.300598)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.7981, 116.718, 0.300598)
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_1bvp3")
@@ -51,10 +52,6 @@ use_collision = true
collision_layer = 3
collision_mask = 5
[node name="Map" type="Sprite3D" parent="Greybox"]
transform = Transform3D(5.65685, -5.65685, -2.47269e-08, 0, -3.49691e-07, 0.8, -5.65685, -5.65685, -2.47269e-08, 141.335, 0, -122.33)
texture = ExtResource("3_ruo5i")
[node name="CSGBox3D11" type="CSGBox3D" parent="Greybox"]
transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, 149.932, -1, -129.284)
use_collision = true
@@ -62,6 +59,7 @@ size = Vector3(398.5, 1, 288.5)
material = ExtResource("3_cieeo")
[node name="GuardTower" type="CSGCombiner3D" parent="Greybox"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -83.7691, 0, 0.750248)
[node name="CSGBox3D6" type="CSGBox3D" parent="Greybox/GuardTower"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 45.75, 0)
@@ -1182,3 +1180,10 @@ transform = Transform3D(0.747027, 0, -0.664797, 0, 1, 0, 0.664797, 0, 0.747027,
use_collision = true
size = Vector3(16, 19, 4.5)
material = ExtResource("3_cieeo")
[node name="Map" type="Sprite3D" parent="."]
transform = Transform3D(0, -8, -3.49691e-08, 0, -3.49691e-07, 0.8, -8, 0, 0, 13.4386, 0, -186.439)
texture = ExtResource("3_ruo5i")
[node name="city" parent="." instance=ExtResource("11_wctvs")]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0)

View File

@@ -0,0 +1,32 @@
@tool
extends Node3D
@export_tool_button("Clear collisions", "Callable") var clear_col_action = clear_collisions
@export_tool_button("Generate collisions", "Callable") var generate_col_action = generate_collisions
func get_all_children_of_type(node, type) -> Array:
var nodes : Array = []
for child in node.get_children():
if is_instance_of(child, type):
nodes.append(child)
if child.get_child_count() > 0:
nodes.append_array(get_all_children_of_type(child, type))
return nodes
func clear_collisions_on_meshes(meshes: Array):
for mesh_instance: MeshInstance3D in meshes:
for child in mesh_instance.get_children():
child.queue_free()
func generate_collisions_on_meshes(meshes: Array):
for mesh_instance: MeshInstance3D in meshes:
mesh_instance.create_trimesh_collision()
func generate_collisions():
var mesh_instances = get_all_children_of_type(self, MeshInstance3D)
clear_collisions_on_meshes(mesh_instances)
generate_collisions_on_meshes(mesh_instances)
func clear_collisions():
var mesh_instances = get_all_children_of_type(self, MeshInstance3D)
clear_collisions_on_meshes(mesh_instances)

View File

@@ -0,0 +1 @@
uid://do8vihuwc4iib