Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
33,045 Commits 2 Branches 0 Tags
cd9b51c1bf36532ca48c8995dd2d30eba0fded5b
Commit Graph

150 Commits

Author SHA1 Message Date
Campbell Barton
cd9b51c1bf add some missing headers to cmake, also add some files as comments since it seems they should be added but evidently work fine without. 2011-11-10 06:05:22 +00:00
Antony Riakiotakis
ee1569b933 No tabs in scons! Sorry for that.. 2011-11-09 14:00:24 +00:00
Antony Riakiotakis
83b16687b9 Make scons work MinGW. This commit resolves several issues such as enable OpenEXR, Game Engine and Player, enable latest features, and solve link order for gcc. So MinGW is right now fully supported as a build system for release type builds. Debug builds not tested. 2011-11-09 11:33:10 +00:00
Brecht Van Lommel
46dcad970c Cycles: fix light strength mistmatch when clicking "use nodes". 
Regarding merge status, there should be no build failures, but cycles may not
be enabled in your build, we are still solving:

* Windows: CUDA kernel compile at runtime is failing, probably will have to
  do precompiled kernel again.
* Mac: scons is not building cycles yet.
* Linux doesn't have boost + openimageio libs available in lib/ yet, so it
  requires manual install of those libs still.
 2011-11-08 22:38:10 +00:00
Brecht Van Lommel
262ac7340e Cycles: cmake tweaks for linux build, instructions on the wiki no longer worked. 2011-11-08 21:40:08 +00:00
Nathan Letwory
c9bca51e76 Add compiles support for Cycles. 
No CUDA compiling yet, will be added later.
 2011-11-08 20:40:02 +00:00
Campbell Barton
33814e0093 edits to cycles cmake files so cmake_consistency_check.py can parse them. 2011-11-08 20:27:37 +00:00
Campbell Barton
76f77514d3 don't overwrite existing CMAKE_CXX_FLAGS for cycles (they may be important) 2011-11-08 19:08:56 +00:00
Antony Riakiotakis
2a0451dc46 Fix GLEW linking error on MinGW. 
The __imp__ prefix on glew lib linking errors should have been a good indication: the code was looking for the glew dll.
Bypassed by adding GLEW_STATIC to the definitions.
 2011-11-08 18:58:29 +00:00
Brecht Van Lommel
8cfc17c7cd Cycles Merge: 
* It seems we have a problem compiling the CUDA kernel at runtime on Windows,
  will need to investigate more how to solve this best, CPU render should go
  fine though.
* Change OPENIMAGEIO to OPENIMAGEIO_ROOT_DIR on linux for consistency.
 2011-11-08 17:53:49 +00:00
Brecht Van Lommel
24aebc444b Cycles Merge 
Documentation:
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles

Cycles is available is an extra render engine from the top header. It's not
feature complete, consider this as a first preview release. Known bugs:
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles/KnownIssues

Building currently only works with CMake, SCons support is being worked on
and should be available soon.

Also missing still is precompiled OpenImageIO and Boost for Linux, these will
be added later in lib/linux*, if you do not have these installed on your
system, Cycles will simply not be available.
 2011-11-08 17:00:40 +00:00
Brecht Van Lommel
a56c6e18a8 Cycles: 
* Disable precompiled cuda binaries, always do at run time
* Change preview samples default to 10
* Hide volume panels since they don't do anything yet
 2011-11-08 14:10:33 +00:00
Brecht Van Lommel
64ab414026 Cycles: svn merge -r41627:41650 ^/trunk/blender 2011-11-08 12:33:17 +00:00
Brecht Van Lommel
dca15b215d Cycles: svn merge -r41613:41627 ^/trunk/blender 2011-11-07 17:13:32 +00:00
Brecht Van Lommel
fb56dbc2af Cycles: procedural texture nodes reorganization. This will break existing files 
using them, but rather do it now that I have the chance still. Highlights:

