← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to intern/cycles/kernel/svm/svm_types.h

  • Committer: Reinhard Tartler
  • Date: 2014-05-31 01:50:05 UTC
  • mfrom: (14.2.27 sid)
  • Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/cycles/kernel/svm/svm_types.h
107
107
 
108
108
typedef enum NodeAttributeType {
109
109
        NODE_ATTR_FLOAT = 0,
110
 
        NODE_ATTR_FLOAT3
 
110
        NODE_ATTR_FLOAT3,
 
111
        NODE_ATTR_MATRIX
111
112
} NodeAttributeType;
112
113
 
113
114
typedef enum NodeGeometry {
154
155
        NODE_LP_singular,
155
156
        NODE_LP_reflection,
156
157
        NODE_LP_transmission,
 
158
        NODE_LP_volume_scatter,
157
159
        NODE_LP_backfacing,
158
160
        NODE_LP_ray_length,
159
161
        NODE_LP_ray_depth
172
174
        NODE_TEXCO_WINDOW,
173
175
        NODE_TEXCO_REFLECTION,
174
176
        NODE_TEXCO_DUPLI_GENERATED,
175
 
        NODE_TEXCO_DUPLI_UV
 
177
        NODE_TEXCO_DUPLI_UV,
 
178
        NODE_TEXCO_VOLUME_GENERATED
176
179
} NodeTexCoord;
177
180
 
178
181
typedef enum NodeMix {
339
342
 
340
343
typedef enum ClosureType {
341
344
        CLOSURE_BSDF_ID,
342
 
        
 
345
 
343
346
        /* Diffuse */
344
347
        CLOSURE_BSDF_DIFFUSE_ID,
345
348
        CLOSURE_BSDF_OREN_NAYAR_ID,
346
349
        CLOSURE_BSDF_WESTIN_SHEEN_ID,
347
350
        CLOSURE_BSDF_DIFFUSE_RAMP_ID,
348
351
        CLOSURE_BSDF_DIFFUSE_TOON_ID,
349
 
        
 
352
 
350
353
        /* Glossy */
351
354
        CLOSURE_BSDF_GLOSSY_ID,
352
355
        CLOSURE_BSDF_REFLECTION_ID,
359
362
        CLOSURE_BSDF_GLOSSY_TOON_ID,
360
363
        CLOSURE_BSDF_HAIR_REFLECTION_ID,
361
364
 
362
 
        
363
365
        /* Transmission */
364
366
        CLOSURE_BSDF_TRANSMISSION_ID,
365
367
        CLOSURE_BSDF_TRANSLUCENT_ID,
371
373
        CLOSURE_BSDF_SHARP_GLASS_ID,
372
374
        CLOSURE_BSDF_HAIR_TRANSMISSION_ID,
373
375
 
374
 
        
375
376
        /* Special cases */
376
377
        CLOSURE_BSDF_BSSRDF_ID,
377
378
        CLOSURE_BSDF_TRANSPARENT_ID,
378
379
 
379
380
        /* BSSRDF */
380
 
        CLOSURE_BSSRDF_COMPATIBLE_ID,
381
381
        CLOSURE_BSSRDF_CUBIC_ID,
382
382
        CLOSURE_BSSRDF_GAUSSIAN_ID,
383
383
 
384
384
        /* Other */
385
385
        CLOSURE_EMISSION_ID,
386
 
        CLOSURE_DEBUG_ID,
387
386
        CLOSURE_BACKGROUND_ID,
388
387
        CLOSURE_HOLDOUT_ID,
389
388
        CLOSURE_AMBIENT_OCCLUSION_ID,
390
389
 
391
390
        /* Volume */
392
391
        CLOSURE_VOLUME_ID,
393
 
        CLOSURE_VOLUME_TRANSPARENT_ID,
394
 
        CLOSURE_VOLUME_ISOTROPIC_ID,
 
392
        CLOSURE_VOLUME_ABSORPTION_ID,
 
393
        CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID,
395
394
 
396
395
        NBUILTIN_CLOSURES
397
396
} ClosureType;
402
401
#define CLOSURE_IS_BSDF_GLOSSY(type) (type >= CLOSURE_BSDF_GLOSSY_ID && type <= CLOSURE_BSDF_HAIR_REFLECTION_ID)
403
402
#define CLOSURE_IS_BSDF_TRANSMISSION(type) (type >= CLOSURE_BSDF_TRANSMISSION_ID && type <= CLOSURE_BSDF_HAIR_TRANSMISSION_ID)
404
403
#define CLOSURE_IS_BSDF_BSSRDF(type) (type == CLOSURE_BSDF_BSSRDF_ID)
405
 
#define CLOSURE_IS_BSSRDF(type) (type >= CLOSURE_BSSRDF_COMPATIBLE_ID && type <= CLOSURE_BSSRDF_GAUSSIAN_ID)
406
 
#define CLOSURE_IS_VOLUME(type) (type >= CLOSURE_VOLUME_ID && type <= CLOSURE_VOLUME_ISOTROPIC_ID)
 
404
#define CLOSURE_IS_BSSRDF(type) (type >= CLOSURE_BSSRDF_CUBIC_ID && type <= CLOSURE_BSSRDF_GAUSSIAN_ID)
 
405
#define CLOSURE_IS_VOLUME(type) (type >= CLOSURE_VOLUME_ID && type <= CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID)
407
406
#define CLOSURE_IS_EMISSION(type) (type == CLOSURE_EMISSION_ID)
408
407
#define CLOSURE_IS_HOLDOUT(type) (type == CLOSURE_HOLDOUT_ID)
409
408
#define CLOSURE_IS_BACKGROUND(type) (type == CLOSURE_BACKGROUND_ID)
410
409
#define CLOSURE_IS_AMBIENT_OCCLUSION(type) (type == CLOSURE_AMBIENT_OCCLUSION_ID)
 
410
#define CLOSURE_IS_PHASE(type) (type == CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID)
 
411
 
 
412
#define CLOSURE_WEIGHT_CUTOFF 1e-5f
411
413
 
412
414
CCL_NAMESPACE_END
413
415