Merge pull request #187 from iTowns/ThreeV80

Change Three v79 to v80

package.json

@@ -28,7 +28,7 @@
     "paralleljs": "^0.2.1",
     "simd": "^2.0.0",
     "string_format": "^0.0.6",
-    "three": "^0.79.0",
+    "three": "^0.80.0",
     "whatwg-fetch": "^1.0.0",
     "custom-event": "^1.0.0"
   },

src/Core/Commander/Providers/BuildingBox_Provider.js

@@ -16,7 +16,7 @@
 // TODO , will use WFS_Provider
 import Provider from 'Core/Commander/Providers/Provider';
 import WFS_Provider from 'Core/Commander/Providers/WFS_Provider';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import Ellipsoid from 'Core/Math/Ellipsoid';
 import GeoCoordinate,{UNIT} from 'Core/Geographic/GeoCoordinate';
 import CVML from 'Core/Math/CVML';

src/Core/Commander/Providers/GpxUtils.js

@@ -4,7 +4,7 @@
  * Description: Parse Gpx file to get [lat, lon, alt]
  */
 
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import IoDriverXML from 'Core/Commander/Providers/IoDriverXML';
 import GeoCoordinate,{UNIT} from 'Core/Geographic/GeoCoordinate';
 import ItownsLine from 'Core/Commander/Providers/ItownsLine';

src/Core/Commander/Providers/ItownsLine.js

