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.

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

Pre-process Build #1296

Merged
merged 42 commits into from
Dec 18, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
31cd744
Comment out all developer errors in Context.
bagnell Nov 13, 2013
f355a06
Add preprocessing build target and script for file search/replace.
bagnell Nov 13, 2013
ec4607c
Revert previous changes in favor of using requirejs pragmas.
bagnell Nov 14, 2013
0d17867
Add debug pragmas to Cartesian2.
bagnell Nov 14, 2013
3b5541c
Add debug pragmas to Cartesian3.
bagnell Nov 14, 2013
4ddfa65
Add debug pragmas to the remaining cartesian types, the matrix types …
bagnell Nov 14, 2013
8dc5795
Exclude developer errors when debug build flag is false (not true.
bagnell Nov 14, 2013
0325683
Conditional include instead of conditionally exclude code.
bagnell Nov 14, 2013
4adde0e
Set default build option to be debug. Fix two unclosed debug regions.
bagnell Nov 15, 2013
c7e550a
Add targets to create preprocessed, combined (and minified) script.
bagnell Nov 15, 2013
b8ac66c
Fix formatting.
bagnell Nov 15, 2013
3ee361a
Added more pragma.debugs
pjcozzi Nov 15, 2013
83f5bc9
Generate AMD stubs to combined/minified Cesium.
bagnell Nov 21, 2013
cb10e2d
Run tests for combined/minified Cesium (mostly working).
bagnell Nov 21, 2013
93a311d
Fix the stub process for running specs.
shunter Nov 21, 2013
62b0a30
Fix JSHint warnings.
shunter Nov 21, 2013
ce6826e
Clean up warnings in generated files.
shunter Nov 21, 2013
7b2b20f
Rename.
bagnell Nov 22, 2013
6ee1059
Merge branch 'master' into preprocess
bagnell Nov 22, 2013
b72c7ed
Update after merge.
bagnell Nov 22, 2013
4367169
Merge branch 'master' into preprocess
pjcozzi Nov 24, 2013
64b27c2
Run tests with release version.
bagnell Nov 27, 2013
b27cc42
Fix renderer tests.
bagnell Nov 27, 2013
778239a
Merge branch 'master' into preprocess
bagnell Nov 27, 2013
468e385
Fix after merge.
bagnell Nov 27, 2013
e4830a2
Fix buildModuleUrl tests.
bagnell Nov 27, 2013
0a79522
Merge branch 'master' into preprocess
bagnell Nov 27, 2013
53a2eff
Override worker loader config in specs, so they work even with the co…
shunter Dec 2, 2013
6eaf40b
Update links on index page and the links generated by jasmine.
bagnell Dec 3, 2013
3670d65
Reuse targets by passing parameters. Add debug option to combined/min…
bagnell Dec 3, 2013
162611f
Generate debug unminified Cesium and release minified Cesium.
bagnell Dec 3, 2013
0a49546
Merge branch 'master' into preprocess
bagnell Dec 6, 2013
70465b3
Merge branch 'master' into preprocess
bagnell Dec 9, 2013
215c8b7
Merge branch 'master' into preprocess
bagnell Dec 11, 2013
9a844ac
Merge branch 'master' into preprocess
bagnell Dec 13, 2013
0083faf
Merge branch 'master' into preprocess
bagnell Dec 17, 2013
da88547
toThrowDeveloperError didn't work at all.
shunter Dec 18, 2013
65c371d
Reword text about running tests against combined/release files.
shunter Dec 18, 2013
b7c4257
Fix debug option so it's omitted correctly when pragmas.debug is not …
shunter Dec 18, 2013
2e9866d
Be more selective about files in Build to put in the zip file.
shunter Dec 18, 2013
213ec64
Add info about the lack of DeveloperErrors to CHANGES
shunter Dec 18, 2013
79903c0
Fix some path problems when building the zip file. Set pragmas.debug…
shunter Dec 18, 2013
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
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Beta Releases
* Breaking changes:
* Added `allowTextureFilterAnisotropic` (default: `true`) and `failIfMajorPerformanceCaveat` (default: `true`) properties to the `contextOption` property passed to `Viewer`, `CesiumWidget`, and `Scene` constructors and moved the existing properties to a new `webgl` sub-property. For example, code that looked like:

var viewer = new Viewer('cesiumContainer', {
var viewer = new Viewer('cesiumContainer', {
alpha : true
});

Expand All @@ -23,6 +23,7 @@ Beta Releases
* The CSS files for individual widgets, e.g. `BaseLayerPicker.css`, no longer import other CSS files. Most applications should import `widgets.css` (and optionally `lighter.css`).
* `SvgPath` has been replaced by a Knockout binding: `cesiumSvgPath`.
* `DynamicObject.availability` is now a `TimeIntervalCollection` instead of a `TimeInterval`.
* The minified, combined `Cesium.js` file now omits certain `DeveloperError` checks, to increase performance and reduce file size. When developing your application, we recommend using the unminified version locally for early error detection, then deploying the minified version to production.
* Added `CentralBody.maximumScreenSpaceError`.
* Added `translateEventTypes`, `zoomEventTypes`, `rotateEventTypes`, `tiltEventTypes`, and `lookEventTypes` properties to `ScreenSpaceCameraController` to change the default mouse inputs.
* Added `Billboard.setPixelOffsetScaleByDistance`, `Label.setPixelOffsetScaleByDistance`, `DynamicBillboard.pixelOffsetScaleByDistance`, and `DynamicLabel.pixelOffsetScaleByDistance` to control minimum/maximum pixelOffset scaling based on camera distance.
Expand Down
18 changes: 18 additions & 0 deletions Source/Core/BoundingSphere.js
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,11 @@ define([

stride = defaultValue(stride, 3);

//>>includeStart('debug', pragmas.debug);
if (stride < 3) {
throw new DeveloperError('stride must be 3 or greater.');
}
//>>includeEnd('debug');

var currentPos = fromPointsCurrentPos;
currentPos.x = positions[0] + center.x;
Expand Down Expand Up @@ -506,9 +508,11 @@ define([
* var sphere = BoundingSphere.fromCornerPoints(new Cartesian3(-0.5, -0.5, -0.5), new Cartesian3(0.5, 0.5, 0.5));
*/
BoundingSphere.fromCornerPoints = function(corner, oppositeCorner, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(corner) || !defined(oppositeCorner)) {
throw new DeveloperError('corner and oppositeCorner are required.');
}
//>>includeEnd('debug');

if (!defined(result)) {
result = new BoundingSphere();
Expand Down Expand Up @@ -537,9 +541,11 @@ define([
* var boundingSphere = BoundingSphere.fromEllipsoid(ellipsoid);
*/
BoundingSphere.fromEllipsoid = function(ellipsoid, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(ellipsoid)) {
throw new DeveloperError('ellipsoid is required.');
}
//>>includeEnd('debug');

if (!defined(result)) {
result = new BoundingSphere();
Expand Down Expand Up @@ -587,13 +593,15 @@ define([
* @exception {DeveloperError} right is required.
*/
BoundingSphere.union = function(left, right, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(left)) {
throw new DeveloperError('left is required.');
}

if (!defined(right)) {
throw new DeveloperError('right is required.');
}
//>>includeEnd('debug');

if (!defined(result)) {
result = new BoundingSphere();
Expand Down Expand Up @@ -628,13 +636,15 @@ define([
* @exception {DeveloperError} point is required.
*/
BoundingSphere.expand = function(sphere, point, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(sphere)) {
throw new DeveloperError('sphere is required.');
}

if (!defined(point)) {
throw new DeveloperError('point is required.');
}
//>>includeEnd('debug');

result = BoundingSphere.clone(sphere, result);

Expand Down Expand Up @@ -662,13 +672,15 @@ define([
* @exception {DeveloperError} plane is required.
*/
BoundingSphere.intersect = function(sphere, plane) {
//>>includeStart('debug', pragmas.debug);
if (!defined(sphere)) {
throw new DeveloperError('sphere is required.');
}

if (!defined(plane)) {
throw new DeveloperError('plane is required.');
}
//>>includeEnd('debug');

var center = sphere.center;
var radius = sphere.radius;
Expand Down Expand Up @@ -699,13 +711,15 @@ define([
* @exception {DeveloperError} transform is required.
*/
BoundingSphere.transform = function(sphere, transform, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(sphere)) {
throw new DeveloperError('sphere is required.');
}

if (!defined(transform)) {
throw new DeveloperError('transform is required.');
}
//>>includeEnd('debug');

if (!defined(result)) {
result = new BoundingSphere();
Expand Down Expand Up @@ -741,6 +755,7 @@ define([
* @exception {DeveloperError} direction is required.
*/
BoundingSphere.getPlaneDistances = function(sphere, position, direction, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(sphere)) {
throw new DeveloperError('sphere is required.');
}
Expand All @@ -752,6 +767,7 @@ define([
if (!defined(direction)) {
throw new DeveloperError('direction is required.');
}
//>>includeEnd('debug');

if (!defined(result)) {
result = new Interval();
Expand Down Expand Up @@ -789,9 +805,11 @@ define([
* @exception {DeveloperError} sphere is required.
*/
BoundingSphere.projectTo2D = function(sphere, projection, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(sphere)) {
throw new DeveloperError('sphere is required.');
}
//>>includeEnd('debug');

projection = defaultValue(projection, projectTo2DProjection);

Expand Down
Loading