Move color class to a separate file.

sandbox/embed_edges.html

@@ -28,6 +28,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

sandbox/embed_filehost.html

@@ -28,6 +28,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

sandbox/embed_selfhost_code.html

@@ -28,6 +28,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

sandbox/embed_selfhost_errors.html

@@ -28,6 +28,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

sandbox/embed_selfhost_externallibs.html

@@ -28,6 +28,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

sandbox/embed_selfhost_fullscreen.html

@@ -27,6 +27,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

sandbox/embed_selfhost_manual.html

@@ -28,6 +28,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

sandbox/embed_selfhost_multiple.html

@@ -28,6 +28,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

sandbox/embed_selfhost_multiple_2.html

@@ -28,6 +28,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

sandbox/embed_selfhost_single.html

@@ -27,6 +27,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

sandbox/embed_selfhost_single_scroll.html

@@ -27,6 +27,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

source/model/color.js

@@ -0,0 +1,78 @@
+OV.Color = class
+{
+    constructor (r, g, b)
+    {
+        this.r = r; // 0 .. 255
+        this.g = g; // 0 .. 255
+        this.b = b; // 0 .. 255
+    }
+
+    Set (r, g, b)
+    {
+        this.r = r;
+        this.g = g;
+        this.b = b;
+    }
+
+    Clone ()
+    {
+        return new OV.Color (this.r, this.g, this.b);
+    }
+};
+
+OV.SRGBToLinear = function (component)
+{
+    if (component < 0.04045) {
+        return component * 0.0773993808;
+    } else {
+        return Math.pow (component * 0.9478672986 + 0.0521327014, 2.4);
+    }
+};
+
+OV.LinearToSRGB = function (component)
+{
+    if (component < 0.0031308) {
+        return component * 12.92;
+    } else {
+        return 1.055 * (Math.pow (component, 0.41666)) - 0.055;
+    }
+};
+
+OV.IntegerToHexString = function (intVal)
+{
+    let result = parseInt (intVal, 10).toString (16);
+    while (result.length < 2) {
+        result = '0' + result;
+    }
+    return result;
+};
+
+OV.ColorToHexString = function (color)
+{
+    let r = OV.IntegerToHexString (color.r);
+    let g = OV.IntegerToHexString (color.g);
+    let b = OV.IntegerToHexString (color.b);
+    return r + g + b;
+};
+
+OV.HexStringToColor = function (hexString)
+{
+    if (hexString.length !== 6) {
+        return null;
+    }
+
+    let r = parseInt (hexString.substr (0, 2), 16);
+    let g = parseInt (hexString.substr (2, 2), 16);
+    let b = parseInt (hexString.substr (4, 2), 16);
+    return new OV.Color (r, g, b);
+};
+
+OV.ArrayToColor = function (arr)
+{
+	return new OV.Color (arr[0], arr[1], arr[2]);
+};
+
+OV.ColorIsEqual = function (a, b)
+{
+	return a.r === b.r && a.g === b.g && a.b === b.b;
+};

source/model/material.js

@@ -1,25 +1,3 @@
-OV.Color = class
-{
-    constructor (r, g, b)
-    {
-        this.r = r; // 0 .. 255
-        this.g = g; // 0 .. 255
-        this.b = b; // 0 .. 255
-    }
-
-    Set (r, g, b)
-    {
-        this.r = r;
-        this.g = g;
-        this.b = b;
-    }
-
-    Clone ()
-    {
-        return new OV.Color (this.r, this.g, this.b);
-    }
-};
-
 OV.TextureMap = class
 {
     constructor ()
@@ -275,63 +253,6 @@ OV.PhysicalMaterial = class extends OV.FaceMaterial
     }
 };
 
-OV.SRGBToLinear = function (component)
-{
-    if (component < 0.04045) {
-        return component * 0.0773993808;
-    } else {
-        return Math.pow (component * 0.9478672986 + 0.0521327014, 2.4);
-    }
-};
-
-OV.LinearToSRGB = function (component)
-{
-    if (component < 0.0031308) {
-        return component * 12.92;
-    } else {
-        return 1.055 * (Math.pow (component, 0.41666)) - 0.055;
-    }
-};
-
-OV.IntegerToHexString = function (intVal)
-{
-    let result = parseInt (intVal, 10).toString (16);
-    while (result.length < 2) {
-        result = '0' + result;
-    }
-    return result;
-};
-
-OV.ColorToHexString = function (color)
-{
-    let r = OV.IntegerToHexString (color.r);
-    let g = OV.IntegerToHexString (color.g);
-    let b = OV.IntegerToHexString (color.b);
-    return r + g + b;
-};
-
-OV.HexStringToColor = function (hexString)
-{
-    if (hexString.length !== 6) {
-        return null;
-    }
-
-    let r = parseInt (hexString.substr (0, 2), 16);
-    let g = parseInt (hexString.substr (2, 2), 16);
-    let b = parseInt (hexString.substr (4, 2), 16);
-    return new OV.Color (r, g, b);
-};
-
-OV.ArrayToColor = function (arr)
-{
-	return new OV.Color (arr[0], arr[1], arr[2]);
-};
-
-OV.ColorIsEqual = function (a, b)
-{
-	return a.r === b.r && a.g === b.g && a.b === b.b;
-};
-
 OV.TextureIsEqual = function (a, b)
 {
     if (a.name !== b.name) {

tools/config.json

@@ -18,6 +18,7 @@
 		"source/io/bufferutils.js",
 		"source/io/fileutils.js",
 		"source/io/externallibs.js",
+		"source/model/color.js",
 		"source/model/material.js",
 		"source/model/triangle.js",
 		"source/model/property.js",

website/embed.html

@@ -34,6 +34,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>

website/index.html

@@ -36,6 +36,7 @@
 	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
 	<script type="text/javascript" src="../source/io/fileutils.js"></script>
 	<script type="text/javascript" src="../source/io/externallibs.js"></script>
+	<script type="text/javascript" src="../source/model/color.js"></script>
 	<script type="text/javascript" src="../source/model/material.js"></script>
 	<script type="text/javascript" src="../source/model/triangle.js"></script>
 	<script type="text/javascript" src="../source/model/property.js"></script>