Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Courses
Scotty3D
Commits
a677d0f6
Commit
a677d0f6
authored
Oct 15, 2020
by
TheNumbat
Browse files
revert join; don't write normals
parent
c933790f
Changes
1
Show whitespace changes
Inline
Side-by-side
src/scene/scene.cpp
View file @
a677d0f6
...
@@ -502,7 +502,7 @@ std::string Scene::load(bool new_scene, Undo &undo, Gui::Manager &gui, std::stri
...
@@ -502,7 +502,7 @@ std::string Scene::load(bool new_scene, Undo &undo, Gui::Manager &gui, std::stri
file
.
c_str
(),
aiProcess_PopulateArmatureData
|
aiProcess_OptimizeMeshes
|
file
.
c_str
(),
aiProcess_PopulateArmatureData
|
aiProcess_OptimizeMeshes
|
aiProcess_ValidateDataStructure
|
aiProcess_FindInvalidData
|
aiProcess_ValidateDataStructure
|
aiProcess_FindInvalidData
|
aiProcess_FindInstances
|
aiProcess_FindDegenerates
|
aiProcess_FindInstances
|
aiProcess_FindDegenerates
|
aiProcess_DropNormals
);
aiProcess_DropNormals
|
aiProcess_JoinIdenticalVertices
);
if
(
!
scene
)
{
if
(
!
scene
)
{
return
"Parsing scene "
+
file
+
": "
+
std
::
string
(
importer
.
GetErrorString
());
return
"Parsing scene "
+
file
+
": "
+
std
::
string
(
importer
.
GetErrorString
());
...
@@ -880,7 +880,6 @@ std::string Scene::write(std::string file, const Camera &render_cam,
...
@@ -880,7 +880,6 @@ std::string Scene::write(std::string file, const Camera &render_cam,
size_t
n_faces
=
mesh
.
n_faces
();
size_t
n_faces
=
mesh
.
n_faces
();
ai_mesh
->
mVertices
=
new
aiVector3D
[
n_verts
];
ai_mesh
->
mVertices
=
new
aiVector3D
[
n_verts
];
ai_mesh
->
mNormals
=
new
aiVector3D
[
n_verts
];
ai_mesh
->
mNumVertices
=
(
unsigned
int
)
n_verts
;
ai_mesh
->
mNumVertices
=
(
unsigned
int
)
n_verts
;
ai_mesh
->
mFaces
=
new
aiFace
[
n_faces
];
ai_mesh
->
mFaces
=
new
aiFace
[
n_faces
];
...
@@ -893,7 +892,6 @@ std::string Scene::write(std::string file, const Camera &render_cam,
...
@@ -893,7 +892,6 @@ std::string Scene::write(std::string file, const Camera &render_cam,
id_to_idx
[
v
->
id
()]
=
vert_idx
;
id_to_idx
[
v
->
id
()]
=
vert_idx
;
Vec3
n
=
mesh
.
flipped
()
?
-
v
->
normal
()
:
v
->
normal
();
Vec3
n
=
mesh
.
flipped
()
?
-
v
->
normal
()
:
v
->
normal
();
ai_mesh
->
mVertices
[
vert_idx
]
=
vecVec
(
v
->
pos
);
ai_mesh
->
mVertices
[
vert_idx
]
=
vecVec
(
v
->
pos
);
ai_mesh
->
mNormals
[
vert_idx
]
=
vecVec
(
n
);
vert_idx
++
;
vert_idx
++
;
}
}
...
@@ -915,7 +913,7 @@ std::string Scene::write(std::string file, const Camera &render_cam,
...
@@ -915,7 +913,7 @@ std::string Scene::write(std::string file, const Camera &render_cam,
face_idx
++
;
face_idx
++
;
}
}
}
else
{
}
else
if
(
obj
.
opt
.
shape_type
==
PT
::
Shape_Type
::
none
)
{
const
auto
&
verts
=
obj
.
mesh
().
verts
();
const
auto
&
verts
=
obj
.
mesh
().
verts
();
const
auto
&
elems
=
obj
.
mesh
().
indices
();
const
auto
&
elems
=
obj
.
mesh
().
indices
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment