Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles microdisplacement: refactor to move some tesselation code from SubdMesh to Mesh

Browse Source 
Reviewed By: brecht

Differential Revision: https://developer.blender.org/D1915
This commit is contained in:
Mai Lavelle
2016-04-11 23:46:00 +02:00
committed by Brecht Van Lommel
parent d456458e06
commit 665467e51e
4 changed files with 66 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
intern/cycles/render/mesh.cpp
View File

@@ -35,6 +35,9 @@
#include "util_progress.h"
#include "util_set.h"
#include "subd_split.h"
#include "subd_patch.h"
CCL_NAMESPACE_BEGIN
/* Triangle */
@@ -112,6 +115,9 @@ void Mesh::reserve(int numverts, int numtris, int numcurves, int numcurvekeys)
triangles.resize(numtris);
shader.resize(numtris);
smooth.resize(numtris);
forms_quad.resize(numtris);
curve_keys.resize(numcurvekeys);
curves.resize(numcurves);
@@ -127,6 +133,8 @@ void Mesh::clear()
shader.clear();
smooth.clear();
forms_quad.clear();
curve_keys.clear();
curves.clear();
@@ -156,7 +164,7 @@ int Mesh::split_vertex(int vertex)
return verts.size() - 1;
}
void Mesh::set_triangle(int i, int v0, int v1, int v2, int shader_, bool smooth_)
void Mesh::set_triangle(int i, int v0, int v1, int v2, int shader_, bool smooth_, bool forms_quad_)
{
Triangle tri;
tri.v[0] = v0;
@@ -166,9 +174,10 @@ void Mesh::set_triangle(int i, int v0, int v1, int v2, int shader_, bool smooth_
triangles[i] = tri;
shader[i] = shader_;
smooth[i] = smooth_;
forms_quad[i] = forms_quad_;
}
void Mesh::add_triangle(int v0, int v1, int v2, int shader_, bool smooth_)
void Mesh::add_triangle(int v0, int v1, int v2, int shader_, bool smooth_, bool forms_quad_)
{
Triangle tri;
tri.v[0] = v0;
@@ -178,6 +187,7 @@ void Mesh::add_triangle(int v0, int v1, int v2, int shader_, bool smooth_)
triangles.push_back(tri);
shader.push_back(shader_);
smooth.push_back(smooth_);
forms_quad.push_back(forms_quad_);
}
void Mesh::add_curve_key(float3 co, float radius)
@@ -1437,5 +1447,42 @@ bool Mesh::need_attribute(Scene *scene, ustring name)
return false;
}
void Mesh::tessellate(DiagSplit *split)
{
int num_faces = triangles.size();
for(int f = 0; f < num_faces; f++) {
if(!forms_quad[f]) {
/* triangle */
LinearTrianglePatch* patch = new LinearTrianglePatch();
float3 *hull = patch->hull;
for(int i = 0; i < 3; i++) {
hull[i] = verts[triangles[f].v[i]];
}
split->split_triangle(patch);
delete patch;
}
else {
/* quad */
LinearQuadPatch* patch = new LinearQuadPatch();
float3 *hull = patch->hull;
hull[0] = verts[triangles[f ].v[0]];
hull[1] = verts[triangles[f ].v[1]];
hull[3] = verts[triangles[f ].v[2]];
hull[2] = verts[triangles[f+1].v[2]];
split->split_quad(patch);
delete patch;
// consume second triangle in quad
f++;
}
}
}
CCL_NAMESPACE_END