diff --git a/models/bureau3/bureau3.obj.import b/models/bureau3/bureau3.obj.import deleted file mode 100644 index 4f702f3..0000000 --- a/models/bureau3/bureau3.obj.import +++ /dev/null @@ -1,22 +0,0 @@ -[remap] - -importer="wavefront_obj" -importer_version=1 -type="Mesh" -uid="uid://03noaqhr8400" -path="res://.godot/imported/bureau3.obj-8e6d389a70ff4362316c4a82f70dff62.mesh" - -[deps] - -files=["res://.godot/imported/bureau3.obj-8e6d389a70ff4362316c4a82f70dff62.mesh"] - -source_file="res://models/bureau3/bureau3.obj" -dest_files=["res://.godot/imported/bureau3.obj-8e6d389a70ff4362316c4a82f70dff62.mesh", "res://.godot/imported/bureau3.obj-8e6d389a70ff4362316c4a82f70dff62.mesh"] - -[params] - -generate_tangents=true -scale_mesh=Vector3(1, 1, 1) -offset_mesh=Vector3(0, 0, 0) -optimize_mesh=true -force_disable_mesh_compression=false diff --git a/models/desktop/bureau3.mtl b/models/desktop/bureau3.mtl new file mode 100644 index 0000000..e534376 --- /dev/null +++ b/models/desktop/bureau3.mtl @@ -0,0 +1,30 @@ +# bureau3.mtl 3D model +# +# Created by Gael Bettinelli +# +# This file is distributed under Free Art License, see http://artlibre.org/licence/lal/en for more informations +# and under CC-BY Creative Commons Attribution 3.0 Unported license, see http://creativecommons.org/licenses/by/3.0/ +# at your choice +# + +newmtl BoisClair +illum 1 +Ka 0.2 0.2 0.2 +Kd 1.0 1.0 1.0 +Ks 0.0 0.0 0.0 +Ns 1.0 +map_Kd bureau3_BoisClair.png + +newmtl Default_Texture +illum 1 +Ka 0.0 0.0 0.0 +Kd 1.0 1.0 1.0 +Ks 0.0 0.0 0.0 +Ns 1.0 + +newmtl grios +illum 2 +Ka 0.0 0.0 0.0 +Kd 0.82 0.82 0.82 +Ks 0.05 0.05 0.05 +Ns 103.0 diff --git a/models/bureau3/bureau3.obj b/models/desktop/bureau3.obj similarity index 100% rename from models/bureau3/bureau3.obj rename to models/desktop/bureau3.obj diff --git a/models/desktop/bureau3.obj.import b/models/desktop/bureau3.obj.import new file mode 100644 index 0000000..249073a --- /dev/null +++ b/models/desktop/bureau3.obj.import @@ -0,0 +1,22 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://dxfoqqm2nloti" +path="res://.godot/imported/bureau3.obj-929d030a546a29faddfad39809e1f87e.mesh" + +[deps] + +files=["res://.godot/imported/bureau3.obj-929d030a546a29faddfad39809e1f87e.mesh"] + +source_file="res://models/desktop/bureau3.obj" +dest_files=["res://.godot/imported/bureau3.obj-929d030a546a29faddfad39809e1f87e.mesh", "res://.godot/imported/bureau3.obj-929d030a546a29faddfad39809e1f87e.mesh"] + +[params] + +generate_tangents=true +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +optimize_mesh=true +force_disable_mesh_compression=false diff --git a/models/desktop/bureau3_BoisClair.png b/models/desktop/bureau3_BoisClair.png new file mode 100644 index 0000000..d01a129 --- /dev/null +++ b/models/desktop/bureau3_BoisClair.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d732e33761fa9823d7d9c499d7a65d9dd77794fed1fae09568befa82369fbd4 +size 27025 diff --git a/models/desktop/bureau3_BoisClair.png.import b/models/desktop/bureau3_BoisClair.png.import new file mode 100644 index 0000000..32bb265 --- /dev/null +++ b/models/desktop/bureau3_BoisClair.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dd644wh2qki1t" +path.s3tc="res://.godot/imported/bureau3_BoisClair.png-f39af77d8cb24e5aa001d100a3ee0507.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://models/desktop/bureau3_BoisClair.png" +dest_files=["res://.godot/imported/bureau3_BoisClair.png-f39af77d8cb24e5aa001d100a3ee0507.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +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 diff --git a/scenes/World.tscn b/scenes/World.tscn index b3e7c3f..085ef71 100644 --- a/scenes/World.tscn +++ b/scenes/World.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=3 uid="uid://dc0cngrxpqgyh"] [ext_resource type="PackedScene" uid="uid://b78y8nhrad6ag" path="res://scenes/Player.tscn" id="1_r5ocp"] -[ext_resource type="ArrayMesh" uid="uid://03noaqhr8400" path="res://models/bureau3/bureau3.obj" id="2_ukmp7"] +[ext_resource type="ArrayMesh" uid="uid://dxfoqqm2nloti" path="res://models/desktop/bureau3.obj" id="2_b86p5"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_uwb5b"] sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) @@ -40,8 +40,8 @@ mesh = SubResource("PlaneMesh_vfc5y") shape = SubResource("ConcavePolygonShape3D_ibbj3") [node name="Player" parent="." instance=ExtResource("1_r5ocp")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0) [node name="Bureau3" type="MeshInstance3D" parent="."] -transform = Transform3D(0.015, 0, 0, 0, 0.015, 0, 0, 0, 0.015, -0.693947, 0.545501, -4.30502) -mesh = ExtResource("2_ukmp7") +transform = Transform3D(0.015, 0, 0, 0, 0.015, 0, 0, 0, 0.015, 0.145715, 0.531814, -3.61084) +mesh = ExtResource("2_b86p5")