Merge branch 'dev' of https://github.com/colobot/colobot into dev

3 files changed, 11 insertions, 3 deletions

diff --git a/src/graphics/core/color.h b/src/graphics/core/color.h
index 0bec7e9..7cbd175 100644
--- a/src/graphics/core/color.h
+++ b/src/graphics/core/color.h
@@ -107,6 +107,14 @@ inline IntColor ColorToIntColor(Color color)
                     static_cast<unsigned char>(color.a * 255.0f));
 }
 
+inline Color IntensityToColor(float intensity)
+{
+    if (intensity <= 0.0f) return Color(0.0f, 0.0f, 0.0f, 0.0f);
+    if (intensity >= 1.0f) return Color(1.0f, 1.0f, 1.0f, 1.0f);
+
+    return Color(intensity, intensity, intensity, intensity);
+}
+
 /**
  * \struct ColorHSV
  * \brief HSV color
diff --git a/src/graphics/core/device.h b/src/graphics/core/device.h
index ba5af6e..b6dd138 100644
--- a/src/graphics/core/device.h
+++ b/src/graphics/core/device.h
@@ -72,7 +72,7 @@ struct DeviceConfig
         size = Math::IntPoint(800, 600);
         bpp = 32;
         fullScreen = false;
-        resizeable = true;
+        resizeable = false;
         doubleBuf = true;
         noFrame = false;
     }
diff --git a/src/graphics/core/light.h b/src/graphics/core/light.h
index 35f37e6..28733c1 100644
--- a/src/graphics/core/light.h
+++ b/src/graphics/core/light.h
@@ -68,7 +68,7 @@ struct Light
     float           attenuation1;
     //! Quadratic attenuation factor
     float           attenuation2;
-    //! Angle of spotlight cone (0-90 degrees)
+    //! Angle of spotlight cone (0-PI/2 radians)
     float           spotAngle;
 
     //! Intensity of spotlight (0 = uniform; 128 = most intense)
@@ -91,7 +91,7 @@ struct Light
         direction = Math::Vector(0.0f, 0.0f, 1.0f);
         attenuation0 = 1.0f;
         attenuation1 = attenuation2 = 0.0f;
-        spotAngle = 90.0f;
+        spotAngle = Math::PI/2.0f;
         spotIntensity = 0.0f;
     }
 };