[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53529] trunk/blender/intern/cycles/ blender: Cycles Hair: add Generated texture coordinates for curves, so that procedural
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Jan 3 13:31:14 CET 2013
Revision: 53529
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53529
Author: blendix
Date: 2013-01-03 12:31:05 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Cycles Hair: add Generated texture coordinates for curves, so that procedural
textures now work without having to add a UV map.
Also made UV and intercept attributes only export when needed by the shader.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_curves.cpp
trunk/blender/intern/cycles/blender/blender_mesh.cpp
trunk/blender/intern/cycles/blender/blender_util.h
Modified: trunk/blender/intern/cycles/blender/blender_curves.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_curves.cpp 2013-01-03 12:09:09 UTC (rev 53528)
+++ trunk/blender/intern/cycles/blender/blender_curves.cpp 2013-01-03 12:31:05 UTC (rev 53529)
@@ -16,6 +16,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include "attribute.h"
#include "mesh.h"
#include "object.h"
#include "scene.h"
@@ -24,16 +25,8 @@
#include "blender_sync.h"
#include "blender_util.h"
-#include "subd_mesh.h"
-#include "subd_patch.h"
-#include "subd_split.h"
-
#include "util_foreach.h"
-#include "DNA_modifier_types.h"
-#include "DNA_particle_types.h"
-#include "DNA_meshdata_types.h"
-
CCL_NAMESPACE_BEGIN
/* Utilities */
@@ -650,7 +643,7 @@
/* texture coords still needed */
}
-void ExportCurveSegments(Mesh *mesh, ParticleCurveData *CData, int interpolation, int segments)
+void ExportCurveSegments(Scene *scene, Mesh *mesh, ParticleCurveData *CData, int interpolation, int segments)
{
int num_keys = 0;
int num_curves = 0;
@@ -658,8 +651,12 @@
if(!(mesh->curves.empty() && mesh->curve_keys.empty()))
return;
- Attribute *attr_uv = mesh->curve_attributes.add(ATTR_STD_UV);
- Attribute *attr_intercept = mesh->curve_attributes.add(ATTR_STD_CURVE_INTERCEPT);
+ Attribute *attr_uv = NULL, *attr_intercept = NULL;
+
+ if(mesh->need_attribute(scene, ATTR_STD_UV))
+ attr_uv = mesh->curve_attributes.add(ATTR_STD_UV);
+ if(mesh->need_attribute(scene, ATTR_STD_CURVE_INTERCEPT))
+ attr_intercept = mesh->curve_attributes.add(ATTR_STD_CURVE_INTERCEPT);
for( int sys = 0; sys < CData->psys_firstcurve.size() ; sys++) {
@@ -695,14 +692,16 @@
radius =0.0f;
mesh->add_curve_key(ickey_loc, radius);
- attr_intercept->add(time);
+ if(attr_intercept)
+ attr_intercept->add(time);
num_curve_keys++;
}
}
mesh->add_curve(num_keys, num_curve_keys, CData->psys_shader[sys]);
- attr_uv->add(CData->curve_uv[curve]);
+ if(attr_uv)
+ attr_uv->add(CData->curve_uv[curve]);
num_keys += num_curve_keys;
num_curves++;
@@ -871,7 +870,7 @@
ExportCurveTriangleGeometry(mesh, &CData, interpolation, use_smooth, resolution, segments);
}
else {
- ExportCurveSegments(mesh, &CData, interpolation, segments);
+ ExportCurveSegments(scene, mesh, &CData, interpolation, segments);
int ckey_num = mesh->curve_keys.size();
/*export tangents or curve data? - not functional yet*/
@@ -886,6 +885,22 @@
data_tangent[ck] = tg;
}
}
+
+ /* generated coordinates from first key. we should ideally get this from
+ * blender to handle deforming objects */
+ if(mesh->need_attribute(scene, ATTR_STD_GENERATED)) {
+ float3 loc, size;
+ mesh_texture_space(b_mesh, loc, size);
+
+ Attribute *attr_generated = mesh->curve_attributes.add(ATTR_STD_GENERATED);
+ float3 *generated = attr_generated->data_float3();
+ size_t i = 0;
+
+ foreach(Mesh::Curve& curve, mesh->curves) {
+ float3 co = mesh->curve_keys[curve.first_key].co;
+ generated[i++] = co*size - loc;
+ }
+ }
}
mesh->compute_bounds();
Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp 2013-01-03 12:09:09 UTC (rev 53528)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp 2013-01-03 12:31:05 UTC (rev 53529)
@@ -328,15 +328,10 @@
* is available in the api. */
if(mesh->need_attribute(scene, ATTR_STD_GENERATED)) {
Attribute *attr = mesh->attributes.add(ATTR_STD_GENERATED);
- float3 loc = get_float3(b_mesh.texspace_location());
- float3 size = get_float3(b_mesh.texspace_size());
- if(size.x != 0.0f) size.x = 0.5f/size.x;
- if(size.y != 0.0f) size.y = 0.5f/size.y;
- if(size.z != 0.0f) size.z = 0.5f/size.z;
+ float3 loc, size;
+ mesh_texture_space(b_mesh, loc, size);
- loc = loc*size - make_float3(0.5f, 0.5f, 0.5f);
-
float3 *generated = attr->data_float3();
size_t i = 0;
Modified: trunk/blender/intern/cycles/blender/blender_util.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_util.h 2013-01-03 12:09:09 UTC (rev 53528)
+++ trunk/blender/intern/cycles/blender/blender_util.h 2013-01-03 12:31:05 UTC (rev 53529)
@@ -242,6 +242,20 @@
return path;
}
+/* Texture Space */
+
+static inline void mesh_texture_space(BL::Mesh b_mesh, float3& loc, float3& size)
+{
+ loc = get_float3(b_mesh.texspace_location());
+ size = get_float3(b_mesh.texspace_size());
+
+ if(size.x != 0.0f) size.x = 0.5f/size.x;
+ if(size.y != 0.0f) size.y = 0.5f/size.y;
+ if(size.z != 0.0f) size.z = 0.5f/size.z;
+
+ loc = loc*size - make_float3(0.5f, 0.5f, 0.5f);
+}
+
/* ID Map
*
* Utility class to keep in sync with blender data.
More information about the Bf-blender-cvs
mailing list