diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-16 17:14:02 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-16 17:14:02 +0400 |
commit | 66b1dfae89cc44953bd51c5da962cab437e76972 (patch) | |
tree | e7679b3e554fb4f1bb6f68775c8619bcde0da822 /intern/cycles/device/device_network.cpp | |
parent | 0a5fcf3da3e82fd114095c8c2903d927f15ffc31 (diff) |
Cycles: tweaks to properties and nodes
* Passes renamed to samples
* Camera lens radius renamed to aperature size/blades/rotation
* Glass and fresnel nodes input is now index of refraction
* Glossy and velvet fresnel socket removed
* Mix/add closure node renamed to mix/add shader node
* Blend weight node added for shader mixing weights
There is some version patching code for reading existing files, but it's not
perfect, so shaders may work a bit different.
Diffstat (limited to 'intern/cycles/device/device_network.cpp')
-rw-r--r-- | intern/cycles/device/device_network.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp index 0feba34f713..af7d90478cf 100644 --- a/intern/cycles/device/device_network.cpp +++ b/intern/cycles/device/device_network.cpp @@ -178,22 +178,22 @@ public: #endif } - void path_trace(int x, int y, int w, int h, device_ptr buffer, device_ptr rng_state, int pass) + void path_trace(int x, int y, int w, int h, device_ptr buffer, device_ptr rng_state, int sample) { #if 0 RPCSend snd(socket, "path_trace"); - snd.archive & x & y & w & h & buffer & rng_state & pass; + snd.archive & x & y & w & h & buffer & rng_state & sample; snd.write(); #endif } - void tonemap(int x, int y, int w, int h, device_ptr rgba, device_ptr buffer, int pass, int resolution) + void tonemap(int x, int y, int w, int h, device_ptr rgba, device_ptr buffer, int sample, int resolution) { #if 0 RPCSend snd(socket, "tonemap"); - snd.archive & x & y & w & h & rgba & buffer & pass & resolution; + snd.archive & x & y & w & h & rgba & buffer & sample & resolution; snd.write(); #endif } @@ -201,9 +201,9 @@ public: void task_add(DeviceTask& task) { if(task.type == DeviceTask::TONEMAP) - tonemap(task.x, task.y, task.w, task.h, task.rgba, task.buffer, task.pass, task.resolution); + tonemap(task.x, task.y, task.w, task.h, task.rgba, task.buffer, task.sample, task.resolution); else if(task.type == DeviceTask::PATH_TRACE) - path_trace(task.x, task.y, task.w, task.h, task.buffer, task.rng_state, task.pass); + path_trace(task.x, task.y, task.w, task.h, task.buffer, task.rng_state, task.sample); } void task_wait() @@ -355,20 +355,20 @@ void Device::server_run() #if 0 device_ptr buffer, rng_state; int x, y, w, h; - int pass; + int sample; - *rcv.archive & x & y & w & h & buffer & rng_state & pass; - path_trace(x, y, w, h, buffer, rng_state, pass); + *rcv.archive & x & y & w & h & buffer & rng_state & sample; + path_trace(x, y, w, h, buffer, rng_state, sample); #endif } else if(rcv.name == "tonemap") { #if 0 device_ptr rgba, buffer; int x, y, w, h; - int pass, resolution; + int sample, resolution; - *rcv.archive & x & y & w & h & rgba & buffer & pass & resolution; - tonemap(x, y, w, h, rgba, buffer, pass, resolution); + *rcv.archive & x & y & w & h & rgba & buffer & sample & resolution; + tonemap(x, y, w, h, rgba, buffer, sample, resolution); #endif } } |