Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-10-07Cleanup to previous commit, we can reuse set_rgb instead of new functionAntony Riakiotakis
2014-10-07Fix T42074, textured lamps influncing other layersAntony Riakiotakis
The solution is to do the multiplication with the energy in the shader after texture application. We might be able to avoid setting dyncol completely, but this needs better investigation. Some shader paths also look a bit redundant. Also, texture mapping is not supported very well for light lamps, might also need investigation.
2014-09-02A bit of a code cleanup in GLSL shaderSergey Sharybin
2014-09-02Support window coordinates in cycles nodes.Antony Riakiotakis
2014-09-02Fix second part of T41068 -- reflection mapping was wrongSergey Sharybin
Few things: - reflect() takes arguments in this order: N, I, it was swapped in the previous code for some reason. - Normal and view vectors are to be normalized. For the view vector we're now using shade_view() in order to deal with the ortho camera. However, Cycles does not support ortho camera for reflection, but this is easy to do in a separate commit. - Reflection vector is to be in the world space. Kudos to Antony Riakiotakis for figuring this out!
2014-08-27Disable clipping on ATI cards not supporting the clipping workaround toAntony Riakiotakis
avoid software fallback.
2014-08-22Fix T41068: 3D viewport shading - Material or Window vs. RenderedSergey Sharybin
Checked with Brecht, Cycles indeed expects generated to be in 0..1 space instead of -1..1 as it is in BI.
2014-08-18Fix T41456: soft light texture blend mode zero effectAntony Riakiotakis
Soft light and Linear light blend modes weren't implemented in glsl Reviewers: psy-fi Maniphest Tasks: T41456 Differential Revision: https://developer.blender.org/D744
2014-07-19Fix T40658: UV map node not working for GLSL materials.Brecht Van Lommel
2014-07-11Another attempt for T40981, clipping border does not work with GLSL onAntony Riakiotakis
ATIs. This is actually a test to see if this can be enabled on ATI cards. According to various sources, newer ATI cards supporting GLSL 3.0 support gl_ClippingDistance in shaders, which is the forward compatible way to do custom clipping. This fix will bind 6 additional varying variables on ATIs, which may lead to some shaders not compiling due to limiting out of those variables, or to performance degradation. Also I do not have an ATI handy to test. Having those in mind, this commit may well be reverted later. Clipping planes are usually 4 (6 is for cube clipping), but making shaders depend on viewport state is really bad, and would lead to recompilation, so I took the worst case here to avoid that. Hopefully driver does some optimization there.
2014-07-09Attempt to mitigate issue T40981Antony Riakiotakis
Clipping border causes a software fallback on ATIs. We have disabled it in that case but from minor digging on the net seems like Intels support this, so enable.
2014-06-20Fix 2 GLSL errors, with Cycles Hair BSDF.Thomas Dinges
2014-06-14Implement GLSL code for XYZ nodes.Thomas Dinges
2014-06-04Fix T40478: wrong cycles fresnel with GLSL materials in the viewport.Brecht Van Lommel
2014-05-30Fix T40078: GLSL Lamp with OnlyShadow makes weird colors in object.IRIE Shinsuke
To prevent only shadow lamps from producing negative colors, shr->diff and shr->spec should've been clamped to positive values after lamp loop.
2014-05-07Nodes: add absolute value operation to all math nodesMatt Heimlich
Reviewed By: dingto, brecht Differential Revision: https://developer.blender.org/D507
2014-04-29Fix for wrong behavior of 'darken' blend mode with factor.Kevin Dietrich
The formula was not consistent across Blender and behaved strangely, now it is a simple linear blend between color1 and min(color1, color2). Reviewed By: brecht Differential Revision: https://developer.blender.org/D489
2014-04-21Fix GLSL after 7765b73f6d20 (Transparent Depth).Thomas Dinges
2014-04-01Make matcaps suck lessAntony Riakiotakis
This commit does various changes for matcaps: One is taking advantage of drawing with pbvh (which would only happen with dyntopo previously) and drawing with partial redraw during sculpting. The second one is support for masks. To make this work in the special case of multires, which uses flat shading, I use the only available flat shaded builtins in OpenGL 2.0 which are color and secondary color. Abusing colors in that way is also essential for flat shading to work if we are to use pbvh draw in multires, since it is the color that is being interpolated flatly, not the normal (which can only interpolated smoothly). The pbvh drawing code for multires used last triangle element's normal to compute the shading which would only produce smooth results. This could change if we did the shading in the vertex shader for flat shaded primitives, but this is more complex and makes it harder to have one shader to rule the mole. Also increased the brightness of the default diffuse color for sculpting. This should be useful since artists like to tweak the lighting settings and it will give them the full dynamic range of the lights, but also it helps with correct brightness of sculpted matcaps. Reviewers: brecht Differential Revision: https://developer.blender.org/D435
2014-03-06Fix T38973: GLSL error, when using Cycles Light Path node.Thomas Dinges
2014-01-14Fix GLSL compatible_pow to give 1.0 for 0 ^ 0Sv. Lockal
2013-11-25Blender Internal: Add "Lamp Data" shader node that allows shaders to acquire ↵IRIE Shinsuke
information such as light vector from specified Lamp. For now this provides the following outputs: - Color - Light Vector - Distance - Shadow - Visibility Factor Note: Color output is multiplied by the lamp energy. Multiplication of color*max(dot(light_vector,normal_vector),0)*shadow*visibility_factor produces the exact same result as the Lambert shader. Many thanks to Brecht for code review and discussion!
2013-11-24Blender Internal: Revert own previous commit for "Camera Data" node, correct ↵IRIE Shinsuke
GLSL code for view vector output of "Geometry" node. Revert 0c7d2de38219. The "Camera Data" node actually gives the location of the point in camera coordinate system. To obtain actual camera data, we can use "Geometry" node instead. Also modify the "Geometry" node, to produce correct view vector output in orthographic GLSL preview.
2013-11-24Blender Internal: Fix shader node "Camera Data" that doesn't consider ↵IRIE Shinsuke
orthographic view. Note that Cycles still needs to fix.
2013-11-22Cycles: Add a "Normal" input socket to the Layer Weight node + GLSL drawing ↵Thomas Dinges
code. Patch by lichtwerk (Philipp Oeser). Differential Revision: http://developer.blender.org/D28
2013-11-21Blender Internal: Add shader nodes "Separate HSV" and "Combine HSV", same as ↵IRIE Shinsuke
Cycles' ones.
2013-11-12Change the behavior of AO pass in Blender internal's shader/render node tree ↵Irie Shinsuke
so that it becomes (1.0, 1.0, 1.0) when AO is disabled. For materials using AO pass, this makes the material preview and the GLSL preview more accurate, but shouldn't affect final rendering in most cases because we usually enable AO when using the AO pass in node tree. Thanks to Brecht for code review.
2013-11-09Cycles / Fresnel Node:Thomas Dinges
* Add a "Normal" Input to the Fresnel node. * Fix for the Fresnel GLSL code (normalize the Incoming vector). Patch #37384 by Philipp Oeser (lichtwerk) , thanks!
2013-09-30Fix #36882: cycles gamma node not working with glsl materials.Brecht Van Lommel
2013-09-20FIX: [#27536] GLSL object space normal maps have wrong shadingAndrea Weikert
Added object and world space for normal map in GLSL view.
2013-09-16Fix #36734 Matcap displays solid black.Lukas Toenne
GLSL typo in r60151 caused this.
2013-09-16Cycles Hair: Two basic bair shaders addedStuart Broadfoot
A new hair bsdf node, with two closure options, is added. These closures allow the generation of the reflective and transmission components of hair. The node allows control of the highlight colour, roughness and angular shift. Llimitations include: -No glint or fresnel adjustments. -The 'offset' is un-used when triangle primitives are used.
2013-09-05Fix broken GLSL shader after recent changes.Brecht Van Lommel
2013-09-04Cycles: add a sharpness input to the Cubic SSS falloff. When set to 1 this willBrecht Van Lommel
give a result more similar to the Compatible falloff option. The scale is x2 though to keep the perceived scatter radius roughly the same while changing the sharpness. Difference with compatible will be mainly on non-flat geometry.
2013-06-24Fix GLSL not showing shading properly on the backside of faces. Now it flipsBrecht Van Lommel
the normal towards the viewer, seems to give consistent results with blender internal, cycles, normal maps, etc. Started from patch #32761 by Vitor Balbio, but changed it to do normal flipping earlier so it solves all cases.
2013-06-05Cycles: GLSL materials now can use multiple UV maps with the attribute node.Brecht Van Lommel
2013-06-04Fix #35617: cycles GLSL object texture coordinates were wrong.Brecht Van Lommel
2013-05-27Fix #35505: cycles object space normal mapping did not match blender internal.Brecht Van Lommel
Now it uses the same (strange) YZ flipping convention.
2013-05-24Fix for [#35490] Initial cube is green, turn off matcap and it is correct colorThomas Dinges
* Own error from r56980, "smooth" is an Interpolation qualifier in GLSL, so use another variable name to avoid the error.
2013-05-23Cycles / Toon BSDF:Thomas Dinges
* Added a toon bsdf node to Cycles. This was already available as OSL only closure, but is now available inside the SVM backed as well, for CPU and GPU rendering. * There are 2 variations available, diffuse and glossy toon, selectable via a menu inside the node. Documentation: http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Shaders#Toon Example render & blend file: http://www.pasteall.org/pic/show.php?id=51970 http://www.pasteall.org/blend/21579
2013-05-20Math Node:Thomas Dinges
* Added a Modulo operation to the math node, available in Compositor, Shader and Texture Nodes.
2013-05-10Cycles: bump node changes to add a Distance input that controls the overall ↵Brecht Van Lommel
displacement distance, and an Invert option to invert the bump effect.
2013-04-24Fix #35063: GLSL texture node Value output was not outputting alpha.Brecht Van Lommel
2013-04-02Cycles: initial subsurface multiple scattering support. It's not working asBrecht Van Lommel
well as I would like, but it works, just add a subsurface scattering node and you can use it like any other BSDF. It is using fully raytraced sampling compatible with progressive rendering and other more advanced rendering algorithms we might used in the future, and it uses no extra memory so it's suitable for complex scenes. Disadvantage is that it can be quite noisy and slow. Two limitations that will be solved are that it does not work with bump mapping yet, and that the falloff function used is a simple cubic function, it's not using the real BSSRDF falloff function yet. The node has a color input, along with a scattering radius for each RGB color channel along with an overall scale factor for the radii. There is also no GPU support yet, will test if I can get that working later. Node Documentation: http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Shaders#BSSRDF Implementation notes: http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles/Subsurface_Scattering
2013-03-31style cleanupCampbell Barton
2013-03-16style cleanupCampbell Barton
2013-03-13Fix #34492: clipping border not working with GLSL/matcap and Nouveau drivers.Brecht Van Lommel
2013-03-10OpenGL: more work on fixed function lighting implementation as GLSL.Brecht Van Lommel
* Rename functions and move to own header. * Add wrapper functions for glLight. * Auto detect if we can use faster code for solid lighting. * Various fixes for textured draw mode.
2013-02-26OpenGL: implemenation of fixed function lighting as per pixel GLSL shaders. TheBrecht Van Lommel
code is still unused, but the intention is to use this to solve the double sided lighting problem on NVidia, and to make the materials work on OpenGL ES 2.0 eventually. The code works and matches the fixed function lighting pretty much exactly, but still needs optimizations. The actual integration in object draw will be committed later when more fixing & testing, there's lots of different combinations and unclear OpenGL state here.
2013-02-15Fix #34254: cycles brightness/contrast node was missing for GLSL material view.Brecht Van Lommel