archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
40,320 Commits 660 Branches 0 Tags
8dc3d4e3fdb4e33e52699d615af4a3a65a92c776
Commit Graph

183 Commits

Author SHA1 Message Date
Lukas Toenne fec872ef9c Added a particle index output to the Particle Info Cycles node. This is required to get consistent ID numbers for particles. The Object ID is not usable since it's a user defined value of the instanced object, which does not vary per instance. Also the random value from the object info node is not consistent over time, since it only depends on the index in the dupli list (so each emitted or dying particle shifts the value). 
The particle index is always the same for a specific particle. Randomized values can be generated from this with the use of a noise texture.
 2012-07-26 11:40:58 +00:00
Campbell Barton 5412389af6 fix for cycles bug in localview: see r48269, bits used for localview gave collisions with PathRayFlag's 2012-07-23 14:48:19 +00:00
Campbell Barton 32cf7fcdb1 code cleanup: spelling 2012-07-16 23:23:33 +00:00
Campbell Barton 158a70c8a3 the mutex struct seems to be different across systems, use memset rather then an initializer value. 
also quiet warning in cycles.
 2012-06-25 11:19:38 +00:00
Brecht Van Lommel 6a8fceb8b8 Fix cycles non-progressive integrator not delivering correct AO pass. 2012-06-15 10:15:10 +00:00
Brecht Van Lommel 4940482e59 Fix issue with missing emission in non-progressive integrator. 2012-06-13 17:34:47 +00:00
Brecht Van Lommel 4ba456d175 Cycles: first step for implementation of non-progressive sampler that handles 
direct and indirect lighting differently. Rather than picking one light for each
point on the path, it now loops over all lights for direct lighting. For indirect
lighting it still picks a random light each time.

It gives control over the number of AA samples, and the number of Diffuse, Glossy,
Transmission, AO, Mesh Light, Background and Lamp samples for each AA sample.

This helps tuning render performance/noise and tends to give less noise for renders
dominated by direct lighting.

This sampling mode only works on the CPU, and still needs proper tile rendering
to show progress (will follow tommorrow or so), because each AA sample can be quite
slow now and so the delay between each update wil be too long.
 2012-06-13 11:44:48 +00:00
Campbell Barton 2c1abe1f58 style cleanup: assignment & indentation. 2012-06-09 18:56:12 +00:00
Campbell Barton 43361487ba code cleanup: quiet all warnings about double promotion (either by changing the type or explicitly casting). 2012-06-09 17:45:22 +00:00
Campbell Barton 0fbb6bff27 style cleanup: block comments 2012-06-09 17:22:52 +00:00
Thomas Dinges 7c87f646c2 Cycles / Textures: 
* Some code cleanup, removed old enums, which are not used anymore. 
* Some renaming for consistency and to match new texture names.
 2012-06-08 19:57:25 +00:00
Thomas Dinges 3d740121ed Cycles / Code Cleanup: 
* Removed a workaround for the NodeType enum, uses consecutive values now. 

I could not find issues with CUDA, when compiling with Toolkit 4.2 (all sm kernels) and regression files rendered fine on my GPU with sm_21.
 2012-06-08 19:21:12 +00:00
Lukas Toenne 5e1bbde01d Particle Info node for Cycles. This can be used to access particle information in material shaders for dupli objects. For now only the particle Age and individual Lifetime (in frames) are supported, more attributes can be added when needed. 
The particle data is stored in a separate texture if any of the dupli objects uses particle info nodes in shaders. To map dupli objects onto particles the store an additional particle_index value, which is different from the simple dupli object index (only visible particles, also works for particle dupli groups mode).

Some simple use cases on the code.blender.org blog:
http://code.blender.org/index.php/2012/05/particle-info-node/
 2012-06-08 16:17:57 +00:00
