From 7e0e9eba9789ff80743dc68cae98db6f400a834e Mon Sep 17 00:00:00 2001
From: Enigmatisms <984041003@qq.com>
Date: Tue, 13 Jun 2023 00:37:07 +0800
Subject: [PATCH 01/18] WIP: Normal mapping and vertex normal
---
parsers/obj_desc.py | 11 +++++++++--
parsers/obj_loader.py | 21 ++++++++++++---------
parsers/xml_parser.py | 17 ++++++++++++++---
renderer/bdpt.py | 2 +-
renderer/vanilla_renderer.py | 2 +-
renderer/vpt.py | 2 +-
tracer/path_tracer.py | 6 +++---
tracer/tracer_base.py | 2 +-
8 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/parsers/obj_desc.py b/parsers/obj_desc.py
index 6faa16b..3cda57a 100644
--- a/parsers/obj_desc.py
+++ b/parsers/obj_desc.py
@@ -27,8 +27,12 @@ def get_aabb(meshes: Arr, _type: int = 0) -> Arr:
class ObjDescriptor:
def __init__(
- self, meshes, normals, bsdf, uv_coords = None,
- texture = None, R = None, t = None, emit_id = -1, _type = 0
+ self, meshes, normals, bsdf,
+ vert_normal = None,
+ uv_coords = None,
+ texture = None,
+ R = None, t = None,
+ emit_id = -1, _type = 0
):
"""
Inputs are objects on which transformations have been applied already
@@ -39,10 +43,13 @@ def __init__(
self.meshes = meshes
self.uv_coords = uv_coords
self.normals = normals
+ self.vns = vert_normal
# TODO: maybe we should work on shading normals in the future
self.R = R
self.t = t
self.bsdf = bsdf # object can have BSDF (BRDF + BTDF)
+
+ # Texture includes all texture mappings
self.texture = texture
self.aabb = get_aabb(meshes, _type) # of shape (2, 3)
self.emitter_ref_id = emit_id
diff --git a/parsers/obj_loader.py b/parsers/obj_loader.py
index 144eaa2..7236db7 100644
--- a/parsers/obj_loader.py
+++ b/parsers/obj_loader.py
@@ -34,6 +34,7 @@ def extract_obj_info(path: str, verbose = True, auto_scale_uv = False):
break
if material is not None:
vert_type = material.vertex_format
+ print(vert_type)
if "T" not in vert_type:
if verbose:
CONSOLE.log(f"[blue]Attention: Object contains no uv-coordinates for vtype '{vert_type}'")
@@ -41,9 +42,9 @@ def extract_obj_info(path: str, verbose = True, auto_scale_uv = False):
start_dim = 0
dim_num = sum([int(part[1:]) for part in all_parts])
all_data = np.float32(material.vertices).reshape(-1, dim_num)
- mesh_faces = None
- uv_coords = None
- normals = None
+ mesh_faces = None
+ vert_normal = None
+ uv_coords = None
for part in all_parts:
if part.startswith("T"):
uv_coords = all_data[:, start_dim:start_dim+2]
@@ -54,6 +55,8 @@ def extract_obj_info(path: str, verbose = True, auto_scale_uv = False):
uv_coords = uv_coords.reshape(-1, 3, 2)
elif part.startswith("V"):
mesh_faces = np.float32(all_data[:, start_dim:start_dim+3]).reshape(-1, 3, 3)
+ elif part.startswith("N"):
+ vert_normal = np.float32(all_data[:, start_dim:start_dim+3]).reshape(-1, 3, 3)
start_dim += int(part[1:])
assert mesh_faces is not None # we directly use the vertices loaded, so this can not be empty
@@ -62,15 +65,15 @@ def extract_obj_info(path: str, verbose = True, auto_scale_uv = False):
# so uv-coordinates are ordered too
# vertices shape: (N_faces, 3, 3), uv_coords shape: (N_faces, 3, 2)
- if normals is None: # normal is not computed in obj
- dp1 = mesh_faces[:, 1, :] - mesh_faces[:, 0, :]
- dp2 = mesh_faces[:, 2, :] - mesh_faces[:, 1, :]
- normals = np.cross(dp1, dp2)
- normals /= np.linalg.norm(normals, axis = -1, keepdims = True)
+ # calculate geometrical normal
+ dp1 = mesh_faces[:, 1, :] - mesh_faces[:, 0, :]
+ dp2 = mesh_faces[:, 2, :] - mesh_faces[:, 1, :]
+ normals = np.cross(dp1, dp2)
+ normals /= np.linalg.norm(normals, axis = -1, keepdims = True)
if verbose:
CONSOLE.log(f"Mesh loaded from '{path}', output shape: [blue]{mesh_faces.shape}[/blue]")
- return mesh_faces, normals, uv_coords
+ return mesh_faces, normals, vert_normal, uv_coords
else:
raise ValueError("This wavefront onject file has no material but it is required.")
diff --git a/parsers/xml_parser.py b/parsers/xml_parser.py
index 169efd2..e045d7c 100644
--- a/parsers/xml_parser.py
+++ b/parsers/xml_parser.py
@@ -90,11 +90,12 @@ def parse_wavefront(
# We need to calculate surface area of the object mesh first (asuming each triangle has similar area)
attached_area_dict = {}
for elem in obj_list:
- uvs, trans_r, trans_t = None, None, None # uv_coordinates and transform
+ vns, uvs, trans_r, trans_t = None, None, None, None # uv_coordinates and transform
obj_type = 0
if elem.get("type") == "obj":
filepath_child = elem.find("string")
- meshes, normals, uvs = extract_obj_info(os.path.join(directory, filepath_child.get("value")))
+ # get mesh / geometrical normal / shading normal / uv coords for texture
+ meshes, normals, vns, uvs = extract_obj_info(os.path.join(directory, filepath_child.get("value")))
transform_child = elem.find("transform")
if transform_child is not None:
trans_r, trans_t = transform_parse(transform_child)
@@ -119,7 +120,7 @@ def parse_wavefront(
if bsdf_item is None:
raise ValueError("Object should be attached with a BSDF for now since no default one implemented yet.")
- all_objs.append(ObjDescriptor(meshes, normals, bsdf_item, uvs, texture, trans_r, trans_t, emit_ref_id, obj_type))
+ all_objs.append(ObjDescriptor(meshes, normals, bsdf_item, vns, uvs, texture, trans_r, trans_t, emit_ref_id, obj_type))
return all_objs, attached_area_dict
def parse_bxdf(bxdf_list: List[xet.Element]):
@@ -201,6 +202,16 @@ def scene_parsing(directory: str, file: str):
emitter_dict = parse_emitters(emitter_nodes)
bsdf_dict = parse_bxdf(bxdf_nodes)
teximg, textures = parse_texture(texture_nodes)
+ """ Texture mapping should be updateded (FIXME):
+ (1)