Skip to content
This repository has been archived by the owner on Nov 4, 2020. It is now read-only.

Commit

Permalink
Merge pull request #26 from oterral/c2c_patches_vector_tiles_labels
Browse files Browse the repository at this point in the history
update c2c/c2c_patches_vector_tiles_labels with cesium/vector-tiles-labels
  • Loading branch information
gberaudo authored Jan 18, 2017
2 parents 1bb7702 + ef25265 commit 3dddac5
Show file tree
Hide file tree
Showing 439 changed files with 19,354 additions and 8,772 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# http://editorconfig.org
root = true

[*]
indent_style = space
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
13 changes: 0 additions & 13 deletions .idea/misc.xml

This file was deleted.

2 changes: 0 additions & 2 deletions Apps/CesiumViewer/CesiumViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ define([
'Cesium/Core/Color',
'Cesium/Core/defined',
'Cesium/Core/formatError',
'Cesium/Core/getFilenameFromUri',
'Cesium/Core/Math',
'Cesium/Core/Rectangle',
'Cesium/Core/objectToQuery',
Expand All @@ -29,7 +28,6 @@ define([
Color,
defined,
formatError,
getFilenameFromUri,
CesiumMath,
Rectangle,
objectToQuery,
Expand Down
19 changes: 16 additions & 3 deletions Apps/Sandcastle/CesiumSandcastle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*global require,Blob,JSHINT*/
/*global gallery_demos*/// defined by gallery/gallery-index.js, created by build
/*global hello_world_index*/// defined in gallery/gallery-index.js, created by build
/*global sandcastleJsHintOptions*/// defined by jsHintOptions.js, created by build
require({
baseUrl : '../../Source',
Expand Down Expand Up @@ -138,6 +139,7 @@ require({
var subtabs = {};
var docError = false;
var galleryError = false;
var notFound = false;
var galleryTooltipTimer;
var activeGalleryTooltipDemo;
var demoTileHeightRule = findCssStyle('.demoTileThumbnail');
Expand Down Expand Up @@ -305,7 +307,7 @@ require({
var selectedTabName = registry.byId('innerPanel').selectedChildWidget.title;
var suffix = selectedTabName + 'Demos';
if (selectedTabName === 'All') {
suffix = '';
suffix = 'all';
} else if (selectedTabName === 'Search Results') {
suffix = 'searchDemo';
}
Expand Down Expand Up @@ -693,6 +695,7 @@ require({
}

function loadFromGallery(demo) {
notFound = false;
document.getElementById('saveAsFile').download = demo.name + '.html';
registry.byId('description').set('value', decodeHTML(demo.description).replace(/\\n/g, '\n'));
registry.byId('label').set('value', decodeHTML(demo.label).replace(/\\n/g, '\n'));
Expand Down Expand Up @@ -803,6 +806,9 @@ require({
if (galleryError) {
appendConsole('consoleError', 'Error loading gallery, please run the build script.', true);
}
if (notFound) {
appendConsole('consoleLog', 'Unable to load demo named ' + queryObject.src.replace('.html', '') + '\n', true);
}
}
} else if (Cesium.defined(e.data.log)) {
// Console log messages from the iframe display in Sandcastle.
Expand Down Expand Up @@ -1054,8 +1060,15 @@ require({
url : 'gallery/' + name + '.html',
handleAs : 'text',
error : function(error) {
appendConsole('consoleError', error, true);
galleryError = true;
if (error.status === 404) {
loadFromGallery(gallery_demos[hello_world_index])
.then(function() {
notFound = true;
});
} else {
galleryError = true;
appendConsole('consoleError', error, true);
}
}
});
}
Expand Down
242 changes: 242 additions & 0 deletions Apps/Sandcastle/gallery/3D Models Coloring.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
<!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="Change color of 3D models.">
<meta name="cesium-sandcastle-labels" content="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);
#toolbar {
background: rgba(42, 42, 42, 0.8);
padding: 4px;
border-radius: 4px;
}
#toolbar input {
vertical-align: middle;
padding-top: 2px;
padding-bottom: 2px;
}
#toolbar .header {
font-weight: bold;
}
</style>
<div id="cesiumContainer" class="fullSize"></div>
<div id="loadingOverlay"><h1>Loading...</h1></div>
<div id="toolbar">
<table><tbody>
<tr><td class="header">Model Color</td></tr>
<tr>
<td>Mode</td>
<td><select data-bind="options: colorBlendModes, value: colorBlendMode"></select></td>
</tr>
<tr>
<td>Color</td>
<td><select data-bind="options: colors, value: color"></select></td>
</tr>
<tr>
<td>Alpha</td>
<td>
<input type="range" min="0.0" max="1.0" step="0.01" data-bind="value: alpha, valueUpdate: 'input'">
<input type="text" size="5" data-bind="value: alpha">
</td>
</tr>
<tr>
<td data-bind="style: { color: colorBlendAmountEnabled ? '' : 'gray'}">Mix</td>
<td>
<input type="range" min="0.0" max="1.0" step="0.01" data-bind="value: colorBlendAmount, valueUpdate: 'input', enable: colorBlendAmountEnabled">
<input type="text" size="5" data-bind="value: colorBlendAmount, enable: colorBlendAmountEnabled">
</td>
</tr>
<tr><td class="header">Model Silhouette</td></tr>
<tr>
<td>Color</td>
<td><select data-bind="options: silhouetteColors, value: silhouetteColor"></select></td>
</tr>
<tr>
<td>Alpha</td>
<td>
<input type="range" min="0.0" max="1.0" step="0.01" data-bind="value: silhouetteAlpha, valueUpdate: 'input'">
<input type="text" size="5" data-bind="value: silhouetteAlpha">
</td>
</tr>
<tr>
<td>Size</td>
<td>
<input type="range" min="0.0" max="10.0" step="0.01" data-bind="value: silhouetteSize, valueUpdate: 'input'">
<input type="text" size="5" data-bind="value: silhouetteSize">
</td>
</tr>
</tbody></table>
</div>
<script id="cesium_sandcastle_script">
function startup(Cesium) {
'use strict';
//Sandcastle_Begin
var viewer = new Cesium.Viewer('cesiumContainer', {
infoBox : false,
selectionIndicator : false,
shadows : true
});

var entity;

function getColorBlendMode(colorBlendMode) {
return Cesium.ColorBlendMode[colorBlendMode.toUpperCase()];
}

function getColor(colorName, alpha) {
var color = Cesium.Color[colorName.toUpperCase()];
return Cesium.Color.fromAlpha(color, parseFloat(alpha));
}

// The viewModel tracks the state of our mini application.
var viewModel = {
color : 'Red',
colors : ['White', 'Red', 'Green', 'Blue', 'Yellow', 'Gray'],
alpha : 1.0,
colorBlendMode : 'Highlight',
colorBlendModes : ['Highlight', 'Replace', 'Mix'],
colorBlendAmount : 0.5,
colorBlendAmountEnabled : false,
silhouetteColor : 'Red',
silhouetteColors : ['Red', 'Green', 'Blue', 'Yellow', 'Gray'],
silhouetteAlpha : 1.0,
silhouetteSize : 2.0
};

// Convert the viewModel members into knockout observables.
Cesium.knockout.track(viewModel);

// Bind the viewModel to the DOM elements of the UI that call for it.
var toolbar = document.getElementById('toolbar');
Cesium.knockout.applyBindings(viewModel, toolbar);

Cesium.knockout.getObservable(viewModel, 'color').subscribe(
function(newValue) {
entity.model.color = getColor(newValue, viewModel.alpha);
}
);

Cesium.knockout.getObservable(viewModel, 'alpha').subscribe(
function(newValue) {
entity.model.color = getColor(viewModel.color, newValue);
}
);

Cesium.knockout.getObservable(viewModel, 'colorBlendMode').subscribe(
function(newValue) {
var colorBlendMode = getColorBlendMode(newValue);
entity.model.colorBlendMode = colorBlendMode;
viewModel.colorBlendAmountEnabled = (colorBlendMode === Cesium.ColorBlendMode.MIX);
}
);

Cesium.knockout.getObservable(viewModel, 'colorBlendAmount').subscribe(
function(newValue) {
entity.model.colorBlendAmount = parseFloat(newValue);
}
);

Cesium.knockout.getObservable(viewModel, 'silhouetteColor').subscribe(
function(newValue) {
entity.model.silhouetteColor = getColor(newValue, viewModel.silhouetteAlpha);
}
);

Cesium.knockout.getObservable(viewModel, 'silhouetteAlpha').subscribe(
function(newValue) {
entity.model.silhouetteColor = getColor(viewModel.silhouetteColor, newValue);
}
);

Cesium.knockout.getObservable(viewModel, 'silhouetteSize').subscribe(
function(newValue) {
entity.model.silhouetteSize = parseFloat(newValue);
}
);

function createModel(url, height) {
viewer.entities.removeAll();

var position = Cesium.Cartesian3.fromDegrees(-123.0744619, 44.0503706, height);
var heading = Cesium.Math.toRadians(135);
var pitch = 0;
var roll = 0;
var hpr = new Cesium.HeadingPitchRoll(heading, pitch, roll);
var orientation = Cesium.Transforms.headingPitchRollQuaternion(position, hpr);

entity = viewer.entities.add({
name : url,
position : position,
orientation : orientation,
model : {
uri : url,
minimumPixelSize : 128,
maximumScale : 20000,
color : getColor(viewModel.color, viewModel.alpha),
colorBlendMode : getColorBlendMode(viewModel.colorBlendMode),
colorBlendAmount : parseFloat(viewModel.colorBlendAmount),
silhouetteColor : getColor(viewModel.silhouetteColor, viewModel.silhouetteAlpha),
silhouetteSize : parseFloat(viewModel.silhouetteSize)
}
});
viewer.trackedEntity = entity;
}

var options = [{
text : 'Aircraft',
onselect : function() {
createModel('../../SampleData/models/CesiumAir/Cesium_Air.glb', 5000.0);
}
}, {
text : 'Ground vehicle',
onselect : function() {
createModel('../../SampleData/models/CesiumGround/Cesium_Ground.glb', 0);
}
}, {
text : 'Hot Air Balloon',
onselect : function() {
createModel('../../SampleData/models/CesiumBalloon/CesiumBalloon.glb', 1000.0);
}
}, {
text : 'Milk truck',
onselect : function() {
createModel('../../SampleData/models/CesiumMilkTruck/CesiumMilkTruck-kmc.glb', 0);
}
}, {
text : 'Skinned character',
onselect : function() {
createModel('../../SampleData/models/CesiumMan/Cesium_Man.glb', 0);
}
}];

Sandcastle.addToolbarMenu(options);

Sandcastle.addToggleButton('Shadows', viewer.shadows, function(checked) {
viewer.shadows = checked;
});

//Sandcastle_End
Sandcastle.finishedLoading();
}
if (typeof Cesium !== "undefined") {
startup(Cesium);
} else if (typeof require === "function") {
require(["Cesium"], startup);
}
</script>
</body>
</html>
Binary file added Apps/Sandcastle/gallery/3D Models Coloring.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/3D Models.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@
}
</script>
</body>
</html>
</html>
Loading

0 comments on commit 3dddac5

Please sign in to comment.