Use ColorBlendMode.getColorBlend function

CesiumGS · Dec 6, 2016 · 6a60f25 · 6a60f25
1 parent cade6fa
commit 6a60f25
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/Source/Scene/ColorBlendMode.js b/Source/Scene/ColorBlendMode.js
@@ -1,8 +1,10 @@
 /*global define*/
 define([
-        '../Core/freezeObject'
+        '../Core/freezeObject',
+        '../Core/Math'
 ], function(
-        freezeObject) {
+        freezeObject,
+        CesiumMath) {
     'use strict';
 
     /**
@@ -22,5 +24,16 @@ define([
         MIX : 2
     };
 
+    ColorBlendMode.getColorBlend = function(colorBlendMode, colorBlendAmount) {
+        if (colorBlendMode === ColorBlendMode.HIGHLIGHT) {
+            return 0.0;
+        } else if (colorBlendMode === ColorBlendMode.REPLACE) {
+            return 1.0;
+        } else if (colorBlendMode === ColorBlendMode.MIX) {
+            // The value 0.0 is reserved for highlight, so clamp to just above 0.0.
+            return CesiumMath.clamp(colorBlendAmount, CesiumMath.EPSILON4, 1.0);
+        }
+    };
+
     return freezeObject(ColorBlendMode);
 });
diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js
@@ -2927,16 +2927,7 @@ define([
 
     function createColorBlendFunction(model) {
         return function() {
-            var colorBlendMode = model.colorBlendMode;
-            var colorBlendAmount = model.colorBlendAmount;
-            if (colorBlendMode === ColorBlendMode.HIGHLIGHT) {
-                return 0.0;
-            } else if (colorBlendMode === ColorBlendMode.REPLACE) {
-                return 1.0;
-            } else if (colorBlendMode === ColorBlendMode.MIX) {
-                // The value 0.0 is reserved for highlight, so clamp to just above 0.0.
-                return CesiumMath.clamp(colorBlendAmount, CesiumMath.EPSILON4, 1.0);
-            }
+            return ColorBlendMode.getColorBlend(model.colorBlendMode, model.colorBlendAmount);
         };
     }