* Wood and Marble merged into a single Wave texture
* Clouds + Distorted Noise merged into new Noise node
* Blend renamed to Gradient
* Stucci removed, was mostly useful for old bump
* Noise removed, will come back later, didn't actually work yet
* Depth setting is now Detail socket, which accepts float values
* Scale socket instead of Size socket

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures
 2011-11-06 21:05:58 +00:00
Brecht Van Lommel
fd83a3ede0 Cycles: make cycles work with new camera sensor size. 2011-11-05 11:11:06 +00:00
Brecht Van Lommel
72929172dd Cycles: add location/rotate/scale and XYZ mapping options for all texture nodes, 
to reduce the amount of nodes needed to set up a simple texture.

These are currently editable in the texture properties tab, still need to make
them available in the node editor. Projection and color modification options will
be added later, they're not implemented yet but allocated already to avoid
version patches later.

Also an issue with the XYZ mapping is that when you set one to None, texture and
material draw mode doesn't draw the image texture well, OpenGL doesn't seem to
like the degenerate texture matrix?
 2011-11-04 20:58:00 +00:00
Brecht Van Lommel
a620ec61ec Cycles: always use static bvh for non-viewport render. 2011-11-04 15:46:15 +00:00
Brecht Van Lommel
9a4e1e0f0a Cycles: updates to follow code committed to trunk. 2011-11-03 10:18:58 +00:00
Brecht Van Lommel
02fae3440c Cycles: RenderEngine api code tweaks, also ensuring it's backwards compatible. 2011-11-02 15:15:45 +00:00
Brecht Van Lommel
bb379c06e9 Cycles: progress printing in background mode, print finished at the end and 
avoid duplicate prints.
 2011-10-30 10:12:34 +00:00
Brecht Van Lommel
238f3a7d34 Cycles: seed value to get different noise values from renders, there was a patch 
for this but I've implemented it differently.
 2011-10-29 14:27:24 +00:00
Brecht Van Lommel
05334492a3 Cycles: theme changes, some code syncing with trunk. 2011-10-24 19:32:10 +00:00
Brecht Van Lommel
586c631c88 Cycles: when creating nodes from a blender material, set the diffuse color in 
the diffuse node, similar for lamps and world.
 2011-10-22 18:51:45 +00:00
Brecht Van Lommel
72e47de8b5 Cycles: fix some issues with mix shaders when the weight for an emission shader 
was 0.0, and background shader mix wasn't working.
 2011-10-19 00:13:41 +00:00
Campbell Barton
97e58e499d use CMake's CUDA_NVCC_EXECUTABLE rather then own hard coded CYCLES_CUDA variable. 2011-10-17 11:54:43 +00:00
Thomas Dinges
c18e9a1bc6 Cycles: 
* Auto detection of CUDA toolkit, using FIND_PACKAGE(CUDA). (Requires at least CMAKE 2.8)
 2011-10-17 11:24:20 +00:00
Brecht Van Lommel
d537a1586d Cycles: fix crash using uv + generated texture coordinates on a single mesh. 2011-10-16 22:07:55 +00:00
Thomas Dinges
590a524323 Cycles: 
Add cmake path for the CUDA toolkit (default installation) on windows.
 2011-10-16 22:06:35 +00:00
Brecht Van Lommel
7b06c1718b Cycles: material "sample as light" option, to make the integrator sample the 
object as a mesh light or not. This may result in more/less noisy renders
depending on the situation, but should converge to the same result.
 2011-10-16 20:58:48 +00:00
Brecht Van Lommel
5fd67a3ba5 Cycles: enable multi closure sampling and transparent shadows only on CPU and 
CUDA cards with shader model >= 2 for now (GTX 4xx, 5xx, ..). The CUDA compiler
can't handle the increased kernel size currently.
 2011-10-16 18:54:27 +00:00
Brecht Van Lommel
e5f544dd92 Cycles: add transparent shadow support, i.e. shadows through Transparent BSDF 
shaders, enabled by default.
 2011-10-16 17:54:43 +00:00
