Cosmetic fixes

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 97bb8e9e66dc06f76fdbbd38571b236253226fe2..e3014f3cc6f55c6c7c05353685dfbd28bc5b8cb6 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -1,6 +1,7 @@
 import os
 
 def create_technique_resource(material, resources):
+       # This operates on a Blender material, not a custom object
        from .datafile import Resource, Statement
        tech_res = Resource(material.name+".tech", "technique")
 

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index 4315b9ec8b7a8328db3b8ead0661cf8ca4016c24..2a03e2c51c049095ca23a23dbefbdc432e2d40e0 100644 (file)
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -127,8 +127,8 @@ vec3 cooktorrance_one_light_direct(vec3 normal, vec3 look, vec3 light, vec3 ligh
        vec3 k_spec = fresnel_schlick(halfway, light, base_color, metalness);
        vec3 k_diff = (1.0-k_spec)*(1.0-metalness);
 
-       float denom = max(4.0*max(dot(normal, -look), 0.0)*max(dot(normal, light), 0.0), 0.001);
-       return max(dot(normal, light), 0.0)*light_color*(k_diff*lambert_diffuse(base_color)+k_spec*ndist*geom/denom);
+       float spec_denom = max(4.0*max(dot(normal, -look), 0.0)*max(dot(normal, light), 0.0), 0.001);
+       return max(dot(normal, light), 0.0)*light_color*(k_diff*lambert_diffuse(base_color)+k_spec*ndist*geom/spec_denom);
 }
 
 vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metalness, float roughness)

diff --git a/source/effects/colorcurve.cpp b/source/effects/colorcurve.cpp
index 130fa8df2a45f6b7be2fe711186273a8da26a5b1..9e242d1984007c2c5ea8565f3533630f323f8065 100644 (file)
--- a/source/effects/colorcurve.cpp
+++ b/source/effects/colorcurve.cpp
@@ -34,6 +34,7 @@ void ColorCurve::set_brightness_response(float b)
 {
        if(b<=0 || b>1)
                throw invalid_argument("ColorCurve::set_brightness_response");
+       // Calculate an offset value to obtain a derivative of 1 at zero intensity.
        float t = (b<1 ? pow(b, 1/(1-b)) : 0.0f);
        shdata.uniform("brightness_response", b, t, pow(t, b));
 }

diff --git a/source/effects/colorcurve.h b/source/effects/colorcurve.h
index e34834aa4e72bf83311b8b9bc41fd657c1d2ba83..ee19a56f3835fadb225b56e48016d4f23b272f1a 100644 (file)
--- a/source/effects/colorcurve.h
+++ b/source/effects/colorcurve.h
@@ -58,7 +58,9 @@ public:
        image, negative values darken it.  Zero is neutral. */
        void set_exposure_adjust(float);
 
-       /** Sets the exponent of the */
+       /** Sets the exponent of the brightness response curve.  It must be greater
+       than zero and at most one.  A value of one gives a linear response; closer
+       to zero results in a more gentle curve. */
        void set_brightness_response(float);
 
        /** Sets the gamma value used for mapping output colors.  Allowed range is

diff --git a/source/effects/environmentmap.h b/source/effects/environmentmap.h
index 56c76c459f2b6d84811fb52aeea9cea3c16a4587..ff3d6c425414c97ddce3d41e0ebbaf29abee90dc 100644 (file)
--- a/source/effects/environmentmap.h
+++ b/source/effects/environmentmap.h
@@ -48,7 +48,12 @@ public:
        EnvironmentMap(Resources &, unsigned size, Renderable &rend, Renderable &env);
 
        void set_depth_clip(float, float);
+
+       /** Sets the interval in frames between environment map updates.  A value of
+       0 means an update is only done when manually requested. */
        void set_update_interval(unsigned);
+
+       /** Request that the environment map is updated on the next frame. */
        void queue_update();
 
        virtual void setup_frame(Renderer &);

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 6ef58e909f1f2345c4468e5567da282749facfcb..036446f5bab630d83613f7c97e774c3b1dd7bb30 100644 (file)
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -1177,7 +1177,7 @@ void SpirVGenerator::visit_constructor(FunctionCall &call, const vector<Id> &arg
                        Id zero_id = get_constant_id(get_id(elem), 0.0f);
                        for(unsigned i=0; i<n_columns; ++i)
                        {
-                               column_ids[i] = begin_expression(OP_COMPOSITE_CONSTRUCT, col_type_id, n_rows);;
+                               column_ids[i] = begin_expression(OP_COMPOSITE_CONSTRUCT, col_type_id, n_rows);
                                for(unsigned j=0; j<n_rows; ++j)
                                        writer.write(j==i ? argument_ids[0] : zero_id);
                                end_expression(OP_COMPOSITE_CONSTRUCT);