Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply color palette on render. #4953

Closed
wants to merge 18 commits into from
+1,302 −5
Closed

Apply color palette on render. #4953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
063f607
Apply color palette on render.
NaderCHASER Feb 6, 2017
86294b7
Restore accidental frustumSplits[] removal.
NaderCHASER Feb 8, 2017
8714fe9
Make imageryColorPalette set match default.
NaderCHASER Feb 8, 2017
92ce03c
Initial color palette sandcastle example.
NaderCHASER Feb 8, 2017
3ffa705
Move palette GLSL into sampleAndBlend
NaderCHASER Feb 8, 2017
59a1aae
Apply color palette after load. Fix URL.
NaderCHASER Feb 8, 2017
82c0721
Save a uniform bind if no Imagery with palette
NaderCHASER Feb 8, 2017
94194cb
Create PALETTE_UNITS constant. Fix bindTexture
NaderCHASER Feb 8, 2017
437f2b3
Get rid of APPLY_COLOR_PALETTE for PALETTE_UNITS
NaderCHASER Feb 8, 2017
544bfbd
Use same ++ as Cesium had for numberOfDayTextures
NaderCHASER Feb 8, 2017
c00a7b4
Fix URL to use other data. Old data was tainted.
NaderCHASER Feb 8, 2017
947bd3b
`that` was defined but never used.
NaderCHASER Feb 9, 2017
08797ff
`buildPickFeaturesUrl` was defined but never used
NaderCHASER Feb 9, 2017
0bbfecc
Use !== instead of !=
NaderCHASER Feb 9, 2017
640f0c9
Get rid of template literal. Fix !==. Avoid global
NaderCHASER Feb 9, 2017
c75fdb3
Fix “better written in dot notation” errors
NaderCHASER Feb 9, 2017
de0ad6b
Hoist variable to avoid ‘already defined’
NaderCHASER Feb 9, 2017
538474b
Fix for wrapped in if `hasOwnProperty`
NaderCHASER Feb 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
205 changes: 205 additions & 0 deletions Apps/Sandcastle/gallery/Imagery Layers Palette.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="description" content="Use the split property to only show layers on one side of a slider.">
<meta name="cesium-sandcastle-labels" content="Beginner, Tutorials, Showcases">
<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
<script type="text/javascript">
require.config({
baseUrl : '../../../Source',
waitSeconds : 60
});
</script>
</head>
<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">

<style>
@import url(../templates/bucket.css);
</style>

<div id="cesiumContainer" class="fullSize"></div>
<div id="loadingOverlay"><h1>Loading...</h1></div>
<div id="toolbar"></div>

<script id="cesium_sandcastle_script">

