Added a bunch of additional particle state attributes to the Cycles particle info node:

* Location: Basically the same as the location from Object Info node for object instances on particles, but in principle there could be additional offsets for dupli objects, so included for completeness.
* Size: Single float scale of the particle. Also directly translates to object scale for current dupli objects, but handy to have as a single float to start with instead of a scale vector (currently not even exposed in Object Info).
* Rotation: This is a quaternion, which are not yet supported by Cycles nodes. The float4 is copied to internal Cycles data and stored in the particles texture data, but the node doesn't have a socket for it yet and the data is not yet written to the stack. Code is just commented out so could be enabled quickly if/when rotation support is added to cycles.
* Velocity: Linear velocity vector of particles.
* Angular Velocity: Angular velocity around principle axes.

The texture data is currently packed tightly into the particles texture, which saves a few bytes, but requires an additional texture lookup for some vector attributes which spread over two float4s. Could also add another float4 to particle size to avoid this.

4 files changed, 77 insertions, 13 deletions

diff --git a/intern/cycles/kernel/kernel_object.h b/intern/cycles/kernel/kernel_object.h
index 4ff315ca265..222ade504cc 100644
--- a/intern/cycles/kernel/kernel_object.h
+++ b/intern/cycles/kernel/kernel_object.h
@@ -172,24 +172,61 @@ __device int shader_pass_id(KernelGlobals *kg, ShaderData *sd)
 __device_inline float particle_index(KernelGlobals *kg, int particle)
 {
 	int offset = particle*PARTICLE_SIZE;
-	float4 f = kernel_tex_fetch(__particles, offset);
+	float4 f = kernel_tex_fetch(__particles, offset + 0);
 	return f.x;
 }
 
 __device float particle_age(KernelGlobals *kg, int particle)
 {
 	int offset = particle*PARTICLE_SIZE;
-	float4 f = kernel_tex_fetch(__particles, offset);
+	float4 f = kernel_tex_fetch(__particles, offset + 0);
 	return f.y;
 }
 
 __device float particle_lifetime(KernelGlobals *kg, int particle)
 {
 	int offset = particle*PARTICLE_SIZE;
-	float4 f = kernel_tex_fetch(__particles, offset);
+	float4 f = kernel_tex_fetch(__particles, offset + 0);
 	return f.z;
 }
 
+__device float particle_size(KernelGlobals *kg, int particle)
+{
+	int offset = particle*PARTICLE_SIZE;
+	float4 f = kernel_tex_fetch(__particles, offset + 0);
+	return f.w;
+}
+
+__device float4 particle_rotation(KernelGlobals *kg, int particle)
+{
+	int offset = particle*PARTICLE_SIZE;
+	float4 f = kernel_tex_fetch(__particles, offset + 1);
+	return f;
+}
+
+__device float3 particle_location(KernelGlobals *kg, int particle)
+{
+	int offset = particle*PARTICLE_SIZE;
+	float4 f = kernel_tex_fetch(__particles, offset + 2);
+	return make_float3(f.x, f.y, f.z);
+}
+
+__device float3 particle_velocity(KernelGlobals *kg, int particle)
+{
+	int offset = particle*PARTICLE_SIZE;
+	float4 f2 = kernel_tex_fetch(__particles, offset + 2);
+	float4 f3 = kernel_tex_fetch(__particles, offset + 3);
+	return make_float3(f2.w, f3.x, f3.y);
+}
+
+__device float3 particle_angular_velocity(KernelGlobals *kg, int particle)
+{
+	int offset = particle*PARTICLE_SIZE;
+	float4 f3 = kernel_tex_fetch(__particles, offset + 3);
+	float4 f4 = kernel_tex_fetch(__particles, offset + 4);
+	return make_float3(f3.z, f3.w, f4.x);
+}
+
 
 CCL_NAMESPACE_END
 
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 30d45ad1118..488c6de3a42 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -33,7 +33,7 @@ CCL_NAMESPACE_BEGIN
 #define LIGHT_SIZE			4
 #define FILTER_TABLE_SIZE	256
 #define RAMP_TABLE_SIZE		256
