Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
0ce3a755f83b047f49f78da1729a73b56b9c9d55
blender/intern/cycles/blender/blender_curves.cpp

1004 lines
36 KiB
C++
Raw Normal View History

New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
/*
Cycles: relicense GNU GPL source code to Apache version 2.0. More information in this post: http://code.blender.org/ Thanks to all contributes for giving their permission!
2013-08-18 14:16:15 +00:00
* Copyright 2011-2013 Blender Foundation
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
*
Cycles: relicense GNU GPL source code to Apache version 2.0. More information in this post: http://code.blender.org/ Thanks to all contributes for giving their permission!
2013-08-18 14:16:15 +00:00
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
*
Cycles: relicense GNU GPL source code to Apache version 2.0. More information in this post: http://code.blender.org/ Thanks to all contributes for giving their permission!
2013-08-18 14:16:15 +00:00
* http://www.apache.org/licenses/LICENSE-2.0
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
*
Cycles: relicense GNU GPL source code to Apache version 2.0. More information in this post: http://code.blender.org/ Thanks to all contributes for giving their permission!
2013-08-18 14:16:15 +00:00
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
*/
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.
2013-01-03 12:31:05 +00:00
#include "attribute.h"
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
#include "mesh.h"
#include "object.h"
#include "scene.h"
#include "curves.h"
#include "blender_sync.h"
#include "blender_util.h"
#include "util_foreach.h"
CCL_NAMESPACE_BEGIN
/* Utilities */
/* Hair curve functions */
void curveinterp_v3_v3v3v3v3(float3 *p, float3 *v1, float3 *v2, float3 *v3, float3 *v4, const float w[4]);
Code cleanup / Cycles: Remove unused interpolation code for hair triangles, we only support cardinal curves.
2013-12-22 14:13:49 +01:00
void interp_weights(float t, float data[4]);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
float shaperadius(float shape, float root, float tip, float time);
Code cleanup / Cycles: Remove unused interpolation code for hair triangles, we only support cardinal curves.
2013-12-22 14:13:49 +01:00
void InterpolateKeySegments(int seg, int segno, int key, int curve, float3 *keyloc, float *time, ParticleCurveData *CData);
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
bool ObtainCacheParticleUV(Mesh *mesh, BL::Mesh *b_mesh, BL::Object *b_ob, ParticleCurveData *CData, bool background, int uv_num);
bool ObtainCacheParticleVcol(Mesh *mesh, BL::Mesh *b_mesh, BL::Object *b_ob, ParticleCurveData *CData, bool background, int vcol_num);
bool ObtainCacheParticleData(Mesh *mesh, BL::Mesh *b_mesh, BL::Object *b_ob, ParticleCurveData *CData, bool background);
void ExportCurveSegments(Scene *scene, Mesh *mesh, ParticleCurveData *CData);
void ExportCurveTrianglePlanes(Mesh *mesh, ParticleCurveData *CData, float3 RotCam);
void ExportCurveTriangleGeometry(Mesh *mesh, ParticleCurveData *CData, int resolution);
void ExportCurveTriangleUV(Mesh *mesh, ParticleCurveData *CData, int vert_offset, int resol, float3 *uvdata);
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
void ExportCurveTriangleVcol(Mesh *mesh, ParticleCurveData *CData, int vert_offset, int resol, uchar4 *cdata);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
ParticleCurveData::ParticleCurveData()
{
}
ParticleCurveData::~ParticleCurveData()
{
}
Code cleanup / Cycles: Remove unused interpolation code for hair triangles, we only support cardinal curves.
2013-12-22 14:13:49 +01:00
void interp_weights(float t, float data[4])
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
{
Code cleanup / Cycles: Remove unused interpolation code for hair triangles, we only support cardinal curves.
2013-12-22 14:13:49 +01:00
/* Cardinal curve interpolation */
float t2 = t * t;
float t3 = t2 * t;
float fc = 0.71f;
data[0] = -fc * t3 + 2.0f * fc * t2 - fc * t;
data[1] = (2.0f - fc) * t3 + (fc - 3.0f) * t2 + 1.0f;
data[2] = (fc - 2.0f) * t3 + (3.0f - 2.0f * fc) * t2 + fc * t;
data[3] = fc * t3 - fc * t2;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
void curveinterp_v3_v3v3v3v3(float3 *p, float3 *v1, float3 *v2, float3 *v3, float3 *v4, const float w[4])
{
p->x = v1->x * w[0] + v2->x * w[1] + v3->x * w[2] + v4->x * w[3];
p->y = v1->y * w[0] + v2->y * w[1] + v3->y * w[2] + v4->y * w[3];
p->z = v1->z * w[0] + v2->z * w[1] + v3->z * w[2] + v4->z * w[3];
}
float shaperadius(float shape, float root, float tip, float time)
{
float radius = 1.0f - time;
Code cleanup / Cycles: * Simplify shaperadius() function a bit to avoid castings. * Style cleanup 1.f -> 1.0f, to follow rest of Cycles code.
2013-05-18 11:04:29 +00:00
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
if(shape != 0.0f) {
if(shape < 0.0f)
Code cleanup / Cycles: * Simplify shaperadius() function a bit to avoid castings. * Style cleanup 1.f -> 1.0f, to follow rest of Cycles code.
2013-05-18 11:04:29 +00:00
radius = powf(radius, 1.0f + shape);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
else
Code cleanup / Cycles: * Simplify shaperadius() function a bit to avoid castings. * Style cleanup 1.f -> 1.0f, to follow rest of Cycles code.
2013-05-18 11:04:29 +00:00
radius = powf(radius, 1.0f / (1.0f - shape));
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
return (radius * (root - tip)) + tip;
}
/* curve functions */
Code cleanup / Cycles: Remove unused interpolation code for hair triangles, we only support cardinal curves.
2013-12-22 14:13:49 +01:00
void InterpolateKeySegments(int seg, int segno, int key, int curve, float3 *keyloc, float *time, ParticleCurveData *CData)
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
{
float3 ckey_loc1 = CData->curvekey_co[key];
float3 ckey_loc2 = ckey_loc1;
float3 ckey_loc3 = CData->curvekey_co[key+1];
float3 ckey_loc4 = ckey_loc3;
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
if(key > CData->curve_firstkey[curve])
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
ckey_loc1 = CData->curvekey_co[key - 1];
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
if(key < CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 2)
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
ckey_loc4 = CData->curvekey_co[key + 2];
float time1 = CData->curvekey_time[key]/CData->curve_length[curve];
float time2 = CData->curvekey_time[key + 1]/CData->curve_length[curve];
float dfra = (time2 - time1) / (float)segno;
if(time)
*time = (dfra * seg) + time1;
float t[4];
Code cleanup / Cycles: Remove unused interpolation code for hair triangles, we only support cardinal curves.
2013-12-22 14:13:49 +01:00
interp_weights((float)seg / (float)segno, t);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
if(keyloc)
curveinterp_v3_v3v3v3v3(keyloc, &ckey_loc1, &ckey_loc2, &ckey_loc3, &ckey_loc4, t);
}
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
bool ObtainCacheParticleData(Mesh *mesh, BL::Mesh *b_mesh, BL::Object *b_ob, ParticleCurveData *CData, bool background)
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
{
int curvenum = 0;
int keyno = 0;
if(!(mesh && b_mesh && b_ob && CData))
return false;
Transform tfm = get_transform(b_ob->matrix_world());
Transform itfm = transform_quick_inverse(tfm);
BL::Object::modifiers_iterator b_mod;
for(b_ob->modifiers.begin(b_mod); b_mod != b_ob->modifiers.end(); ++b_mod) {
Fix for [#34654] Cycles hair particle system modifier obeys viewport visibility as well * Now Show Render and Show Viewport flags work independently and correct.
2013-03-16 08:49:39 +00:00
if((b_mod->type() == b_mod->type_PARTICLE_SYSTEM) && (background ? b_mod->show_render() : b_mod->show_viewport())) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
BL::ParticleSystemModifier psmd((const PointerRNA)b_mod->ptr);
BL::ParticleSystem b_psys((const PointerRNA)psmd.particle_system().ptr);
BL::ParticleSettings b_part((const PointerRNA)b_psys.settings().ptr);
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if((b_part.render_type() == BL::ParticleSettings::render_type_PATH) && (b_part.type() == BL::ParticleSettings::type_HAIR)) {
int mi = clamp(b_part.material()-1, 0, mesh->used_shaders.size()-1);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
int shader = mesh->used_shaders[mi];
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
int draw_step = background ? b_part.render_step() : b_part.draw_step();
Code cleanup / Cycles: * Some cleanup for castings.
2013-06-27 15:48:16 +00:00
int ren_step = (int)powf(2.0f, (float)draw_step);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
int totparts = b_psys.particles.length();
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.draw_percentage() / 100.0f);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
int totcurves = totchild;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if(b_part.child_type() == 0)
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
totcurves += totparts;
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
if(totcurves == 0)
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
continue;
PointerRNA cpsys = RNA_pointer_get(&b_part.ptr, "cycles");
CData->psys_firstcurve.push_back(curvenum);
CData->psys_curvenum.push_back(totcurves);
CData->psys_shader.push_back(shader);
Cycles Hair: Strand Minimum Pixel Size Code is added to restrict the pixel size of strands in cycles. It works best with ribbon primitives and a preset for these is included. It uses distance dependent expansion of the strands and then stochastic strand removal to give a fading. To prevent a slowdown for triangle mesh objects in the BVH an extra visibility flag has been added. It is also only applied for camera rays. The strand width settings are also changed, so that the particle size is not included in the width calculation. Instead there is a separate particle system parameter for width scaling.
2013-04-15 21:38:31 +00:00
float radius = get_float(cpsys, "radius_scale") * 0.5f;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
CData->psys_rootradius.push_back(radius * get_float(cpsys, "root_width"));
CData->psys_tipradius.push_back(radius * get_float(cpsys, "tip_width"));
CData->psys_shape.push_back(get_float(cpsys, "shape"));
CData->psys_closetip.push_back(get_boolean(cpsys, "use_closetip"));
int pa_no = 0;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if(!(b_part.child_type() == 0))
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
pa_no = totparts;
Fix T37302: cycles slow hair export with many hairs, especially on Windows.
2014-01-23 18:14:19 +01:00
int num_add = (totparts+totchild - pa_no);
CData->curve_firstkey.reserve(CData->curve_firstkey.size() + num_add);
CData->curve_keynum.reserve(CData->curve_keynum.size() + num_add);
CData->curve_length.reserve(CData->curve_length.size() + num_add);
CData->curvekey_co.reserve(CData->curvekey_co.size() + num_add*(ren_step+1));
CData->curvekey_time.reserve(CData->curvekey_time.size() + num_add*(ren_step+1));
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
for(; pa_no < totparts+totchild; pa_no++) {
Fix part of T38304: cycles render problem with zero length curve segments. Now these are removed from the curve.
2014-02-10 18:33:27 +01:00
int keynum = 0;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
CData->curve_firstkey.push_back(keyno);
float curve_length = 0.0f;
float3 pcKey;
for(int step_no = 0; step_no <= ren_step; step_no++) {
float nco[3];
remove unused modifier argument from ParticleSystem.co_hair
2013-09-20 06:20:07 +00:00
b_psys.co_hair(*b_ob, pa_no, step_no, nco);
float3 cKey = make_float3(nco[0], nco[1], nco[2]);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
cKey = transform_point(&itfm, cKey);
Fix part of T38304: cycles render problem with zero length curve segments. Now these are removed from the curve.
2014-02-10 18:33:27 +01:00
if(step_no > 0) {
float step_length = len(cKey - pcKey);
if(step_length == 0.0f)
continue;
curve_length += step_length;
}
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
CData->curvekey_co.push_back(cKey);
CData->curvekey_time.push_back(curve_length);
pcKey = cKey;
keyno++;
Fix part of T38304: cycles render problem with zero length curve segments. Now these are removed from the curve.
2014-02-10 18:33:27 +01:00
keynum++;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
Fix part of T38304: cycles render problem with zero length curve segments. Now these are removed from the curve.
2014-02-10 18:33:27 +01:00
CData->curve_keynum.push_back(keynum);
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
CData->curve_length.push_back(curve_length);
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
curvenum++;
}
}
}
}
return true;
}
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
bool ObtainCacheParticleUV(Mesh *mesh, BL::Mesh *b_mesh, BL::Object *b_ob, ParticleCurveData *CData, bool background, int uv_num)
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
{
if(!(mesh && b_mesh && b_ob && CData))
return false;
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
CData->curve_uv.clear();
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
BL::Object::modifiers_iterator b_mod;
for(b_ob->modifiers.begin(b_mod); b_mod != b_ob->modifiers.end(); ++b_mod) {
Fix for [#34654] Cycles hair particle system modifier obeys viewport visibility as well * Now Show Render and Show Viewport flags work independently and correct.
2013-03-16 08:49:39 +00:00
if((b_mod->type() == b_mod->type_PARTICLE_SYSTEM) && (background ? b_mod->show_render() : b_mod->show_viewport())) {
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
BL::ParticleSystemModifier psmd((const PointerRNA)b_mod->ptr);
BL::ParticleSystem b_psys((const PointerRNA)psmd.particle_system().ptr);
BL::ParticleSettings b_part((const PointerRNA)b_psys.settings().ptr);
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if((b_part.render_type() == BL::ParticleSettings::render_type_PATH) && (b_part.type() == BL::ParticleSettings::type_HAIR)) {
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
int totparts = b_psys.particles.length();
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.draw_percentage() / 100.0f);
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
int totcurves = totchild;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if (b_part.child_type() == 0)
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
totcurves += totparts;
if (totcurves == 0)
continue;
int pa_no = 0;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if(!(b_part.child_type() == 0))
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
pa_no = totparts;
Fix T37302: cycles slow hair export with many hairs, especially on Windows.
2014-01-23 18:14:19 +01:00
int num_add = (totparts+totchild - pa_no);
CData->curve_uv.reserve(CData->curve_uv.size() + num_add);
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
BL::ParticleSystem::particles_iterator b_pa;
b_psys.particles.begin(b_pa);
for(; pa_no < totparts+totchild; pa_no++) {
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
/* Add UVs */
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
BL::Mesh::tessface_uv_textures_iterator l;
b_mesh->tessface_uv_textures.begin(l);
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
float3 uv = make_float3(0.0f, 0.0f, 0.0f);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
if(b_mesh->tessface_uv_textures.length())
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
b_psys.uv_on_emitter(psmd, *b_pa, pa_no, uv_num, &uv.x);
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
CData->curve_uv.push_back(uv);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
if(pa_no < totparts && b_pa != b_psys.particles.end())
++b_pa;
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
}
}
}
}
return true;
}
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
bool ObtainCacheParticleVcol(Mesh *mesh, BL::Mesh *b_mesh, BL::Object *b_ob, ParticleCurveData *CData, bool background, int vcol_num)
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
{
if(!(mesh && b_mesh && b_ob && CData))
return false;
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
CData->curve_vcol.clear();
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
BL::Object::modifiers_iterator b_mod;
for(b_ob->modifiers.begin(b_mod); b_mod != b_ob->modifiers.end(); ++b_mod) {
Fix for [#34654] Cycles hair particle system modifier obeys viewport visibility as well * Now Show Render and Show Viewport flags work independently and correct.
2013-03-16 08:49:39 +00:00
if((b_mod->type() == b_mod->type_PARTICLE_SYSTEM) && (background ? b_mod->show_render() : b_mod->show_viewport())) {
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
BL::ParticleSystemModifier psmd((const PointerRNA)b_mod->ptr);
BL::ParticleSystem b_psys((const PointerRNA)psmd.particle_system().ptr);
BL::ParticleSettings b_part((const PointerRNA)b_psys.settings().ptr);
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if((b_part.render_type() == BL::ParticleSettings::render_type_PATH) && (b_part.type() == BL::ParticleSettings::type_HAIR)) {
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
int totparts = b_psys.particles.length();
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.draw_percentage() / 100.0f);
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
int totcurves = totchild;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if (b_part.child_type() == 0)
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
totcurves += totparts;
if (totcurves == 0)
continue;
int pa_no = 0;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if(!(b_part.child_type() == 0))
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
pa_no = totparts;
Fix T37302: cycles slow hair export with many hairs, especially on Windows.
2014-01-23 18:14:19 +01:00
int num_add = (totparts+totchild - pa_no);
CData->curve_vcol.reserve(CData->curve_vcol.size() + num_add);
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
BL::ParticleSystem::particles_iterator b_pa;
b_psys.particles.begin(b_pa);
for(; pa_no < totparts+totchild; pa_no++) {
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
/* Add vertex colors */
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
BL::Mesh::tessface_vertex_colors_iterator l;
b_mesh->tessface_vertex_colors.begin(l);
float3 vcol = make_float3(0.0f, 0.0f, 0.0f);
if(b_mesh->tessface_vertex_colors.length())
b_psys.mcol_on_emitter(psmd, *b_pa, pa_no, vcol_num, &vcol.x);
CData->curve_vcol.push_back(vcol);
if(pa_no < totparts && b_pa != b_psys.particles.end())
++b_pa;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
}
}
}
return true;
}
Fix particle child render resolution access not working outside of the render thread, and rename ToggleRender to set_resolution to follow RNA conventions.
2013-02-05 13:33:54 +00:00
static void set_resolution(Mesh *mesh, BL::Mesh *b_mesh, BL::Object *b_ob, BL::Scene *scene, bool render)
Cycles Hair: Addition of render settings and static BVH strand width scaling Addition of a RNA function to toggle between the hair settings and rebuild the cache. This enables the usage of the render step, child number and full display percentage with f12 rendering. A scaling to the strand radius has also been added for the static bvh. This only matches up with dynamic for uniform scaling. A very small fix is included for multiple uvs/vertex colours when using child particles.
2013-01-29 12:32:43 +00:00
{
BL::Object::modifiers_iterator b_mod;
for(b_ob->modifiers.begin(b_mod); b_mod != b_ob->modifiers.end(); ++b_mod) {
Fix for [#34654] Cycles hair particle system modifier obeys viewport visibility as well * Now Show Render and Show Viewport flags work independently and correct.
2013-03-16 08:49:39 +00:00
if ((b_mod->type() == b_mod->type_PARTICLE_SYSTEM) && ((b_mod->show_viewport()) || (b_mod->show_render()))) {
Cycles Hair: Addition of render settings and static BVH strand width scaling Addition of a RNA function to toggle between the hair settings and rebuild the cache. This enables the usage of the render step, child number and full display percentage with f12 rendering. A scaling to the strand radius has also been added for the static bvh. This only matches up with dynamic for uniform scaling. A very small fix is included for multiple uvs/vertex colours when using child particles.
2013-01-29 12:32:43 +00:00
BL::ParticleSystemModifier psmd((const PointerRNA)b_mod->ptr);
BL::ParticleSystem b_psys((const PointerRNA)psmd.particle_system().ptr);
Fix particle child render resolution access not working outside of the render thread, and rename ToggleRender to set_resolution to follow RNA conventions.
2013-02-05 13:33:54 +00:00
b_psys.set_resolution(*scene, *b_ob, (render)? 2: 1);
Cycles Hair: Addition of render settings and static BVH strand width scaling Addition of a RNA function to toggle between the hair settings and rebuild the cache. This enables the usage of the render step, child number and full display percentage with f12 rendering. A scaling to the strand radius has also been added for the static bvh. This only matches up with dynamic for uniform scaling. A very small fix is included for multiple uvs/vertex colours when using child particles.
2013-01-29 12:32:43 +00:00
}
}
}
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
void ExportCurveTrianglePlanes(Mesh *mesh, ParticleCurveData *CData, float3 RotCam)
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
{
int vertexno = mesh->verts.size();
int vertexindex = vertexno;
Fix T37302: cycles slow hair export with many hairs, especially on Windows.
2014-01-23 18:14:19 +01:00
int numverts = 0, numtris = 0;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Fix T37302: cycles slow hair export with many hairs, especially on Windows.
2014-01-23 18:14:19 +01:00
/* compute and reserve size of arrays */
for(int sys = 0; sys < CData->psys_firstcurve.size() ; sys++) {
for(int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f)
continue;
numverts += 2 + (CData->curve_keynum[curve] - 1)*2;
numtris += (CData->curve_keynum[curve] - 1)*2;
}
}
mesh->verts.reserve(mesh->verts.size() + numverts);
mesh->triangles.reserve(mesh->triangles.size() + numtris);
mesh->shader.reserve(mesh->shader.size() + numtris);
mesh->smooth.reserve(mesh->smooth.size() + numtris);
/* actually export */
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int sys = 0; sys < CData->psys_firstcurve.size() ; sys++) {
for(int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
Fix T37884: cycles hair rendering crash with UV coordinates. This was broken in a recent bugfix for zero length hairs.
2013-12-20 00:05:54 +01:00
if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f)
Fix T37704: cycles hair render error with hair density vertex group. Zero length hairs were causing problems, now it skips rendering them as they are invisible anyway.
2013-12-10 19:47:27 +01:00
continue;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
float3 xbasis;
float3 v1;
float time = 0.0f;
float3 ickey_loc = CData->curvekey_co[CData->curve_firstkey[curve]];
float radius = shaperadius(CData->psys_shape[sys], CData->psys_rootradius[sys], CData->psys_tipradius[sys], 0.0f);
v1 = CData->curvekey_co[CData->curve_firstkey[curve] + 1] - CData->curvekey_co[CData->curve_firstkey[curve]];
xbasis = normalize(cross(RotCam - ickey_loc,v1));
float3 ickey_loc_shfl = ickey_loc - radius * xbasis;
float3 ickey_loc_shfr = ickey_loc + radius * xbasis;
mesh->verts.push_back(ickey_loc_shfl);
mesh->verts.push_back(ickey_loc_shfr);
vertexindex += 2;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int curvekey = CData->curve_firstkey[curve] + 1; curvekey < CData->curve_firstkey[curve] + CData->curve_keynum[curve]; curvekey++) {
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
ickey_loc = CData->curvekey_co[curvekey];
if(curvekey == CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1)
v1 = CData->curvekey_co[curvekey] - CData->curvekey_co[max(curvekey - 1, CData->curve_firstkey[curve])];
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
else
v1 = CData->curvekey_co[curvekey + 1] - CData->curvekey_co[curvekey - 1];
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
time = CData->curvekey_time[curvekey]/CData->curve_length[curve];
radius = shaperadius(CData->psys_shape[sys], CData->psys_rootradius[sys], CData->psys_tipradius[sys], time);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Fix clang compile warning.
2013-08-23 14:08:39 +00:00
if(curvekey == CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1)
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
radius = shaperadius(CData->psys_shape[sys], CData->psys_rootradius[sys], CData->psys_tipradius[sys], 0.95f);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
if(CData->psys_closetip[sys] && (curvekey == CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1))
radius = shaperadius(CData->psys_shape[sys], CData->psys_rootradius[sys], 0.0f, 0.95f);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
xbasis = normalize(cross(RotCam - ickey_loc,v1));
float3 ickey_loc_shfl = ickey_loc - radius * xbasis;
float3 ickey_loc_shfr = ickey_loc + radius * xbasis;
mesh->verts.push_back(ickey_loc_shfl);
mesh->verts.push_back(ickey_loc_shfr);
mesh->add_triangle(vertexindex-2, vertexindex, vertexindex-1, CData->psys_shader[sys], true);
mesh->add_triangle(vertexindex+1, vertexindex-1, vertexindex, CData->psys_shader[sys], true);
vertexindex += 2;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
}
}
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
mesh->reserve(mesh->verts.size(), mesh->triangles.size(), 0, 0);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
mesh->attributes.remove(ATTR_STD_VERTEX_NORMAL);
mesh->attributes.remove(ATTR_STD_FACE_NORMAL);
mesh->add_face_normals();
mesh->add_vertex_normals();
Fix for normal scaling when using triangle primitives for hair. and some code clean ups in blender_curves and node_shader_hair_info.c
2013-01-01 19:50:29 +00:00
mesh->attributes.remove(ATTR_STD_FACE_NORMAL);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
/* texture coords still needed */
}
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
void ExportCurveTriangleGeometry(Mesh *mesh, ParticleCurveData *CData, int resolution)
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
{
int vertexno = mesh->verts.size();
int vertexindex = vertexno;
Fix T37302: cycles slow hair export with many hairs, especially on Windows.
2014-01-23 18:14:19 +01:00
int numverts = 0, numtris = 0;
/* compute and reserve size of arrays */
for(int sys = 0; sys < CData->psys_firstcurve.size() ; sys++) {
for(int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f)
continue;
numverts += (CData->curve_keynum[curve] - 2)*2*resolution + resolution;
numtris += (CData->curve_keynum[curve] - 2)*resolution;
}
}
mesh->verts.reserve(mesh->verts.size() + numverts);
mesh->triangles.reserve(mesh->triangles.size() + numtris);
mesh->shader.reserve(mesh->shader.size() + numtris);
mesh->smooth.reserve(mesh->smooth.size() + numtris);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Fix T37302: cycles slow hair export with many hairs, especially on Windows.
2014-01-23 18:14:19 +01:00
/* actually export */
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int sys = 0; sys < CData->psys_firstcurve.size() ; sys++) {
for(int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
Fix T37884: cycles hair rendering crash with UV coordinates. This was broken in a recent bugfix for zero length hairs.
2013-12-20 00:05:54 +01:00
if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f)
Fix T37704: cycles hair render error with hair density vertex group. Zero length hairs were causing problems, now it skips rendering them as they are invisible anyway.
2013-12-10 19:47:27 +01:00
continue;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
float3 firstxbasis = cross(make_float3(1.0f,0.0f,0.0f),CData->curvekey_co[CData->curve_firstkey[curve]+1] - CData->curvekey_co[CData->curve_firstkey[curve]]);
Cycles: Avoid unnecessary dot products in Mesh/Hair export code.
2014-02-12 03:27:18 +01:00
if(!is_zero(firstxbasis))
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
firstxbasis = normalize(firstxbasis);
else
firstxbasis = normalize(cross(make_float3(0.0f,1.0f,0.0f),CData->curvekey_co[CData->curve_firstkey[curve]+1] - CData->curvekey_co[CData->curve_firstkey[curve]]));
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int curvekey = CData->curve_firstkey[curve]; curvekey < CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1; curvekey++) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
float3 xbasis = firstxbasis;
float3 v1;
float3 v2;
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
if(curvekey == CData->curve_firstkey[curve]) {
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
v1 = CData->curvekey_co[min(curvekey+2,CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1)] - CData->curvekey_co[curvekey+1];
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
v2 = CData->curvekey_co[curvekey+1] - CData->curvekey_co[curvekey];
}
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
else if(curvekey == CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
v1 = CData->curvekey_co[curvekey] - CData->curvekey_co[curvekey-1];
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
v2 = CData->curvekey_co[curvekey-1] - CData->curvekey_co[max(curvekey-2,CData->curve_firstkey[curve])];
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
else {
v1 = CData->curvekey_co[curvekey+1] - CData->curvekey_co[curvekey];
v2 = CData->curvekey_co[curvekey] - CData->curvekey_co[curvekey-1];
}
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
xbasis = cross(v1, v2);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Cycles: * Revert r57203 (len() renaming) There seems to be a problem with nVidia OpenCL after this and I haven't figured out the real cause yet. Better to selectively enable native length() later, after figuring out what's wrong. This fixes [#35612].
2013-06-04 17:20:00 +00:00
if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
firstxbasis = normalize(xbasis);
break;
}
}
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int curvekey = CData->curve_firstkey[curve]; curvekey < CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1; curvekey++) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
int subv = 1;
float3 xbasis;
float3 ybasis;
float3 v1;
float3 v2;
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
if(curvekey == CData->curve_firstkey[curve]) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
subv = 0;
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
v1 = CData->curvekey_co[min(curvekey+2,CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1)] - CData->curvekey_co[curvekey+1];
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
v2 = CData->curvekey_co[curvekey+1] - CData->curvekey_co[curvekey];
}
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
else if(curvekey == CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
v1 = CData->curvekey_co[curvekey] - CData->curvekey_co[curvekey-1];
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
v2 = CData->curvekey_co[curvekey-1] - CData->curvekey_co[max(curvekey-2,CData->curve_firstkey[curve])];
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
else {
v1 = CData->curvekey_co[curvekey+1] - CData->curvekey_co[curvekey];
v2 = CData->curvekey_co[curvekey] - CData->curvekey_co[curvekey-1];
}
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
xbasis = cross(v1, v2);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Cycles: * Revert r57203 (len() renaming) There seems to be a problem with nVidia OpenCL after this and I haven't figured out the real cause yet. Better to selectively enable native length() later, after figuring out what's wrong. This fixes [#35612].
2013-06-04 17:20:00 +00:00
if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
xbasis = normalize(xbasis);
firstxbasis = xbasis;
}
else
xbasis = firstxbasis;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
ybasis = normalize(cross(xbasis, v2));
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
for (; subv <= 1; subv++) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
float3 ickey_loc = make_float3(0.0f,0.0f,0.0f);
float time = 0.0f;
Code cleanup / Cycles: Remove unused interpolation code for hair triangles, we only support cardinal curves.
2013-12-22 14:13:49 +01:00
InterpolateKeySegments(subv, 1, curvekey, curve, &ickey_loc, &time, CData);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
float radius = shaperadius(CData->psys_shape[sys], CData->psys_rootradius[sys], CData->psys_tipradius[sys], time);
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
if((curvekey == CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 2) && (subv == 1))
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
radius = shaperadius(CData->psys_shape[sys], CData->psys_rootradius[sys], CData->psys_tipradius[sys], 0.95f);
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
if(CData->psys_closetip[sys] && (subv == 1) && (curvekey == CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 2))
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
radius = shaperadius(CData->psys_shape[sys], CData->psys_rootradius[sys], 0.0f, 0.95f);
Cycles / Math: * Add M_2PI_F and M_4PI_F constants and use them inside the codebase.
2013-05-12 14:13:29 +00:00
float angle = M_2PI_F / (float)resolution;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int section = 0; section < resolution; section++) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
float3 ickey_loc_shf = ickey_loc + radius * (cosf(angle * section) * xbasis + sinf(angle * section) * ybasis);
mesh->verts.push_back(ickey_loc_shf);
}
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if(subv != 0) {
for(int section = 0; section < resolution - 1; section++) {
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
mesh->add_triangle(vertexindex - resolution + section, vertexindex + section, vertexindex - resolution + section + 1, CData->psys_shader[sys], true);
mesh->add_triangle(vertexindex + section + 1, vertexindex - resolution + section + 1, vertexindex + section, CData->psys_shader[sys], true);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
mesh->add_triangle(vertexindex-1, vertexindex + resolution - 1, vertexindex - resolution, CData->psys_shader[sys], true);
mesh->add_triangle(vertexindex, vertexindex - resolution , vertexindex + resolution - 1, CData->psys_shader[sys], true);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
vertexindex += resolution;
}
}
}
}
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
mesh->reserve(mesh->verts.size(), mesh->triangles.size(), 0, 0);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
mesh->attributes.remove(ATTR_STD_VERTEX_NORMAL);
mesh->attributes.remove(ATTR_STD_FACE_NORMAL);
mesh->add_face_normals();
mesh->add_vertex_normals();
Fix for normal scaling when using triangle primitives for hair. and some code clean ups in blender_curves and node_shader_hair_info.c
2013-01-01 19:50:29 +00:00
mesh->attributes.remove(ATTR_STD_FACE_NORMAL);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
/* texture coords still needed */
}
Fix compile of last commit
2013-08-18 15:09:51 +00:00
void ExportCurveSegments(Scene *scene, Mesh *mesh, ParticleCurveData *CData)
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
{
Cycles Hair: refactoring to store curves with the index of the first key and the number of keys in the curve, rather than curve segments with the indices of two keys. ShaderData.segment now stores the segment number in the curve.
2013-01-03 12:09:09 +00:00
int num_keys = 0;
int num_curves = 0;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Cycles Hair: refactoring to store curves with the index of the first key and the number of keys in the curve, rather than curve segments with the indices of two keys. ShaderData.segment now stores the segment number in the curve.
2013-01-03 12:09:09 +00:00
if(!(mesh->curves.empty() && mesh->curve_keys.empty()))
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
return;
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
Attribute *attr_intercept = NULL;
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.
2013-01-03 12:31:05 +00:00
if(mesh->need_attribute(scene, ATTR_STD_CURVE_INTERCEPT))
attr_intercept = mesh->curve_attributes.add(ATTR_STD_CURVE_INTERCEPT);
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
Fix T37302: cycles slow hair export with many hairs, especially on Windows.
2014-01-23 18:14:19 +01:00
/* compute and reserve size of arrays */
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int sys = 0; sys < CData->psys_firstcurve.size() ; sys++) {
Fix T37302: cycles slow hair export with many hairs, especially on Windows.
2014-01-23 18:14:19 +01:00
for(int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f)
continue;
num_keys += CData->curve_keynum[curve];
num_curves++;
}
}
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Fix T37302: cycles slow hair export with many hairs, especially on Windows.
2014-01-23 18:14:19 +01:00
mesh->curve_keys.reserve(mesh->curve_keys.size() + num_keys);
mesh->curves.reserve(mesh->curves.size() + num_curves);
num_keys = 0;
num_curves = 0;
/* actually export */
for(int sys = 0; sys < CData->psys_firstcurve.size() ; sys++) {
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
Fix T37704: cycles hair render error with hair density vertex group. Zero length hairs were causing problems, now it skips rendering them as they are invisible anyway.
2013-12-10 19:47:27 +01:00
if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f)
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
continue;
Cycles Hair: refactoring to store curves with the index of the first key and the number of keys in the curve, rather than curve segments with the indices of two keys. ShaderData.segment now stores the segment number in the curve.
2013-01-03 12:09:09 +00:00
size_t num_curve_keys = 0;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int curvekey = CData->curve_firstkey[curve]; curvekey < CData->curve_firstkey[curve] + CData->curve_keynum[curve]; curvekey++) {
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
float3 ickey_loc = CData->curvekey_co[curvekey];
float time = CData->curvekey_time[curvekey]/CData->curve_length[curve];
float radius = shaperadius(CData->psys_shape[sys], CData->psys_rootradius[sys], CData->psys_tipradius[sys], time);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
if(CData->psys_closetip[sys] && (curvekey == CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1))
Cycles code refactor: change curve key to float4 for easier storage as attribute.
2014-03-29 13:03:46 +01:00
radius = 0.0f;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
mesh->add_curve_key(ickey_loc, radius);
if(attr_intercept)
attr_intercept->add(time);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
num_curve_keys++;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
Cycles Hair: refactoring to store curves with the index of the first key and the number of keys in the curve, rather than curve segments with the indices of two keys. ShaderData.segment now stores the segment number in the curve.
2013-01-03 12:09:09 +00:00
mesh->add_curve(num_keys, num_curve_keys, CData->psys_shader[sys]);
num_keys += num_curve_keys;
num_curves++;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
}
/* check allocation*/
Cycles Hair: refactoring to store curves with the index of the first key and the number of keys in the curve, rather than curve segments with the indices of two keys. ShaderData.segment now stores the segment number in the curve.
2013-01-03 12:09:09 +00:00
if((mesh->curve_keys.size() != num_keys) || (mesh->curves.size() != num_curves)) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
/* allocation failed -> clear data */
mesh->curve_keys.clear();
Cycles Hair: refactoring to store curves with the index of the first key and the number of keys in the curve, rather than curve segments with the indices of two keys. ShaderData.segment now stores the segment number in the curve.
2013-01-03 12:09:09 +00:00
mesh->curves.clear();
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
mesh->curve_attributes.clear();
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
}
Cycles code refactor: improve vertex motion attribute storage and export. This now supports multiple steps and subframe sampling of motion. There is one difference for object and camera transform motion blur. It still only supports two steps there, but the transforms are now sampled at subframe times instead of the previous and next frame and then interpolated/extrapolated. This will give different render results in some cases but it's more accurate. Part of the code is from the summer of code project by Gavin Howard, but it has been significantly rewritten and extended.
2014-03-29 13:03:46 +01:00
static void ExportCurveSegmentsMotion(Scene *scene, Mesh *mesh, ParticleCurveData *CData, int time_index)
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
{
Cycles code refactor: improve vertex motion attribute storage and export. This now supports multiple steps and subframe sampling of motion. There is one difference for object and camera transform motion blur. It still only supports two steps there, but the transforms are now sampled at subframe times instead of the previous and next frame and then interpolated/extrapolated. This will give different render results in some cases but it's more accurate. Part of the code is from the summer of code project by Gavin Howard, but it has been significantly rewritten and extended.
2014-03-29 13:03:46 +01:00
/* find attribute */
Attribute *attr_mP = mesh->curve_attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
bool new_attribute = false;
/* add new attribute if it doesn't exist already */
if(!attr_mP) {
attr_mP = mesh->curve_attributes.add(ATTR_STD_MOTION_VERTEX_POSITION);
new_attribute = true;
}
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
/* export motion vectors for curve keys */
Cycles code refactor: improve vertex motion attribute storage and export. This now supports multiple steps and subframe sampling of motion. There is one difference for object and camera transform motion blur. It still only supports two steps there, but the transforms are now sampled at subframe times instead of the previous and next frame and then interpolated/extrapolated. This will give different render results in some cases but it's more accurate. Part of the code is from the summer of code project by Gavin Howard, but it has been significantly rewritten and extended.
2014-03-29 13:03:46 +01:00
size_t numkeys = mesh->curve_keys.size();
float4 *mP = attr_mP->data_float4() + time_index*numkeys;
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
bool have_motion = false;
Cycles code refactor: improve vertex motion attribute storage and export. This now supports multiple steps and subframe sampling of motion. There is one difference for object and camera transform motion blur. It still only supports two steps there, but the transforms are now sampled at subframe times instead of the previous and next frame and then interpolated/extrapolated. This will give different render results in some cases but it's more accurate. Part of the code is from the summer of code project by Gavin Howard, but it has been significantly rewritten and extended.
2014-03-29 13:03:46 +01:00
int i = 0;
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
for(int sys = 0; sys < CData->psys_firstcurve.size(); sys++) {
if(CData->psys_curvenum[sys] == 0)
continue;
for(int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys]; curve++) {
Fix T37704: cycles hair render error with hair density vertex group. Zero length hairs were causing problems, now it skips rendering them as they are invisible anyway.
2013-12-10 19:47:27 +01:00
if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f)
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
continue;
for(int curvekey = CData->curve_firstkey[curve]; curvekey < CData->curve_firstkey[curve] + CData->curve_keynum[curve]; curvekey++) {
if(i < mesh->curve_keys.size()) {
Cycles code refactor: change curve key to float4 for easier storage as attribute.
2014-03-29 13:03:46 +01:00
float3 ickey_loc = CData->curvekey_co[curvekey];
float time = CData->curvekey_time[curvekey]/CData->curve_length[curve];
float radius = shaperadius(CData->psys_shape[sys], CData->psys_rootradius[sys], CData->psys_tipradius[sys], time);
if(CData->psys_closetip[sys] && (curvekey == CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1))
radius = 0.0f;
Cycles code refactor: improve vertex motion attribute storage and export. This now supports multiple steps and subframe sampling of motion. There is one difference for object and camera transform motion blur. It still only supports two steps there, but the transforms are now sampled at subframe times instead of the previous and next frame and then interpolated/extrapolated. This will give different render results in some cases but it's more accurate. Part of the code is from the summer of code project by Gavin Howard, but it has been significantly rewritten and extended.
2014-03-29 13:03:46 +01:00
mP[i] = float3_to_float4(ickey_loc);
mP[i].w = radius;
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
/* unlike mesh coordinates, these tend to be slightly different
* between frames due to particle transforms into/out of object
* space, so we use an epsilon to detect actual changes */
Cycles code refactor: improve vertex motion attribute storage and export. This now supports multiple steps and subframe sampling of motion. There is one difference for object and camera transform motion blur. It still only supports two steps there, but the transforms are now sampled at subframe times instead of the previous and next frame and then interpolated/extrapolated. This will give different render results in some cases but it's more accurate. Part of the code is from the summer of code project by Gavin Howard, but it has been significantly rewritten and extended.
2014-03-29 13:03:46 +01:00
if(len_squared(mP[i] - mesh->curve_keys[i]) > 1e-5f*1e-5f)
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
have_motion = true;
}
i++;
}
}
}
Cycles code refactor: improve vertex motion attribute storage and export. This now supports multiple steps and subframe sampling of motion. There is one difference for object and camera transform motion blur. It still only supports two steps there, but the transforms are now sampled at subframe times instead of the previous and next frame and then interpolated/extrapolated. This will give different render results in some cases but it's more accurate. Part of the code is from the summer of code project by Gavin Howard, but it has been significantly rewritten and extended.
2014-03-29 13:03:46 +01:00
/* in case of new attribute, we verify if there really was any motion */
if(new_attribute) {
if(i != numkeys || !have_motion) {
/* no motion, remove attributes again */
mesh->curve_attributes.remove(ATTR_STD_MOTION_VERTEX_POSITION);
}
else if(time_index > 0) {
/* motion, fill up previous steps that we might have skipped because
* they had no motion, but we need them anyway now */
for(int step = 0; step < time_index; step++) {
float4 *mP = attr_mP->data_float4() + step*numkeys;
for(int key = 0; key < numkeys; key++)
mP[key] = mesh->curve_keys[key];
}
}
}
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
}
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
void ExportCurveTriangleUV(Mesh *mesh, ParticleCurveData *CData, int vert_offset, int resol, float3 *uvdata)
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
{
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
if(uvdata == NULL)
return;
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
float time = 0.0f;
float prevtime = 0.0f;
int vertexindex = vert_offset;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int sys = 0; sys < CData->psys_firstcurve.size() ; sys++) {
for(int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
Fix T37884: cycles hair rendering crash with UV coordinates. This was broken in a recent bugfix for zero length hairs.
2013-12-20 00:05:54 +01:00
if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f)
continue;
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int curvekey = CData->curve_firstkey[curve]; curvekey < CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1; curvekey++) {
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
time = CData->curvekey_time[curvekey]/CData->curve_length[curve];
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int section = 0; section < resol; section++) {
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
uvdata[vertexindex] = CData->curve_uv[curve];
uvdata[vertexindex].z = prevtime;
vertexindex++;
uvdata[vertexindex] = CData->curve_uv[curve];
uvdata[vertexindex].z = time;
vertexindex++;
uvdata[vertexindex] = CData->curve_uv[curve];
uvdata[vertexindex].z = prevtime;
vertexindex++;
uvdata[vertexindex] = CData->curve_uv[curve];
uvdata[vertexindex].z = time;
vertexindex++;
uvdata[vertexindex] = CData->curve_uv[curve];
uvdata[vertexindex].z = prevtime;
vertexindex++;
uvdata[vertexindex] = CData->curve_uv[curve];
uvdata[vertexindex].z = time;
vertexindex++;
}
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
prevtime = time;
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
}
}
}
}
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
void ExportCurveTriangleVcol(Mesh *mesh, ParticleCurveData *CData, int vert_offset, int resol, uchar4 *cdata)
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
{
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
if(cdata == NULL)
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
return;
int vertexindex = vert_offset;
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int sys = 0; sys < CData->psys_firstcurve.size() ; sys++) {
for(int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
Fix T37884: cycles hair rendering crash with UV coordinates. This was broken in a recent bugfix for zero length hairs.
2013-12-20 00:05:54 +01:00
if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f)
Fix T37704: cycles hair render error with hair density vertex group. Zero length hairs were causing problems, now it skips rendering them as they are invisible anyway.
2013-12-10 19:47:27 +01:00
continue;
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
for(int curvekey = CData->curve_firstkey[curve]; curvekey < CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1; curvekey++) {
for(int section = 0; section < resol; section++) {
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
cdata[vertexindex] = color_float_to_byte(color_srgb_to_scene_linear(CData->curve_vcol[curve]));
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
vertexindex++;
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
cdata[vertexindex] = color_float_to_byte(color_srgb_to_scene_linear(CData->curve_vcol[curve]));
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
vertexindex++;
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
cdata[vertexindex] = color_float_to_byte(color_srgb_to_scene_linear(CData->curve_vcol[curve]));
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
vertexindex++;
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
cdata[vertexindex] = color_float_to_byte(color_srgb_to_scene_linear(CData->curve_vcol[curve]));
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
vertexindex++;
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
cdata[vertexindex] = color_float_to_byte(color_srgb_to_scene_linear(CData->curve_vcol[curve]));
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
vertexindex++;
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
cdata[vertexindex] = color_float_to_byte(color_srgb_to_scene_linear(CData->curve_vcol[curve]));
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
vertexindex++;
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
}
}
}
}
}
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
/* Hair Curve Sync */
void BlenderSync::sync_curve_settings()
{
PointerRNA csscene = RNA_pointer_get(&b_scene.ptr, "cycles_curves");
CurveSystemManager *curve_system_manager = scene->curve_system_manager;
CurveSystemManager prev_curve_system_manager = *curve_system_manager;
curve_system_manager->use_curves = get_boolean(csscene, "use_curves");
Cycles Hair: Strand Minimum Pixel Size Code is added to restrict the pixel size of strands in cycles. It works best with ribbon primitives and a preset for these is included. It uses distance dependent expansion of the strands and then stochastic strand removal to give a fading. To prevent a slowdown for triangle mesh objects in the BVH an extra visibility flag has been added. It is also only applied for camera rays. The strand width settings are also changed, so that the particle size is not included in the width calculation. Instead there is a separate particle system parameter for width scaling.
2013-04-15 21:38:31 +00:00
curve_system_manager->minimum_width = get_float(csscene, "minimum_width");
curve_system_manager->maximum_width = get_float(csscene, "maximum_width");
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
curve_system_manager->primitive = get_enum(csscene, "primitive");
curve_system_manager->curve_shape = get_enum(csscene, "shape");
curve_system_manager->resolution = get_int(csscene, "resolution");
curve_system_manager->subdivisions = get_int(csscene, "subdivisions");
curve_system_manager->use_backfacing = !get_boolean(csscene, "cull_backfacing");
if(curve_system_manager->primitive == CURVE_TRIANGLES && curve_system_manager->curve_shape == CURVE_RIBBON) {
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
/* camera facing planes */
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
curve_system_manager->triangle_method = CURVE_CAMERA_TRIANGLES;
curve_system_manager->resolution = 1;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
Cycles / Hair: Some cleanup and optimizations for hair code. * Remove dead code from line segments BVH refine. CURVE_KN_TANGENTGNORMAL and CURVE_KN_TRUETANGENTGNORMAL are either both true, or both false. Therefore a true/false condition is impossible. This was a leftover of CURVE_CUSTOM, which was removed in r59234. * Use "else if" in blender_curves.cpp.
2013-12-26 02:02:14 +01:00
else if(curve_system_manager->primitive == CURVE_TRIANGLES && curve_system_manager->curve_shape == CURVE_THICK) {
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
/* camera facing planes */
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
curve_system_manager->triangle_method = CURVE_TESSELATED_TRIANGLES;
}
Cycles / Hair: Some cleanup and optimizations for hair code. * Remove dead code from line segments BVH refine. CURVE_KN_TANGENTGNORMAL and CURVE_KN_TRUETANGENTGNORMAL are either both true, or both false. Therefore a true/false condition is impossible. This was a leftover of CURVE_CUSTOM, which was removed in r59234. * Use "else if" in blender_curves.cpp.
2013-12-26 02:02:14 +01:00
else if(curve_system_manager->primitive == CURVE_LINE_SEGMENTS && curve_system_manager->curve_shape == CURVE_RIBBON) {
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
/* tangent shading */
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
curve_system_manager->line_method = CURVE_UNCORRECTED;
curve_system_manager->use_encasing = true;
curve_system_manager->use_backfacing = false;
curve_system_manager->use_tangent_normal_geometry = true;
}
Cycles / Hair: Some cleanup and optimizations for hair code. * Remove dead code from line segments BVH refine. CURVE_KN_TANGENTGNORMAL and CURVE_KN_TRUETANGENTGNORMAL are either both true, or both false. Therefore a true/false condition is impossible. This was a leftover of CURVE_CUSTOM, which was removed in r59234. * Use "else if" in blender_curves.cpp.
2013-12-26 02:02:14 +01:00
else if(curve_system_manager->primitive == CURVE_LINE_SEGMENTS && curve_system_manager->curve_shape == CURVE_THICK) {
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
curve_system_manager->line_method = CURVE_ACCURATE;
curve_system_manager->use_encasing = false;
curve_system_manager->use_tangent_normal_geometry = false;
}
Cycles / Hair: Some cleanup and optimizations for hair code. * Remove dead code from line segments BVH refine. CURVE_KN_TANGENTGNORMAL and CURVE_KN_TRUETANGENTGNORMAL are either both true, or both false. Therefore a true/false condition is impossible. This was a leftover of CURVE_CUSTOM, which was removed in r59234. * Use "else if" in blender_curves.cpp.
2013-12-26 02:02:14 +01:00
else if(curve_system_manager->primitive == CURVE_SEGMENTS && curve_system_manager->curve_shape == CURVE_RIBBON) {
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
curve_system_manager->primitive = CURVE_RIBBONS;
curve_system_manager->use_backfacing = false;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
Cleanup: Code and style cleanup for Cycles curve export code.
2013-12-21 00:20:16 +01:00
if(curve_system_manager->modified_mesh(prev_curve_system_manager)) {
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
BL::BlendData::objects_iterator b_ob;
for(b_data.objects.begin(b_ob); b_ob != b_data.objects.end(); ++b_ob) {
if(object_is_mesh(*b_ob)) {
BL::Object::particle_systems_iterator b_psys;
for(b_ob->particle_systems.begin(b_psys); b_psys != b_ob->particle_systems.end(); ++b_psys) {
if((b_psys->settings().render_type()==BL::ParticleSettings::render_type_PATH)&&(b_psys->settings().type()==BL::ParticleSettings::type_HAIR)) {
BL::ID key = BKE_object_is_modified(*b_ob)? *b_ob: b_ob->data();
mesh_map.set_recalc(key);
object_map.set_recalc(*b_ob);
}
}
}
}
}
if(curve_system_manager->modified(prev_curve_system_manager))
curve_system_manager->tag_update(scene);
}
Cycles code refactor: improve vertex motion attribute storage and export. This now supports multiple steps and subframe sampling of motion. There is one difference for object and camera transform motion blur. It still only supports two steps there, but the transforms are now sampled at subframe times instead of the previous and next frame and then interpolated/extrapolated. This will give different render results in some cases but it's more accurate. Part of the code is from the summer of code project by Gavin Howard, but it has been significantly rewritten and extended.
2014-03-29 13:03:46 +01:00
void BlenderSync::sync_curves(Mesh *mesh, BL::Mesh b_mesh, BL::Object b_ob, bool motion, int time_index)
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
{
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
if(!motion) {
/* Clear stored curve data */
mesh->curve_keys.clear();
mesh->curves.clear();
mesh->curve_attributes.clear();
}
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
/* obtain general settings */
bool use_curves = scene->curve_system_manager->use_curves;
Fix T38576: cycles hair not rendering in edit/paint modes.
2014-02-10 14:27:01 +01:00
if(!(use_curves && b_ob.mode() != b_ob.mode_PARTICLE_EDIT)) {
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
if(!motion)
mesh->compute_bounds();
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
return;
}
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
int primitive = scene->curve_system_manager->primitive;
int triangle_method = scene->curve_system_manager->triangle_method;
int resolution = scene->curve_system_manager->resolution;
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
size_t vert_num = mesh->verts.size();
size_t tri_num = mesh->triangles.size();
int used_res = 1;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
/* extract particle hair data - should be combined with connecting to mesh later*/
Cycles Hair: refactoring to support generic attributes for hair curves. There should be no functional changes yet. UV, tangent and intercept are now stored as attributes, with the intention to add more like multiple uv's, vertex colors, generated coordinates and motion vectors later. Things got a bit messy due to having both triangle and curve data in the same mesh data structure, which also gives us two sets of attributes. This will get cleaned up when we split the mesh class.
2013-01-03 12:08:54 +00:00
ParticleCurveData CData;
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Cycles Hair: Addition of render settings and static BVH strand width scaling Addition of a RNA function to toggle between the hair settings and rebuild the cache. This enables the usage of the render step, child number and full display percentage with f12 rendering. A scaling to the strand radius has also been added for the static bvh. This only matches up with dynamic for uniform scaling. A very small fix is included for multiple uvs/vertex colours when using child particles.
2013-01-29 12:32:43 +00:00
if(!preview)
Fix particle child render resolution access not working outside of the render thread, and rename ToggleRender to set_resolution to follow RNA conventions.
2013-02-05 13:33:54 +00:00
set_resolution(mesh, &b_mesh, &b_ob, &b_scene, true);
Cycles Hair: Addition of render settings and static BVH strand width scaling Addition of a RNA function to toggle between the hair settings and rebuild the cache. This enables the usage of the render step, child number and full display percentage with f12 rendering. A scaling to the strand radius has also been added for the static bvh. This only matches up with dynamic for uniform scaling. A very small fix is included for multiple uvs/vertex colours when using child particles.
2013-01-29 12:32:43 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
ObtainCacheParticleData(mesh, &b_mesh, &b_ob, &CData, !preview);
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
/* obtain camera parameters */
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
BL::Object b_CamOb = b_scene.camera();
float3 RotCam = make_float3(0.0f, 0.0f, 0.0f);
if(b_CamOb) {
Transform ctfm = get_transform(b_CamOb.matrix_world());
Transform tfm = get_transform(b_ob.matrix_world());
Transform itfm = transform_quick_inverse(tfm);
RotCam = transform_point(&itfm, make_float3(ctfm.x.w, ctfm.y.w, ctfm.z.w));
}
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
/* add hair geometry to mesh */
code cleanup: - add missing headers from cmake (own omission) - quiet rna_test.c unused define warnings. - minor style edits - spelling corrections and ignore all uppercase words with spell checking script.
2013-09-05 19:56:49 +00:00
if(primitive == CURVE_TRIANGLES) {
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
if(triangle_method == CURVE_CAMERA_TRIANGLES)
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
ExportCurveTrianglePlanes(mesh, &CData, RotCam);
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
else {
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
ExportCurveTriangleGeometry(mesh, &CData, resolution);
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
used_res = resolution;
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
}
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
else {
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
if(motion)
Cycles code refactor: improve vertex motion attribute storage and export. This now supports multiple steps and subframe sampling of motion. There is one difference for object and camera transform motion blur. It still only supports two steps there, but the transforms are now sampled at subframe times instead of the previous and next frame and then interpolated/extrapolated. This will give different render results in some cases but it's more accurate. Part of the code is from the summer of code project by Gavin Howard, but it has been significantly rewritten and extended.
2014-03-29 13:03:46 +01:00
ExportCurveSegmentsMotion(scene, mesh, &CData, time_index);
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
else
ExportCurveSegments(scene, mesh, &CData);
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
}
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.
2013-01-03 12:31:05 +00:00
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
/* generated coordinates from first key. we should ideally get this from
* blender to handle deforming objects */
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
if(!motion) {
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
if(mesh->need_attribute(scene, ATTR_STD_GENERATED)) {
float3 loc, size;
mesh_texture_space(b_mesh, loc, size);
if(primitive == CURVE_TRIANGLES) {
Attribute *attr_generated = mesh->attributes.add(ATTR_STD_GENERATED);
float3 *generated = attr_generated->data_float3();
for(size_t i = vert_num; i < mesh->verts.size(); i++)
generated[i] = mesh->verts[i]*size - loc;
}
else {
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
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) {
Cycles code refactor: change curve key to float4 for easier storage as attribute.
2014-03-29 13:03:46 +01:00
float3 co = float4_to_float3(mesh->curve_keys[curve.first_key]);
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
generated[i++] = co*size - loc;
}
}
}
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
}
/* create vertex color attributes */
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
if(!motion) {
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
BL::Mesh::tessface_vertex_colors_iterator l;
int vcol_num = 0;
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
for(b_mesh.tessface_vertex_colors.begin(l); l != b_mesh.tessface_vertex_colors.end(); ++l, vcol_num++) {
if(!mesh->need_attribute(scene, ustring(l->name().c_str())))
continue;
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.
2013-01-03 12:31:05 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
ObtainCacheParticleVcol(mesh, &b_mesh, &b_ob, &CData, !preview, vcol_num);
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
if(primitive == CURVE_TRIANGLES) {
Attribute *attr_vcol = mesh->attributes.add(
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
ustring(l->name().c_str()), TypeDesc::TypeColor, ATTR_ELEMENT_CORNER_BYTE);
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
uchar4 *cdata = attr_vcol->data_uchar4();
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
Cycles: Add support for uchar4 attributes. * Added support for uchar4 attributes to Cycles' attribute system. * This is used for Vertex Colors now, which saves some memory (4 unsigned characters, instead of 4 floats). * GPU Texture Limit on sm_20 and sm_21 decreased from 95 to 94, because we need a new texture for the uchar4 attributes. This is no problem for sm_30 or newer. Part of my GSoC 2014.
2014-06-13 23:40:39 +02:00
ExportCurveTriangleVcol(mesh, &CData, tri_num * 3, used_res, cdata);
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
}
else {
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
Attribute *attr_vcol = mesh->curve_attributes.add(
ustring(l->name().c_str()), TypeDesc::TypeColor, ATTR_ELEMENT_CURVE);
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
float3 *fdata = attr_vcol->data_float3();
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
if(fdata) {
Fix T37884: cycles hair rendering crash with UV coordinates. This was broken in a recent bugfix for zero length hairs.
2013-12-20 00:05:54 +01:00
size_t i = 0;
for(size_t curve = 0; curve < CData.curve_vcol.size(); curve++)
if(!(CData.curve_keynum[curve] <= 1 || CData.curve_length[curve] == 0.0f))
fdata[i++] = color_srgb_to_scene_linear(CData.curve_vcol[curve]);
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
}
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.
2013-01-03 12:31:05 +00:00
}
}
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
}
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
/* create UV attributes */
Fix cycles hair segments not giving correct vector speed pass, the motion vector export was not implemented yet for this primitive.
2013-10-18 15:03:18 +00:00
if(!motion) {
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
BL::Mesh::tessface_uv_textures_iterator l;
int uv_num = 0;
for(b_mesh.tessface_uv_textures.begin(l); l != b_mesh.tessface_uv_textures.end(); ++l, uv_num++) {
bool active_render = l->active_render();
AttributeStandard std = (active_render)? ATTR_STD_UV: ATTR_STD_NONE;
ustring name = ustring(l->name().c_str());
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
/* UV map */
if(mesh->need_attribute(scene, name) || mesh->need_attribute(scene, std)) {
Attribute *attr_uv;
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
ObtainCacheParticleUV(mesh, &b_mesh, &b_ob, &CData, !preview, uv_num);
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
if(primitive == CURVE_TRIANGLES) {
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
if(active_render)
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
attr_uv = mesh->attributes.add(std, name);
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
else
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
attr_uv = mesh->attributes.add(name, TypeDesc::TypePoint, ATTR_ELEMENT_CORNER);
float3 *uv = attr_uv->data_float3();
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
Updates for the Cycle Hair UI. With the following changes - Removed the cycles subdivision and interpolation of hairkeys. - Removed the parent settings. - Removed all of the advanced settings and presets. - This simplifies the UI to a few settings for the primitive type and a shape mode.
2013-08-18 13:41:53 +00:00
ExportCurveTriangleUV(mesh, &CData, tri_num * 3, used_res, uv);
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
}
else {
if(active_render)
attr_uv = mesh->curve_attributes.add(std, name);
else
attr_uv = mesh->curve_attributes.add(name, TypeDesc::TypePoint, ATTR_ELEMENT_CURVE);
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
float3 *uv = attr_uv->data_float3();
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
if(uv) {
Fix T37884: cycles hair rendering crash with UV coordinates. This was broken in a recent bugfix for zero length hairs.
2013-12-20 00:05:54 +01:00
size_t i = 0;
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
for(size_t curve = 0; curve < CData.curve_uv.size(); curve++)
Fix T37884: cycles hair rendering crash with UV coordinates. This was broken in a recent bugfix for zero length hairs.
2013-12-20 00:05:54 +01:00
if(!(CData.curve_keynum[curve] <= 1 || CData.curve_length[curve] == 0.0f))
uv[i++] = CData.curve_uv[curve];
Cycles Hair: Multiple vertex colours and UV coordinates Added export of multiple UV coordinates and vertex colour attributes. A debugging option to export the strands without using the cache has also been removed.
2013-01-23 17:15:45 +00:00
}
Cycles Hair: Fixed hair shape and inclusion of multiple attributes for triangle primitives When using triangle primitives this fix enables 'closed tip'. UVs and vertex colours are added when using triangle primitives for hair. Two new preset modes have also been included to allow easy access to curves and triangle planes.
2013-02-02 01:49:57 +00:00
}
Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair. I have also included a small speedup for the intersection test.
2013-01-04 12:44:38 +00:00
}
}
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
}
Cycles Hair: Addition of render settings and static BVH strand width scaling Addition of a RNA function to toggle between the hair settings and rebuild the cache. This enables the usage of the render step, child number and full display percentage with f12 rendering. A scaling to the strand radius has also been added for the static bvh. This only matches up with dynamic for uniform scaling. A very small fix is included for multiple uvs/vertex colours when using child particles.
2013-01-29 12:32:43 +00:00
if(!preview)
Fix particle child render resolution access not working outside of the render thread, and rename ToggleRender to set_resolution to follow RNA conventions.
2013-02-05 13:33:54 +00:00
set_resolution(mesh, &b_mesh, &b_ob, &b_scene, false);
Cycles Hair: Addition of render settings and static BVH strand width scaling Addition of a RNA function to toggle between the hair settings and rebuild the cache. This enables the usage of the render step, child number and full display percentage with f12 rendering. A scaling to the strand radius has also been added for the static bvh. This only matches up with dynamic for uniform scaling. A very small fix is included for multiple uvs/vertex colours when using child particles.
2013-01-29 12:32:43 +00:00
New feature Patch [#33445] - Experimental Cycles Hair Rendering (CPU only) This patch allows hair data to be exported to cycles and introduces a new line segment primitive to render with. The UI appears under the particle tab and there is a new hair info node available. It is only available under the experimental feature set and for cpu rendering.
2012-12-28 14:21:30 +00:00
mesh->compute_bounds();
}
CCL_NAMESPACE_END
Reference in New Issue Copy Permalink