Skip to content

Commit

Permalink
AnalyticalGraphicsInc -> CesiumGS
Browse files Browse the repository at this point in the history
  • Loading branch information
lilleyse committed Feb 18, 2020
1 parent 2122f73 commit 1a812cc
Show file tree
Hide file tree
Showing 47 changed files with 61 additions and 493 deletions.
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
All the tools are licensed with the Apache 2.0 license. Check the LICENSE.md in each directory for more information on third-party libraries.

Copyright 2016-2017 Analytical Graphics, Inc. and Contributors
Copyright 2016-2020 CesiumGS, Inc. and Contributors

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -190,7 +190,7 @@ Copyright 2016-2017 Analytical Graphics, Inc. and Contributors
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2016-2017 Analytical Graphics, Inc. and Contributors
Copyright 2016-2020 Cesium GS, Inc. and Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<p align="center"><img src="figures/Cesium3DTiles.png" /></p>

Validator and sample data for [3D Tiles](https://github.com/AnalyticalGraphicsInc/3d-tiles/blob/master/README.md) tilesets.
Validator and sample data for [3D Tiles](https://github.com/CesiumGS/3d-tiles/blob/master/README.md) tilesets.

| Tool | Description |
| :--- | :--- |
| [3D Tiles Validator](./validator/) | Open source Node.js library and command-line tools for validating that a tileset conforms to the 3D Tiles specification. |
| [3D Tiles Samples](./samples-generator/) | Open source command-line tools for generating sample 3D Tiles in [3d-tiles-samples](https://github.com/AnalyticalGraphicsInc/3d-tiles-samples) |
| [3D Tiles Samples](./samples-generator/) | Open source command-line tools for generating sample 3D Tiles in [3d-tiles-samples](https://github.com/CesiumGS/3d-tiles-samples) |

Created by the <a href="http://cesiumjs.org/">Cesium team</a> and University of Pennsylvania students.
Created by the <a href="https://cesium.com/">Cesium team</a> and University of Pennsylvania students.

To generate new 3D tilesets, see [Cesium ion](https://cesium.com/ion/).

## Contributions

Pull requests are appreciated! Please use the same [Contributor License Agreement (CLA)](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md) and [Coding Guide](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Documentation/Contributors/CodingGuide/README.md) used for [Cesium](http://cesiumjs.org/).
Pull requests are appreciated! Please use the same [Contributor License Agreement (CLA)](https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md) and [Coding Guide](https://github.com/CesiumGS/cesium/blob/master/Documentation/Contributors/CodingGuide/README.md) used for [CesiumJS](https://cesium.com/cesiumjs/).

---

<p align="center">
<a href="http://cesiumjs.org/"><img src="figures/cesium.png" /></a>
<a href="https://cesium.com/"><img src="figures/cesium.png" /></a>
</p>
15 changes: 0 additions & 15 deletions samples-generator/.idea/3d-tiles-samples-generator.iml

This file was deleted.

6 changes: 0 additions & 6 deletions samples-generator/.idea/encodings.xml

This file was deleted.

7 changes: 0 additions & 7 deletions samples-generator/.idea/jsLibraryMappings.xml

This file was deleted.

85 changes: 0 additions & 85 deletions samples-generator/.idea/jsLinters/jshint.xml

This file was deleted.

8 changes: 0 additions & 8 deletions samples-generator/.idea/libraries/TypeScriptDefinitions.xml

This file was deleted.

16 changes: 0 additions & 16 deletions samples-generator/.idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions samples-generator/.idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions samples-generator/.idea/vcs.xml

This file was deleted.

14 changes: 7 additions & 7 deletions samples-generator/LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2016-2017 Analytical Graphics, Inc. and Contributors
Copyright 2016-2020 Cesium GS, Inc. and Contributors

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -188,7 +188,7 @@ Copyright 2016-2017 Analytical Graphics, Inc. and Contributors
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2016-2017 Analytical Graphics, Inc. and Contributors
Copyright 2016-2020 Cesium GS, Inc. and Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -233,19 +233,19 @@ https://www.npmjs.com/package/bluebird
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> THE SOFTWARE.
### Cesium
### CesiumJS

http://cesiumjs.org/
https://cesium.com/cesiumjs/

> Copyright 2011-2016 Cesium Contributors
> Copyright 2011-2020 CesiumJS Contributors
>
> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
>
> http://www.apache.org/licenses/LICENSE-2.0
>
> Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
See https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
See https://github.com/CesiumGS/cesium/blob/master/LICENSE.md

### fs-extra

Expand All @@ -271,7 +271,7 @@ https://www.npmjs.com/package/fs-extra

https://www.npmjs.com/package/gltf-pipeline

> Copyright 2015-2016 Richard Lee, Analytical Graphics, Inc., and Contributors
> Copyright 2015-2020 Richard Lee, Cesium GS, Inc., and Contributors
>
> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
>
Expand Down
8 changes: 4 additions & 4 deletions samples-generator/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 3D Tiles Samples Generator

The tilesets generated here are included in [3d-tiles-samples](https://github.com/AnalyticalGraphicsInc/3d-tiles-samples) and [Cesium](https://github.com/AnalyticalGraphicsInc/cesium).
The tilesets generated here are included in [3d-tiles-samples](https://github.com/CesiumGS/3d-tiles-samples) and [Cesium](https://github.com/CesiumGS/cesium).

## Instructions

Expand All @@ -12,7 +12,7 @@ npm install
node bin/3d-tiles-samples-generator.js
```

This commands generates a set of tilesets and saves them in a folder called `output`. The `Batched`, `Composite`, `Instanced`, `PointCloud`, and `Tilesets` folders may be copied directly to Cesium's `Specs/Data/Cesium3DTiles/` folder for testing with Cesium. The tilesets in the `Samples` folder may be copied to the `tilesets` folder in `3d-tiles-samples`.
This commands generates a set of tilesets and saves them in a folder called `output`. The `Batched`, `Composite`, `Instanced`, `PointCloud`, and `Tilesets` folders may be copied directly to CesiumJS's `Specs/Data/Cesium3DTiles/` folder for testing with CesiumJS. The tilesets in the `Samples` folder may be copied to the `tilesets` folder in `3d-tiles-samples`.

Run the tests:
```
Expand All @@ -29,10 +29,10 @@ npm run eslint-watch

## Contributions

Pull requests are appreciated! Please use the same [Contributor License Agreement (CLA)](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md) and [Coding Guide](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Documentation/Contributors/CodingGuide/README.md) used for [Cesium](http://cesiumjs.org/).
Pull requests are appreciated! Please use the same [Contributor License Agreement (CLA)](https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md) and [Coding Guide](https://github.com/CesiumGS/cesium/blob/master/Documentation/Contributors/CodingGuide/README.md) used for [CesiumJS](https://cesium.com/cesiumjs/).

---

<p align="center">
<a href="http://cesiumjs.org/"><img src="doc/cesium.png" onerror="this.src='cesium.png'"/></a>
<a href="https://cesium.com/"><img src="doc/cesium.png" onerror="this.src='cesium.png'"/></a>
</p>
4 changes: 2 additions & 2 deletions samples-generator/lib/createBuildings.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function createRandomBuildings(options) {
CesiumMath.setRandomNumberSeed(seed);
var materials = new Array(numberOfBuildings);
for (i = 0; i < numberOfBuildings; ++i) {
// For Cesium testing purposes make the first building red
// For CesiumJS testing purposes make the first building red
var useRedMaterial = (baseColorType === 'color') && (translucencyType === 'opaque') && i === 0;
var randomMaterial = getMaterial(baseColorType, translucencyType, i, numberOfBuildings);
materials[i] = useRedMaterial ? redMaterial : randomMaterial;
Expand All @@ -146,7 +146,7 @@ function createRandomBuildings(options) {
var rangeX = CesiumMath.nextRandomNumber() - 0.5;
var rangeY = CesiumMath.nextRandomNumber() - 0.5;

// For Cesium testing purposes always place one building in the center of the tile
// For CesiumJS testing purposes, always place one building in the center of the tile and make it red
if (i === 0) {
rangeX = 0.0;
rangeY = 0.0;
Expand Down
2 changes: 1 addition & 1 deletion samples-generator/lib/createGltf.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function createGltf(options) {

// Models are z-up, so add a z-up to y-up transform.
// The glTF spec defines the y-axis as up, so this is the default behavior.
// In Cesium a y-up to z-up transform is applied later so that the glTF and 3D Tiles coordinate systems are consistent
// In CesiumJS a y-up to z-up transform is applied later so that the glTF and 3D Tiles coordinate systems are consistent
var rootMatrix = [1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1];

var i;
Expand Down
10 changes: 5 additions & 5 deletions samples-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
"license": "Apache-2.0",
"description": "Tools for generating sample 3D Tiles tilesets.",
"author": {
"name": "Analytical Graphics, Inc. and Contributors",
"url": "https://github.com/AnalyticalGraphicsInc/3d-tiles-tools/graphs/contributors"
"name": "Cesium GS, Inc. and Contributors",
"url": "https://github.com/CesiumGS/3d-tiles-validator/graphs/contributors"
},
"keywords": [
"3D Tiles"
],
"homepage": "https://github.com/AnalyticalGraphicsInc/3d-tiles-tools",
"homepage": "https://github.com/CesiumGS/3d-tiles-validator",
"repository": {
"type": "git",
"url": "https://github.com/AnalyticalGraphicsInc/3d-tiles-tools.git"
"url": "https://github.com/CesiumGS/3d-tiles-validator.git"
},
"bugs": {
"url": "https://github.com/AnalyticalGraphicsInc/3d-tiles-tools/issues"
"url": "https://github.com/CesiumGS/3d-tiles-validator/issues"
},
"main": "index.js",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion samples-generator/specs/matchers/addDefaultMatchers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//This file is a copy of https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Specs/addDefaultMatchers.js
//This file is a copy of https://github.com/CesiumGS/cesium/blob/master/Specs/addDefaultMatchers.js
/*eslint strict: ["error", "function"]*/
/*eslint-env amd*/
/*eslint-disable no-unused-vars*/
Expand Down
2 changes: 1 addition & 1 deletion samples-generator/specs/matchers/equals.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//This file is a copy of https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Specs/equals.js
//This file is a copy of https://github.com/CesiumGS/cesium/blob/master/Specs/equals.js
/*eslint strict: ["error", "function"]*/
/*eslint-env amd*/
define([
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//This file is a copy of https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Specs/equalsMethodEqualityTester.js
//This file is a copy of https://github.com/CesiumGS/cesium/blob/master/Specs/equalsMethodEqualityTester.js
/*eslint strict: ["error", "function"]*/
/*eslint-env amd*/
define([
Expand Down
6 changes: 0 additions & 6 deletions tools/.idea/encodings.xml

This file was deleted.

6 changes: 0 additions & 6 deletions tools/.idea/jsLibraryMappings.xml

This file was deleted.

Loading

0 comments on commit 1a812cc

Please sign in to comment.