Brecht Van Lommel 5ebc88266e Cycles: small code fix for disabled code. 2012-06-06 23:27:38 +00:00
Thomas Dinges 46945d805f Revert my own commit r47544, this does not seem to be the correct fix. :/ 2012-06-06 23:01:42 +00:00
Thomas Dinges 379c4ae4d8 Cycles / OSL: 
* Missing header kernel_passes.h, needed for "direction_to_panorama" in kernel_triangle.h
 2012-06-06 22:36:07 +00:00
Thomas Dinges 47c96b6e40 Cycles / OSL: 
* Fixes for some silly typos in the checker shader.
* Added missing GPL licence block to node_fresnel.h.
 2012-06-06 16:00:21 +00:00
Thomas Dinges da38a0348a Cycles / OSL: 
* Fixes for r46114, object_fetch_transform missed time argument.
* Syntax fixes for Checker texture.
 2012-06-05 15:40:02 +00:00
Thomas Dinges 2221b994bc Cycles / OSL: 
* Remove oslexec_pvt.h header and some typo fixes. 
* This file needs deeper updates for changes done in OSL 0.6.0, see
https://github.com/imageworks/OpenShadingLanguage/commit/11ce51418b45e975ace4d919a4bdd8c2001ba300
 2012-06-05 09:29:47 +00:00
Campbell Barton 2d290040a1 style cleanup 2012-06-04 22:44:58 +00:00
Thomas Dinges 0d3b19e734 Cycles / OSL: 
* Fixes for changes in the OSL register_closure() API.
 2012-06-04 20:50:59 +00:00
Thomas Dinges 510f98576a Cycles / OSL: 
* Compile fixes, missing ShaderClosure argument for eval functions. (r40163)
 2012-06-04 19:53:50 +00:00
Brecht Van Lommel d9589bf0dd Cycles: fix spot lamp emitting light in two directions. 2012-06-04 19:38:10 +00:00
Thomas Dinges ca7197b620 Cycles / OSL: 
* __OSL__ is now defined for CPU when building with OSL.

* First batch of compile fixes, remove some unneeded std namespace declarations and added missing includes.
 2012-06-04 19:00:13 +00:00
Brecht Van Lommel 6548f7efef Cycles: spot lamp support. 2012-06-04 17:17:10 +00:00
Thomas Dinges f9856c1c2d Cycles / OSL: 
* Update the Oren Nayar shader to incorporate updates / fixes from r41968 and r44330.
 2012-06-03 18:04:52 +00:00
Thomas Dinges 345a8d8170 Cycles / OSL Textures: 
* Ported my checker texture to OSL. :)
 2012-06-03 00:02:24 +00:00
Thomas Dinges a4f3475846 Cycles / OSL Textures: 
* More fixes, replaced all remaining size variables with scale ones.
* Remove nonzero check in OSL textures, not needed anymore, was there to prevent division by zero for the size variable.
 2012-06-02 22:57:26 +00:00
Thomas Dinges 014105f35d Cycles / OSL: 
* More fixes for r41599, removed clouds and distorted noise textures and ported the Noise texture to OSL. 
ToDo: Color output is still commented, needs a closer look. 

* Some more fixes (comments, uninitialized variables)
 2012-06-02 21:34:25 +00:00
Thomas Dinges d6128ae3c6 Cycles / OSL: 
* Forgot to rename Gradient OSL file.
 2012-06-02 19:25:12 +00:00
Thomas Dinges a5b2d2a2be Cycles / OSL: 
* More OSL fixes for r41599, removed marble and wood texture and ported Wave Texture to OSL.
 2012-06-02 19:14:14 +00:00
Thomas Dinges cf929c7796 Cycles / Wave Texture: 
* Found an issue in the shader code, it used the x coordinate twice.
 2012-06-02 17:44:28 +00:00
Thomas Dinges d61e6e15e4 Cycles / OSL Fixes: 
* OSL textures were never updated after the refactor in november 2011.
 