function startup(Cesium) {
'use strict';

//Sandcastle_Begin
var viewer = new Cesium.Viewer('cesiumContainer', {
imageryProvider : new Cesium.ArcGisMapServerImageryProvider({
url : 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer'
}),
baseLayerPicker : false
});

var layers = viewer.imageryLayers;

var rawPalette = '-60 0 0 0 0\n\
-50 45 0 4\n\
-50 53 0 53\n\
-40 46 0 91\n\
-30 68 0 136\n\
-20 163 70 255\n\
-10 213 170 255\n\
0 255 255 255\n\
10 255 10 190\n\
20 72 0 83\n\
32 0 253 253\n\
35 88 177 164\n\
40 0 95 0\n\
50 0 197 5\n\
60 180 255 0\n\
65 255 250 78\n\
70 255 194 14\n\
80 255 126 10\n\
90 237 28 36\n\
100 107 0 0\n\
120 97 3 38';

var lines = rawPalette.split('\n');
var unsortedColors = {};
Array.prototype.forEach.call(lines, function(line, i){
var values = line.split(/\s+/);
if(values.length >= 4) {
var key = parseFloat(values[0]);
unsortedColors[key] = [];
unsortedColors[key][0] = parseInt(values[1]);
unsortedColors[key][1] = parseInt(values[2]);
unsortedColors[key][2] = parseInt(values[3]);
unsortedColors[key][3] = (typeof(values[4]) !== 'undefined' && values[4] !== '' ? parseInt(values[4]) : 255);
return true;
}
});

var sortedColors = [];
var i;
for (i in unsortedColors) {
if(unsortedColors.hasOwnProperty(i)) {
sortedColors.push([i, unsortedColors[i]]);
}
}
sortedColors.sort(function(a, b) {
return a[0] - b[0];
});

var options = {
tileWidth: 512,
tileHeight: 512,
url: 'http://cache.allisonhouse.com/maps/raw.php?model=rtma&run=201702082200&hour=1486591200000&layers=tmp_2m_0&x={x}&y={y}&z={z}&min={min}&max={max}',
palette: sortedColors,
min: sortedColors[0][0],
max: sortedColors[sortedColors.length-1][0]
};

var colorTableData = new Uint8Array(4096);
var palette = [];
var max = null;
var min = null;
var diff = null;
var currentVal = 0;
var currentValI = 0;
var prevVal = 0;
var diffVal = 1.0;
var nextColor = new Uint8Array(4);
var prevColor = new Uint8Array(4);

function setPalette(index, r, g, b, a) {
a = (typeof(a) !== 'undefined' ? a : 255);

var i = palette.length;

palette[i] = [];
palette[i].takeoff = [];
palette[i].approach = [];
palette[i].value = parseFloat(index);

palette[i].takeoff.red = r;
palette[i].takeoff.green = g;
palette[i].takeoff.blue = b;
palette[i].takeoff.alpha = a;

if(i > 0) {
palette[i].approach.red = r;
palette[i].approach.green = g;
palette[i].approach.blue = b;
palette[i].approach.alpha = a;
}

if(index < min || min === null) {
min = parseFloat(index);
}

if(index > max || max === null) {
max = parseFloat(index);
}
}

for(i = 0; i < sortedColors.length; i++) {
setPalette(sortedColors[i][0], sortedColors[i][1][0], sortedColors[i][1][1], sortedColors[i][1][2], sortedColors[i][1][3]);
}

diff = Math.abs(max - min);
currentVal = min;
prevVal = min;
var stepSize = diff / 1024;

for(i = 16; i < 4096; i += 4) {
while (currentVal >= palette[currentValI].value && (currentValI+1) < palette.length) {
prevColor[0] = palette[currentValI].takeoff.red;
prevColor[1] = palette[currentValI].takeoff.green;
prevColor[2] = palette[currentValI].takeoff.blue;
prevColor[3] = palette[currentValI].takeoff.alpha;
prevVal = palette[currentValI].value;
currentValI++;
diffVal = palette[currentValI].value - prevVal;
nextColor[0] = palette[currentValI].approach.red;
nextColor[1] = palette[currentValI].approach.green;
nextColor[2] = palette[currentValI].approach.blue;
nextColor[3] = palette[currentValI].approach.alpha;
}
if (currentVal >= palette[currentValI].value && (currentValI+1) >= palette.length) {
prevColor[0] = palette[currentValI].approach.red;
prevColor[1] = palette[currentValI].approach.green;
prevColor[2] = palette[currentValI].approach.blue;
prevColor[3] = palette[currentValI].approach.alpha;
prevVal = max;
currentVal = max;
diffVal = 1.0;
nextColor[0] = palette[currentValI].approach.red;
nextColor[1] = palette[currentValI].approach.green;
nextColor[2] = palette[currentValI].approach.blue;
nextColor[3] = palette[currentValI].approach.alpha;
}
colorTableData[i] = parseFloat(currentVal-prevVal) * (parseFloat(nextColor[0] - prevColor[0]) / diffVal) + prevColor[0];
colorTableData[i+1] = parseFloat(currentVal-prevVal) * parseFloat(nextColor[1] - prevColor[1]) / diffVal + prevColor[1];
colorTableData[i+2] = parseFloat(currentVal-prevVal) * parseFloat(nextColor[2] - prevColor[2]) / diffVal + prevColor[2];
colorTableData[i+3] = parseFloat(currentVal-prevVal) * parseFloat(nextColor[3] - prevColor[3]) / diffVal + prevColor[3];
currentVal += stepSize;
}

options.colorPalette = colorTableData;

var newLayer = new Cesium.CustomTemplateImageryProvider(options);

var layer = layers.addImageryProvider(newLayer);
layer.colorPalette = (Cesium.defined(newLayer._colorPalette) ? newLayer._colorPalette : []);

//Sandcastle_End
Sandcastle.finishedLoading();
}
if (typeof Cesium !== "undefined") {
startup(Cesium);
} else if (typeof require === "function") {
require(["Cesium"], startup);
}
</script>

</body>
</html>
12 changes: 12 additions & 0 deletions Source/Renderer/UniformState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ define([

this._fogDensity = undefined;

this._imageryColorPalette = 1.0;
this._imagerySplitPosition = 0.0;
this._pixelSizePerMeter = undefined;
this._geometricToleranceOverMeter = undefined;
Expand Down Expand Up @@ -800,6 +801,16 @@ define([
get : function() {
return this._imagerySplitPosition;
}
},

/**
* @memberof UniformState.prototype
* @type {Array}
*/
imageryColorPalette : {
get : function() {
return this._imageryColorPalette;
}
}
});

Expand Down Expand Up @@ -962,6 +973,7 @@ define([
this._temeToPseudoFixed = Transforms.computeTemeToPseudoFixedMatrix(frameState.time, this._temeToPseudoFixed);

this._imagerySplitPosition = frameState.imagerySplitPosition;
this._imageryColorPalette = frameState.imageryColorPalette;
var fov = camera.frustum.fov;
var viewport = this._viewport;
var pixelSizePerMeter;
Expand Down
Loading