@@ -1,4 +1,4 @@
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import ItownsLineMaterial from 'Renderer/ItownsLineMaterial';
 
 var ItownsLine = function(options){

src/Core/Commander/Providers/ItownsPoint.js

@@ -1,4 +1,4 @@
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import ItownsPointMaterial from 'Renderer/ItownsPointMaterial';
 
 

src/Core/Commander/Providers/KML_Provider.js

@@ -7,7 +7,7 @@
 
 import Provider from 'Core/Commander/Providers/Provider';
 import IoDriverXML from 'Core/Commander/Providers/IoDriverXML';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import KMZLoader from 'Renderer/ThreeExtented/KMZLoader';
 import BasicMaterial from 'Renderer/BasicMaterial';
 

src/Core/Commander/Providers/PanoramicProvider.js

@@ -9,7 +9,7 @@
 
 /* global Promise*/
 
-import THREE from 'three';
+import * as THREE from 'THREE';
 import Provider from 'Core/Commander/Providers/Provider';
 import BuildingBox_Provider from 'Core/Commander/Providers/BuildingBox_Provider';
 import ProjectiveTexturingMaterial from 'Renderer/ProjectiveTexturingMaterial';

src/Core/Commander/Providers/WMS_Provider.js

@@ -10,7 +10,7 @@ import IoDriver_XBIL from 'Core/Commander/Providers/IoDriver_XBIL';
 import IoDriver_Image from 'Core/Commander/Providers/IoDriver_Image';
 import IoDriverXML from 'Core/Commander/Providers/IoDriverXML';
 import defaultValue from 'Core/defaultValue';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import Projection from 'Core/Geographic/Projection';
 import CacheRessource from 'Core/Commander/Providers/CacheRessource';
 import mE from 'Core/Math/MathExtented';

src/Core/Commander/Providers/WMTS_Provider.js

@@ -11,7 +11,7 @@ import CoordWMTS from 'Core/Geographic/CoordWMTS';
 import IoDriver_XBIL from 'Core/Commander/Providers/IoDriver_XBIL';
 import IoDriver_Image from 'Core/Commander/Providers/IoDriver_Image';
 import IoDriverXML from 'Core/Commander/Providers/IoDriverXML';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import CacheRessource from 'Core/Commander/Providers/CacheRessource';
 
 function WMTS_Provider(options) {

src/Core/Geographic/Projection.js

@@ -7,7 +7,7 @@
 import CoordWMTS from 'Core/Geographic/CoordWMTS';
 import MathExt from 'Core/Math/MathExtented';
 import GeoCoordinate from 'Core/Geographic/GeoCoordinate';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 
 
 function Projection() {

src/Core/Math/Ellipsoid.js

@@ -6,7 +6,7 @@
 
 
 
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 
 function Ellipsoid(size) {
     //Constructor

src/Core/Math/Sphere.js

@@ -1,4 +1,4 @@
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 
 function Sphere(center,radius) {
 

src/Core/defaultValue.js

@@ -5,12 +5,12 @@
  */
 
 
-import THREE from 'THREE';
+import {Vector3} from 'THREE';
 
 var defaultValue = function(value, def) {
     return value === undefined ? def : value;
 };
 
-defaultValue.lightingPos = new THREE.Vector3(1, 0, 0);
+defaultValue.lightingPos = new Vector3(1, 0, 0);
 
 export default defaultValue;

src/Globe/Atmosphere.js

@@ -6,7 +6,7 @@
 
 
 import NodeMesh from 'Renderer/NodeMesh';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import defaultValue from 'Core/defaultValue';
 import Sky from 'Globe/SkyShader';
 import skyFS from 'Renderer/Shader/skyFS.glsl';

src/Globe/BuilderEllipsoidTile.js

@@ -1,5 +1,5 @@
 import GeoCoordinate from 'Core/Geographic/GeoCoordinate';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import OBB from 'Renderer/ThreeExtented/OBB';
 
 function BuilderEllipsoidTile(model, projector) {

src/Globe/Clouds.js

@@ -6,7 +6,7 @@
 
 
 import NodeMesh from 'Renderer/NodeMesh';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import defaultValue from 'Core/defaultValue';
 import WMS_Provider from 'Core/Commander/Providers/WMS_Provider';
 import CloudsFS from 'Renderer/Shader/CloudsFS.glsl';

src/Globe/Globe.js

@@ -15,7 +15,7 @@ import Capabilities from 'Core/System/Capabilities';
 import GeoCoordinate,{UNIT} from 'Core/Geographic/GeoCoordinate';
 import BasicMaterial from 'Renderer/BasicMaterial';
 import LayersConfiguration from 'Scene/LayersConfiguration';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 
 
 /* eslint-disable */

src/Globe/SkyShader.js

@@ -14,7 +14,7 @@
  * Three.js integration by zz85 http://twitter.com/blurspline
  */
 
-import THREE from 'three';
+import * as THREE from 'THREE';
 
 var skyShader = {
 

src/Globe/Star.js

@@ -7,7 +7,7 @@
 
 import NodeMesh from 'Renderer/NodeMesh';
 import StarGeometry from 'StarGeometry';
-import THREE from 'three';
+import * as THREE from 'THREE';
 
 
 

src/Globe/TileGeometry.js

@@ -6,7 +6,7 @@
  * Description: Tuile géométrique. Buffer des vertex et des faces
  */
 /* global Float32Array*/
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import defaultValue from 'Core/defaultValue';
 import JavaTools from 'Core/System/JavaTools';
 import CacheRessource from 'Core/Commander/Providers/CacheRessource';

src/Globe/TileMesh.js

@@ -21,7 +21,7 @@ import NodeMesh from 'Renderer/NodeMesh';
 import TileGeometry from 'Globe/TileGeometry';
 import BoundingBox from 'Scene/BoundingBox';
 import defaultValue from 'Core/defaultValue';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import OBBHelper from 'OBBHelper';
 import SphereHelper from 'SphereHelper';
 import LayeredMaterial from 'Renderer/LayeredMaterial';

src/MobileMapping/GeometryProj.js

@@ -4,7 +4,7 @@
  */
 
 
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 
 function GeometryProj() {
     //Constructor

src/MobileMapping/MobileMappingLayer.js

@@ -5,7 +5,7 @@
  */
 
 import Layer from 'Scene/Layer';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import gfxEngine from 'Renderer/c3DEngine';
 import Projection from 'Core/Geographic/Projection';
 import PanoramicProvider from 'Core/Commander/Providers/PanoramicProvider';

src/MobileMapping/Ori.js

@@ -6,7 +6,7 @@
  * @Depends Sensor.js
  */
 
-import THREE from 'three';
+import * as THREE from 'THREE';
 import Sensor from 'MobileMapping/Sensor';
 
 var Ori = {

src/MobileMapping/Sensor.js

@@ -4,7 +4,7 @@
  */
 
 
-import THREE from 'three';
+import * as THREE from 'THREE';
 
 
 var Sensor = function(infos) {

src/Renderer/BasicMaterial.js

@@ -5,7 +5,7 @@
  */
 
 
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import defaultValue from 'Core/defaultValue';
 import c3DEngine from 'Renderer/c3DEngine';
 import SimpleVS from 'Renderer/Shader/SimpleVS.glsl';

src/Renderer/Camera.js

@@ -7,7 +7,7 @@
 /* global Float64Array*/
 
 import Node from 'Scene/Node';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 
 function Camera(width, height, debug) {
     //Constructor

src/Renderer/ItownsLineMaterial.js

@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
 
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import BasicMaterial from 'Renderer/BasicMaterial';
 import LineVS from 'Renderer/Shader/LineVS.glsl';
 import LineFS from 'Renderer/Shader/LineFS.glsl';

src/Renderer/ItownsPointMaterial.js

@@ -1,4 +1,4 @@
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import BasicMaterial from 'Renderer/BasicMaterial';
 import PointVS from 'Renderer/Shader/PointVS.glsl';
 import PointFS from 'Renderer/Shader/PointFS.glsl';

src/Renderer/LayeredMaterial.js

@@ -5,7 +5,7 @@
  */
 
 
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import BasicMaterial from 'Renderer/BasicMaterial';
 import gfxEngine from 'Renderer/c3DEngine';
 import JavaTools from 'Core/System/JavaTools';

src/Renderer/MatteIdsMaterial.js

@@ -5,7 +5,7 @@
  */
 
 
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import BasicMaterial from 'Renderer/BasicMaterial';
 import MatteIdsFS from 'Renderer/Shader/MatteIdsFS.glsl';
 import GlobeDepthVS from 'Renderer/Shader/GlobeDepthVS.glsl';

src/Renderer/NodeMesh.js

@@ -7,7 +7,7 @@
 
 
 import Node from 'Scene/Node';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 
 
 var NodeMesh = function() {

src/Renderer/ProjectiveTexturingMaterial.js

@@ -7,7 +7,7 @@
  */
 
 import graphicEngine from 'Renderer/c3DEngine';
-import THREE from 'three';
+import * as THREE from 'THREE';
 import Ori from 'MobileMapping/Ori';
 import Shader from 'MobileMapping/Shader';
 import url from 'url';

src/Renderer/ThreeExtented/GlobeControls.js

@@ -6,9 +6,7 @@
 //    Zoom - middle mouse, or mousewheel / touch: two finger spread or squish
 //    Pan - right mouse, or arrow keys / touch: three finter swipe
 
-/* global document,window*/
-
-import THREE from 'three';
+import * as THREE from 'THREE';
 import Sphere from 'Core/Math/Sphere';
 import CustomEvent from 'custom-event';
 
@@ -177,10 +175,11 @@ var snapShotCamera;
 
 /////////////////////////
 
+/* globals document,window */
+
 function GlobeControls(camera, domElement, engine) {
 
     var scene = engine.scene;
-
     this.camera = camera;
     snapShotCamera =  new SnapCamera(camera);
 
@@ -230,8 +229,9 @@ function GlobeControls(camera, domElement, engine) {
 
 
     if(enableTargetHelper)
-
+    {
         this.pickingHelper = new THREE.AxisHelper( 500000 );
+    }
 
     // Mouse buttons
     this.mouseButtons = {
@@ -449,8 +449,9 @@ function GlobeControls(camera, domElement, engine) {
             var bbox = scene.getMap().getTile(coord).bbox;
             var delta = coord.altitude()  - (bbox.top() + radiusCollision);
 
-            if(delta<0)
+            if (delta < 0) {
                 position.setLength(position.length()-delta);
+            }
         }
 
         return position;
@@ -1147,8 +1148,7 @@ function GlobeControls(camera, domElement, engine) {
 
     engine.scene3D.add(globeTarget);
 
-    if(enableTargetHelper)
-    {
+    if(enableTargetHelper) {
         globeTarget.add( new THREE.AxisHelper( 500000 ));
         engine.scene3D.add(this.pickingHelper);
     }

src/Renderer/ThreeExtented/KMZLoader.js

@@ -4,7 +4,7 @@
 
 //var JSZip = require("C:/Users/vcoindet/Documents/NetBeansProjects/itownsV1/src/Renderer/ThreeExtented/jszip.min");
 import JSZip from 'Renderer/ThreeExtented/jszip.min';
-import THREE from 'THREE';
+import * as THREE from 'THREE';
 import IoDriverXML from 'Core/Commander/Providers/IoDriverXML';
 import GeoCoordinate,{UNIT} from 'Core/Geographic/GeoCoordinate';
 

src/Renderer/ThreeExtented/OBB.js

@@ -5,7 +5,7 @@
  */
 
 
-import THREE from 'three';
+import * as THREE from 'THREE';
 
 function OBB(min, max, lookAt, translate) {
     THREE.Object3D.call(this);

src/Renderer/ThreeExtented/OBBHelper.js

@@ -5,7 +5,7 @@
  */
 /* global Uint16Array Float32Array*/
 
-import THREE from 'three';
+import * as THREE from 'THREE';
 
 // TODO regler le probleme glsl
 import fontJS from './fonts/optimer_regular.glsl';

src/Renderer/ThreeExtented/SphereHelper.js

@@ -5,7 +5,7 @@
  */
 
 
-import THREE from 'three';
+import * as THREE from 'THREE';
 
 function SphereHelper(radius) {
     THREE.Mesh.call(this);

src/Renderer/ThreeExtented/StarGeometry.js

@@ -5,7 +5,7 @@
  */
 
 
-import THREE from 'three';
+import * as THREE from 'THREE';
 
 function StarGeometry() {
     THREE.Geometry.call(this);

src/Renderer/ThreeExtented/threeExt.js

@@ -3,7 +3,7 @@
  *
  */
 
-import THREE from 'three';
+import * as THREE from 'THREE';
 
 
 // mbredif: extend THREE.Matrix3 prototype to with some THREE.Matrix4 functionalities