make Atmosphere basically work,#16

iSpring · Dec 1, 2016 · bf74219 · bf74219
1 parent f93b197
commit bf74219
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 16 deletions.
diff --git a/main.js b/main.js
@@ -1,9 +1,9 @@
 window.onload = function() {
   require(["world/Kernel", "world/Globe", "world/layers/BingTiledLayer", "world/layers/NokiaTiledLayer", "world/layers/OsmTiledLayer",
-  "world/layers/SosoTiledLayer", "world/layers/TiandituTiledLayer", "world/layers/GoogleTiledLayer",
+  "world/layers/SosoTiledLayer", "world/layers/TiandituTiledLayer", "world/layers/GoogleTiledLayer", "world/graphics/Atmosphere",
   "world/layers/PoiLayer"],
     function(Kernel, Globe, BingTiledLayer, NokiaTiledLayer, OsmTiledLayer, SosoTiledLayer, TiandituTiledLayer, GoogleTiledLayer,
-    PoiLayer) {
+    Atmosphere, PoiLayer) {
 
       window.Kernel = Kernel;
 
@@ -15,6 +15,10 @@
         mapSelector.onchange = changeTiledLayer;
         changeTiledLayer();
 
+        var atmosphere = Atmosphere.getInstance();
+
+        window.globe.scene.add(atmosphere);
+
         var poiLayer = new PoiLayer();
         window.globe.scene.add(poiLayer);
       }

diff --git a/src/world/Globe.ts b/src/world/Globe.ts
@@ -24,7 +24,7 @@ class Globe {
     this.renderer = Kernel.renderer = new Renderer(canvas);
     this.scene = new Scene();
     var radio = canvas.width / canvas.height;
-    this.camera = new Camera(30, radio, 1, Kernel.EARTH_RADIUS * 2);
+    this.camera = new Camera(30, radio, 1, Kernel.EARTH_RADIUS * 4);
     this.renderer.setScene(this.scene);
     this.renderer.setCamera(this.camera);
     this.setLevel(0);
@@ -66,7 +66,7 @@ class Globe {
           url: ""
         };
         args.url = this.tiledLayer.getImageUrl(args.level, args.row, args.column);
-        var tile = Tile.getTile(args.level, args.row, args.column, args.url);
+        var tile = Tile.getInstance(args.level, args.row, args.column, args.url);
         subLayer1.add(tile);
       }
     }

diff --git a/src/world/geometries/Atmosphere.ts b/src/world/geometries/Atmosphere.ts
@@ -8,9 +8,9 @@ import Vertice = require("../math/Vertice");
 import Matrix = require("../math/Matrix");
 
 class Atmosphere  extends Mesh {
-  private readonly segment: number = 36;
+  private readonly segment: number = 360;
   private readonly radius1: number = Kernel.EARTH_RADIUS;
-  private readonly radius2: number = Kernel.EARTH_RADIUS * 1.2;
+  private readonly radius2: number = Kernel.EARTH_RADIUS * 1.01;
 
   constructor() {
     super();
@@ -29,7 +29,7 @@ class Atmosphere  extends Mesh {
     mat2.setColumnTrans(0, this.radius2, 0);
     var meshVertices2: MeshVertice[] = [];
 
-    var deltaRadian: number = Math.PI * 2 / this.segment;
+    var deltaRadian: number = - Math.PI * 2 / this.segment;
     var deltaS: number = 1.0 / this.segment;
     var u: number = 0;
 
@@ -64,6 +64,8 @@ class Atmosphere  extends Mesh {
       mat1.worldRotateZ(deltaRadian);
       mat2.worldRotateZ(deltaRadian);
     }
+
+    this.vertices.push(...meshVertices1, ...meshVertices2);
   }
 }
 

diff --git a/src/world/graphics/Atmosphere.ts b/src/world/graphics/Atmosphere.ts
@@ -1,18 +1,23 @@
-///<amd-module name="world/graphics/Poi"/>
+///<amd-module name="world/graphics/Atmosphere"/>
 
 import Kernel = require("../Kernel");
 import MeshGraphic = require('./MeshGraphic');
-import Marker = require('../geometries/Marker');
+import AtmosphereGeometry = require("../geometries/Atmosphere");
 import MeshTextureMaterial = require('../materials/MeshTextureMaterial');
-import Program = require("../Program");
 import Camera from "../Camera";
-import AtmosphereGeometry = require("../geometries/Atmosphere");
 
 class Atmosphere extends MeshGraphic {
-    constructor(public geometry: AtmosphereGeometry, public material: MeshTextureMaterial){
+    private constructor(public geometry: AtmosphereGeometry, public material: MeshTextureMaterial){
         super(geometry, material);
     }
 
+    static getInstance(): Atmosphere{
+        var geometry = new AtmosphereGeometry();
+        var imageUrl = "/WebGlobe/src/world/images/atmosphere64.png";
+        var material = new MeshTextureMaterial(imageUrl, false);
+        return new Atmosphere(geometry, material);
+    }
+
     onDraw(camera: Camera){
         super.onDraw(camera);
         // var gl = Kernel.gl;

diff --git a/src/world/graphics/Tile.ts b/src/world/graphics/Tile.ts
@@ -151,11 +151,11 @@ class TileInfo {
 class Tile extends MeshGraphic {
   subTiledLayer: any;
 
-  constructor(public geometry: TileGeometry, public material: TileMaterial, public tileInfo: TileInfo) {
+  private constructor(public geometry: TileGeometry, public material: TileMaterial, public tileInfo: TileInfo) {
     super(geometry, material);
   }
 
-  static getTile(level: number, row: number, column: number, url: string) {
+  static getInstance(level: number, row: number, column: number, url: string) {
     var tileInfo = new TileInfo(level, row, column, url);
     return new Tile(tileInfo.geometry, tileInfo.material, tileInfo);
   }

diff --git a/src/world/layers/SubTiledLayer.ts b/src/world/layers/SubTiledLayer.ts
@@ -96,7 +96,7 @@ class SubTiledLayer extends GraphicGroup {
           url: ""
         };
         args.url = this.tiledLayer.getImageUrl(args.level, args.row, args.column);
-        tile = Tile.getTile(args.level, args.row, args.column, args.url);
+        tile = Tile.getInstance(args.level, args.row, args.column, args.url);
         this.add(tile);
       }
     }

diff --git a/src/world/materials/MeshTextureMaterial.ts b/src/world/materials/MeshTextureMaterial.ts
@@ -13,7 +13,7 @@ class MeshTextureMaterial extends Material {
     private ready:boolean = false;
     private deleted: boolean = false;
 
-    constructor(imageOrUrl?: ImageType, public flipY: boolean = true) {
+    constructor(imageOrUrl: ImageType = null, public flipY: boolean = true) {
         super();
         this.texture = Kernel.gl.createTexture();
         if(imageOrUrl){