This commit is contained in:
Holly Stubbs 2025-02-12 04:47:07 +00:00
parent 423912bbde
commit aea7107a7b
Signed by: tgpholly
GPG key ID: B8583C4B7D18119E
2 changed files with 12 additions and 5 deletions

View file

@ -5,14 +5,14 @@ func _ready() -> void:
#B3D.Load("GFX\\npcs\\106_2.b3d") #B3D.Load("GFX\\npcs\\106_2.b3d")
add_child(B3D.Load("GFX\\apache.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"]) #RMesh.LoadRMesh(self, roomInfo["mesh path"])
#CreateMap() #CreateMap()
IntroEnabled = true IntroEnabled = true
LoadRoomTemplates("Data\\rooms.ini") #LoadRoomTemplates("Data\\rooms.ini")
CreateMap() #CreateMap()
var IntroEnabled: bool var IntroEnabled: bool
var I_Zone: MapZones = MapZones.new() var I_Zone: MapZones = MapZones.new()

View file

@ -53,11 +53,15 @@ static func ReadVRTS(reader:BufferStuffReader):
if vrtsChunk.containsNormals: if vrtsChunk.containsNormals:
var normal = reader.readVector3(true) var normal = reader.readVector3(true)
vrtsChunk.normals.push_back(normal) vrtsChunk.normals.push_back(normal)
else:
vrtsChunk.normals.push_back(Vector3.ZERO)
if vrtsChunk.containsColors: if vrtsChunk.containsColors:
var color = reader.readColor() var color = reader.readColor()
vrtsChunk.colors.push_back(color) vrtsChunk.colors.push_back(color)
else:
vrtsChunk.colors.push_back(Color.WHITE)
for i in range(vrtsChunk.tex_coord_set_size): for i in range(vrtsChunk.tex_coord_set_size):
vrtsChunk.uv.push_back(reader.readVector2()) vrtsChunk.uv.push_back(reader.readVector2())
for i in range(vrtsChunk.tex_coord_sets): for i in range(vrtsChunk.tex_coord_sets):
@ -67,7 +71,6 @@ static func ReadVRTS(reader:BufferStuffReader):
else: else:
vrtsChunk.uv[i1].y = reader.readFloat() vrtsChunk.uv[i1].y = reader.readFloat()
print(vrtsChunk.uv)
return vrtsChunk return vrtsChunk
static func ReadTRIS(reader:BufferStuffReader): static func ReadTRIS(reader:BufferStuffReader):
@ -76,6 +79,8 @@ static func ReadTRIS(reader:BufferStuffReader):
while reader.offset < reader.buffer.size(): while reader.offset < reader.buffer.size():
trisChunk.triangles.push_back(reader.readInt()) trisChunk.triangles.push_back(reader.readInt())
trisChunk.triangles.push_back(reader.readInt())
trisChunk.triangles.push_back(reader.readInt())
return trisChunk return trisChunk
@ -107,6 +112,8 @@ static func CreateMesh(meshData: B3DMesh):
#parentShart.add_child(shit) #parentShart.add_child(shit)
#return parentShart #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_VERTEX]=meshData.verts.vertices
arr[Mesh.ARRAY_TEX_UV]=meshData.verts.uv arr[Mesh.ARRAY_TEX_UV]=meshData.verts.uv
arr[Mesh.ARRAY_INDEX]=meshData.surfaces.triangles arr[Mesh.ARRAY_INDEX]=meshData.surfaces.triangles