-#define PARTICLE_SIZE 		1
+#define PARTICLE_SIZE 		5
 #define TIME_INVALID		FLT_MAX
 
 /* device capabilities */
diff --git a/intern/cycles/kernel/svm/svm_geometry.h b/intern/cycles/kernel/svm/svm_geometry.h
index 3cfce1d087a..22741bdb067 100644
--- a/intern/cycles/kernel/svm/svm_geometry.h
+++ b/intern/cycles/kernel/svm/svm_geometry.h
@@ -98,25 +98,47 @@ __device void svm_node_object_info(KernelGlobals *kg, ShaderData *sd, float *sta
 
 __device void svm_node_particle_info(KernelGlobals *kg, ShaderData *sd, float *stack, uint type, uint out_offset)
 {
-	float data;
-
 	switch(type) {
 		case NODE_INFO_PAR_INDEX: {
 			uint particle_id = object_particle_id(kg, sd->object);
-			data = particle_index(kg, particle_id);
-			stack_store_float(stack, out_offset, data);
+			stack_store_float(stack, out_offset, particle_index(kg, particle_id));
 			break;
 		}
 		case NODE_INFO_PAR_AGE: {
 			uint particle_id = object_particle_id(kg, sd->object);
-			data = particle_age(kg, particle_id);
-			stack_store_float(stack, out_offset, data);
+			stack_store_float(stack, out_offset, particle_age(kg, particle_id));
 			break;
 		}
 		case NODE_INFO_PAR_LIFETIME: {
 			uint particle_id = object_particle_id(kg, sd->object);
-			data = particle_lifetime(kg, particle_id);
-			stack_store_float(stack, out_offset, data);
+			stack_store_float(stack, out_offset, particle_lifetime(kg, particle_id));
+			break;
+		}
+		case NODE_INFO_PAR_LOCATION: {
+			uint particle_id = object_particle_id(kg, sd->object);
+			stack_store_float3(stack, out_offset, particle_location(kg, particle_id));
+			break;
+		}
+		#if 0	/* XXX float4 currently not supported in SVM stack */
+		case NODE_INFO_PAR_ROTATION: {
+			uint particle_id = object_particle_id(kg, sd->object);
+			stack_store_float4(stack, out_offset, particle_rotation(kg, particle_id));
+			break;
+		}
+		#endif
+		case NODE_INFO_PAR_SIZE: {
+			uint particle_id = object_particle_id(kg, sd->object);
+			stack_store_float(stack, out_offset, particle_size(kg, particle_id));
+			break;
+		}
+		case NODE_INFO_PAR_VELOCITY: {
+			uint particle_id = object_particle_id(kg, sd->object);
+			stack_store_float3(stack, out_offset, particle_velocity(kg, particle_id));
+			break;
+		}
+		case NODE_INFO_PAR_ANGULAR_VELOCITY: {
+			uint particle_id = object_particle_id(kg, sd->object);
+			stack_store_float3(stack, out_offset, particle_angular_velocity(kg, particle_id));
 			break;
 		}
 	}
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index 38232eb9c04..16c726e7faa 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -116,7 +116,12 @@ typedef enum NodeObjectInfo {
 typedef enum NodeParticleInfo {
 	NODE_INFO_PAR_INDEX,
 	NODE_INFO_PAR_AGE,
-	NODE_INFO_PAR_LIFETIME
+	NODE_INFO_PAR_LIFETIME,
+	NODE_INFO_PAR_LOCATION,
+	NODE_INFO_PAR_ROTATION,
+	NODE_INFO_PAR_SIZE,
+	NODE_INFO_PAR_VELOCITY,
+	NODE_INFO_PAR_ANGULAR_VELOCITY
 } NodeParticleInfo;
 
 typedef enum NodeLightPath {