* Remove stucci texture and renamed blend to gradient.
 2012-06-02 17:10:59 +00:00
Thomas Dinges 2b5eed9689 Cycles: 
* Added missing GPL licence block to kernel_textures.h
 2012-05-31 20:26:36 +00:00
Thomas Dinges a7c68afc72 Cycles / CUDA: 
* Remove double declaration of cosf.
 2012-05-28 23:51:06 +00:00
Thomas Dinges d3c6c6babd Cycles / CUDA: 
* Remove -use_fast_math flag from scons as well.
 2012-05-28 19:49:26 +00:00
Brecht Van Lommel 131de4352b Cycles: fixes to make CUDA 4.2 work, compiling gave errors in shadows and 
other places, was mainly due to instancing not working, but also found
issues in procedural textures.

The problem was with --use_fast_math, this seems to now have way lower
precision for some operations. Disabled this flag and selectively use
fast math functions. Did not find performance regression on GTX 460 after
doing this.
 2012-05-28 19:21:13 +00:00
Campbell Barton 857dedbc58 style cleanup 2012-05-27 00:36:50 +00:00
Brecht Van Lommel c3e1fce775 Cycles: add Object Info node, with outputs object location, object/material 
pass index, and a random number unique to the instance of the object.

This can be useful to give some variation to a single material assigned to
multiple instances, either manually controlled through the object index, based
on the object location, or randomized for each instance. 

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Object_Info
 2012-05-21 12:52:28 +00:00
Brecht Van Lommel 3e83fd441d Fix #31486: cycles texture coordinate reflection output has wrong direction. 2012-05-18 12:49:22 +00:00
Bastien Montagne 2e89e0096a Spell check fix (lenght -> length) 
Note: two remains, in comments in extern/bullet2/src/LinearMath/btVector3.h and extern/libmv/libmv/image/tuple.h.
 2012-05-16 14:25:25 +00:00
Brecht Van Lommel dd9c1b7fbf Cycles: OpenCL image texture support, fix an attribute node issue and refactor 
feature enabling #defines a bit.
 2012-05-13 12:32:44 +00:00
Brecht Van Lommel c8cbe63947 Cycles: fix issues with texture coordinates and object scale. Auto texture 
space size and location were outdated often, and already computed on demand
by blender internal, now do that through RNA as well.
 2012-05-08 23:39:31 +00:00
Dalai Felinto 5797edfcf2 adding kernel_projection.h in CMakelists 2012-05-07 20:37:48 +00:00
Brecht Van Lommel e6a84eb1b5 Cycles: add light falloff node, with quadratic/linear/constant falloff and a 
smoothing factor to reduce high values near the light.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Light_Falloff

Note that this was already possible to do manually with the Ray Length, but
this adds a convenient node for it. This commit also makes the mapping node
min/max option work, fixing #31348.
 2012-05-07 20:24:38 +00:00
Dalai Felinto e11b9df3f1 cycles-fisheye: fixed formula for dir to equisolid 
second time I need a scond commit to get the equisolid formula right, shame on me ;)
the formula is:
r = 2 x focallength x sin (theta / 2)
 2012-05-07 17:22:13 +00:00
Dalai Felinto 9a731205e9 direction to equisolid - final fix for [#31307] Cycles panoramic fisheye lens and vector pass problem 2012-05-07 16:51:55 +00:00
Brecht Van Lommel 022d12a721 Fix most of #31307: cycles panorama camera not working correct with speed 
vectors and window texture coordinates. Only for Fisheye Equisolid it's
still not working correct yet. Patch from Dalai with modifications.
 2012-05-07 10:53:09 +00:00
Brecht Van Lommel 4f1cdb3e42 Code cleanup: patch by Thomas to fix PassType values to be consecutive. 2012-05-06 15:19:36 +00:00
Brecht Van Lommel c0331cfc09 Cycles: minor refactoring of fisheye code to fit code style. 2012-05-05 19:44:35 +00:00