-
Notifications
You must be signed in to change notification settings - Fork 284
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #42 from iSpring/develop
merge develop 0.4.4 to master
- Loading branch information
Showing
83 changed files
with
2,556 additions
and
1,373 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
/node_modules | ||
/buildOutput | ||
/src/**/*.js | ||
index.html |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
{ | ||
"editor.renderWhitespace": "boundary", | ||
"typescript.check.workspaceVersion": false | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import Kernel = require("./src/world/Kernel"); | ||
import Globe = require("./src/world/Globe"); | ||
|
||
(function () { | ||
var canvas = <HTMLCanvasElement>document.getElementById("canvasId"); | ||
var globe = new Globe(canvas); | ||
(<any>window).globe = globe; | ||
(<any>window).kernel = Kernel; | ||
})(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,44 @@ | ||
{ | ||
"name": "webglobe", | ||
"version": "0.3.3", | ||
"description": "A WebGL virtual globe and map engine.", | ||
"main": "require.js", | ||
"scripts": { | ||
"clear": "gulp clear", | ||
"compile": "gulp compile", | ||
"bundle": "gulp bundle", | ||
"build": "gulp build", | ||
"start": "npm run build" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "git+https://github.com/iSpring/WebGlobe.git" | ||
}, | ||
"keywords": [ | ||
"WebGL", | ||
"Map", | ||
"Globe", | ||
"Earth", | ||
"3D", | ||
"HTML5" | ||
], | ||
"author": "iSpring", | ||
"license": "ISC", | ||
"bugs": { | ||
"url": "https://github.com/iSpring/WebGlobe/issues" | ||
}, | ||
"homepage": "https://github.com/iSpring/WebGlobe#readme", | ||
"devDependencies": { | ||
"gulp": "^3.9.1", | ||
"gulp-concat": "^2.6.0", | ||
"gulp-typescript": "^3.0.2", | ||
"gulp-uglify": "^2.0.0", | ||
"requirejs": "^2.3.2", | ||
"rmdir": "^1.2.0", | ||
"typescript": "^2.0.3" | ||
} | ||
} | ||
"name": "webglobe", | ||
"version": "0.4.4", | ||
"description": "A WebGL virtual globe and map engine.", | ||
"main": "require.js", | ||
"scripts": { | ||
"clear": "rimraf buildOutput", | ||
"prebuild:dev": "npm run clear", | ||
"build:dev": "cross-env NODE_ENV=development webpack --progress --colors", | ||
"prebuild:prod": "npm run clear", | ||
"build:prod": "cross-env NODE_ENV=production webpack --progress --colors", | ||
"start": "npm run build:dev" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "git+https://github.com/iSpring/WebGlobe.git" | ||
}, | ||
"keywords": [ | ||
"WebGL", | ||
"Map", | ||
"Globe", | ||
"Earth", | ||
"3D", | ||
"HTML5" | ||
], | ||
"author": "iSpring", | ||
"license": "ISC", | ||
"bugs": { | ||
"url": "https://github.com/iSpring/WebGlobe/issues" | ||
}, | ||
"homepage": "https://github.com/iSpring/WebGlobe#readme", | ||
"devDependencies": { | ||
"cross-env": "^3.1.3", | ||
"ejs-loader": "^0.3.0", | ||
"html-webpack-plugin": "^2.26.0", | ||
"rimraf": "^2.5.4", | ||
"ts-loader": "^1.3.3", | ||
"typescript": "^2.0.3", | ||
"webpack": "^1.14.0" | ||
}, | ||
"dependencies": { | ||
"es6-promise": "^4.0.5" | ||
} | ||
} |
Oops, something went wrong.