From aea7107a7b1dd01d04c1d874c481d3a4a12498cb Mon Sep 17 00:00:00 2001 From: Holly Date: Wed, 12 Feb 2025 04:47:07 +0000 Subject: [PATCH] aaa --- src/DynamicMap.gd | 6 +++--- src/file_parsers/B3D.gd | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/DynamicMap.gd b/src/DynamicMap.gd index 23551fb..09ab282 100644 --- a/src/DynamicMap.gd +++ b/src/DynamicMap.gd @@ -5,14 +5,14 @@ func _ready() -> void: #B3D.Load("GFX\\npcs\\106_2.b3d") add_child(B3D.Load("GFX\\apache.b3d")) - DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN) + #DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN) #RMesh.LoadRMesh(self, roomInfo["mesh path"]) #CreateMap() IntroEnabled = true - LoadRoomTemplates("Data\\rooms.ini") - CreateMap() + #LoadRoomTemplates("Data\\rooms.ini") + #CreateMap() var IntroEnabled: bool var I_Zone: MapZones = MapZones.new() diff --git a/src/file_parsers/B3D.gd b/src/file_parsers/B3D.gd index 9c737fe..db37dc4 100644 --- a/src/file_parsers/B3D.gd +++ b/src/file_parsers/B3D.gd @@ -53,11 +53,15 @@ static func ReadVRTS(reader:BufferStuffReader): if vrtsChunk.containsNormals: var normal = reader.readVector3(true) vrtsChunk.normals.push_back(normal) + else: + vrtsChunk.normals.push_back(Vector3.ZERO) if vrtsChunk.containsColors: var color = reader.readColor() vrtsChunk.colors.push_back(color) - + else: + vrtsChunk.colors.push_back(Color.WHITE) + for i in range(vrtsChunk.tex_coord_set_size): vrtsChunk.uv.push_back(reader.readVector2()) for i in range(vrtsChunk.tex_coord_sets): @@ -67,7 +71,6 @@ static func ReadVRTS(reader:BufferStuffReader): else: vrtsChunk.uv[i1].y = reader.readFloat() - print(vrtsChunk.uv) return vrtsChunk static func ReadTRIS(reader:BufferStuffReader): @@ -76,6 +79,8 @@ static func ReadTRIS(reader:BufferStuffReader): while reader.offset < reader.buffer.size(): trisChunk.triangles.push_back(reader.readInt()) + trisChunk.triangles.push_back(reader.readInt()) + trisChunk.triangles.push_back(reader.readInt()) return trisChunk @@ -107,6 +112,8 @@ static func CreateMesh(meshData: B3DMesh): #parentShart.add_child(shit) #return parentShart + print(meshData.verts.vertices.size(), ", ", meshData.verts.uv.size(), ", ", meshData.surfaces.triangles.size()) + arr[Mesh.ARRAY_VERTEX]=meshData.verts.vertices arr[Mesh.ARRAY_TEX_UV]=meshData.verts.uv arr[Mesh.ARRAY_INDEX]=meshData.surfaces.triangles