Brecht Van Lommel
60bc63c7b8 Cycles: enable improved closure sampling, this should give less noise for mix, add 
and glass shaders. How well this will work on non-fermi GPU's is unclear still, it's
a bit heavy on register usage.
 2011-10-16 17:40:47 +00:00
Brecht Van Lommel
11f3029267 Cycles: fix F12 render not using render resolution for modifiers. 2011-10-16 17:19:29 +00:00
Brecht Van Lommel
7600c687b2 Cycles: fix sampling issue with certain (transparent) max bounce settings, and 
tweak presets/defaults to use 128 instead of 1024.
 2011-10-16 17:06:01 +00:00
Brecht Van Lommel
7b1ef0f416 Cycles: use mesh normals computed by Blender instead of computing our own, 
solves an issue with poor mesh geometry.
 2011-10-16 17:00:48 +00:00
Thomas Dinges
60b72a7a41 Cycles: 
* World background was emitting light, even after removal of World shader nodes.
 2011-10-16 14:11:53 +00:00
Brecht Van Lommel
d5b679253a Cycles: 
* Sun, area and point lights with size now supported
* Cast shadow option to disable shadow casting for lamps
* Emission strength of materials tweaked such that setting strength to 1.0
  basically makes the material "shadeless" in that the value of the color
  input will be the resulting color in the image.
 2011-10-15 23:49:01 +00:00
Brecht Van Lommel
9c959d98fe Cycles: make Attribute node work, code for it was implemented in kernel, only 
missing was the ability to specify the attribute name in the node. This makes
it possible to use multiple uv or vertex color layers now.
 2011-10-15 20:13:35 +00:00
Brecht Van Lommel
9ebfcea8f3 Cycles: revert commit that joined surface/volume socket into a single shader socket, 
on second thought this makes it a bit too difficult to understand what's going on.
 2011-10-12 23:03:12 +00:00
Brecht Van Lommel
310b25c388 Cycles: code refactoring to split out code from mapping node. 2011-10-12 22:42:13 +00:00
Brecht Van Lommel
4c3b94fdbd Cycles: image texture node now uses UV as default texture coordinate, 
instead of generated.
 2011-10-12 16:01:37 +00:00
Brecht Van Lommel
c3c44f8736 Cycles: don't use glsl in textured draw mode, to keep things simpler and faster 
there for now. Also add viewport color setting for materials for solid draw mode.
 2011-10-12 15:48:26 +00:00
Brecht Van Lommel
9ec1114765 Cycles: make node with multiple input sockets with the same name work. Previously 
nodes like Mix had their sockets renamed to Color1/Color2, but doing this breaks
compatibility for the internal renderer, so restored it now.
 2011-10-12 15:45:52 +00:00
Brecht Van Lommel
7503a7edfb Cycles: replace surface/volume sockets in output nodes with a single shader socket, 
decided it's better to render objects as either surface or volume.

This may break the volume rendering patch, but shaders with volume closures still
get tagged as having volume closures, so it should be fixable without too many
changes.
 2011-10-12 15:42:35 +00:00
Brecht Van Lommel
85818c8209 Cycles: add python render engine option to use new shading nodes or not, instead 
of hardcoded check for cycles. Also some other minor code cleaning tweaks.
 2011-10-11 17:19:55 +00:00
Brecht Van Lommel
1ab9fc59b7 Cycles: fix a few more msvc issues with empty scenes and ustring setting. 2011-10-03 17:42:24 +00:00
Brecht Van Lommel
da8f71bffb Cycles: some tweaks to silence msvc assertions in debug mode. 2011-10-03 15:31:45 +00:00
Thomas Dinges
e6dfbcf7cb Cycles: 
* Typo Fix.
 2011-09-27 21:05:33 +00:00
Brecht Van Lommel
cdee3435c6 Cycles: internal changes that should have no effect on user level yet, added 
shader flags for various purposes, and some code for light types other than
points.
 2011-09-27 20:37:24 +00:00