|
Adds a new "Particle Info" node for cycles, to allow using particle data in shaders. For now only Age and total Lifetime are supported, but can be extended easily as required.
Test render:
http://www.youtube.com/watch?v=QvATUlmguyk
The particles from all object psys are first converted into an array in the Cycles object. Then the data is stored in a separate particles texture on the device.
For mapping dupli objects back onto particles they store an additional particle_id number. This number is then used to look up the particle data from the particle device texture.
Total comments: 13
Total comments: 2
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+461 lines, -50 lines) |
Patch |
 |
|
intern/cycles/blender/CMakeLists.txt
|
View
|
1
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/blender/blender_object.cpp
|
View
|
1
|
3 chunks |
+23 lines, -20 lines |
0 comments
|
Download
|
 |
|
intern/cycles/blender/blender_particles.cpp
|
View
|
1
|
1 chunk |
+158 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/blender/blender_shader.cpp
|
View
|
1
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/blender/blender_sync.h
|
View
|
1
|
1 chunk |
+4 lines, -1 line |
0 comments
|
Download
|
 |
|
intern/cycles/kernel/kernel_object.h
|
View
|
1
|
1 chunk |
+25 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/kernel/kernel_textures.h
|
View
|
1
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/kernel/kernel_types.h
|
View
|
1
|
2 chunks |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/kernel/svm/svm.h
|
View
|
1
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/kernel/svm/svm_geometry.h
|
View
|
1
|
1 chunk |
+22 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/kernel/svm/svm_types.h
|
View
|
1
|
2 chunks |
+7 lines, -1 line |
0 comments
|
Download
|
 |
|
intern/cycles/render/nodes.h
|
View
|
1
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/render/nodes.cpp
|
View
|
1
|
1 chunk |
+41 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/render/object.h
|
View
|
1
|
3 chunks |
+9 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/cycles/render/object.cpp
|
View
|
1
|
7 chunks |
+44 lines, -1 line |
2 comments
|
Download
|
 |
|
intern/cycles/render/scene.h
|
View
|
1
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
|
source/blender/blenkernel/BKE_node.h
|
View
|
1
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
|
source/blender/blenkernel/intern/anim.c
|
View
|
1
|
24 chunks |
+34 lines, -27 lines |
0 comments
|
Download
|
 |
|
source/blender/blenkernel/intern/node.c
|
View
|
1
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
|
source/blender/makesdna/DNA_object_types.h
|
View
|
1
|
1 chunk |
+9 lines, -0 lines |
0 comments
|
Download
|
 |
|
source/blender/makesrna/intern/rna_nodetree_types.h
|
View
|
1
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
|
source/blender/makesrna/intern/rna_object.c
|
View
|
1
|
1 chunk |
+10 lines, -0 lines |
0 comments
|
Download
|
 |
|
source/blender/nodes/CMakeLists.txt
|
View
|
1
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
|
source/blender/nodes/NOD_shader.h
|
View
|
1
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
|
source/blender/nodes/shader/nodes/node_shader_particle_info.c
|
View
|
1
|
1 chunk |
+48 lines, -0 lines |
0 comments
|
Download
|
Total messages: 7
|