0.9.4 release

.gitignore

@@ -5,6 +5,7 @@ doc/typedoc-devel/
 node_modules/
 yarn-error.log
 package-lock.json
+build-info.json
 
 .idea
 .vscode

CHANGELOG.md

@@ -1,4 +1,22 @@
 # Change Log
+
+## 0.9.4
+### Features and improvements
+- Add Quaternion to GeoMath [#288](https://github.com/sony/mapray-js/issues/288)
+- Issue regarding gaps at tile image boundaries [#298](https://github.com/sony/mapray-js/issues/298)
+- Addition of ImageProvider switching functionality [#295](https://github.com/sony/mapray-js/issues/295)
+- Bug report: Incorrect endFrame processing [#293](https://github.com/sony/mapray-js/issues/293)
+- Support loading sprite images as SDF-enabled images [#290](https://github.com/sony/mapray-js/issues/290)
+- Issue with target_clamp parameter evaluation in startFlyCamera function [#297](https://github.com/sony/mapray-js/issues/297)
+- Issue regarding slow watch processing [#292](https://github.com/sony/mapray-js/issues/292)
+- Proposal to implement Linter for code quality enhancement [#291](https://github.com/sony/mapray-js/issues/291)
+
+### Breaking Changes
+- Upgrade to rollup 3 and update typescript version [#273](https://github.com/sony/mapray-js/issues/273)
+- Improvement of AttributionController [#274](https://github.com/sony/mapray-js/issues/274)
+- Changed WebGL version to WebGL2 and supported float buffer [#289](https://github.com/sony/mapray-js/issues/289)
+- Issue regarding clouds image origin location modification. [#296](https://github.com/sony/mapray-js/issues/296)
+
 ## 0.9.3
 ### Features and improvements
 - add operation text and fix mouse control in example [#284](https://github.com/sony/mapray-js/issues/284)

README.md

@@ -9,11 +9,11 @@ maprayJS is a JavaScript library for a high quality interactive 3D globes and di
 ### Script Tag
 #### core packages
 ```html
-  <script src="https://resource.mapray.com/mapray-js/v0.9.3/mapray.min.js"></script>
+  <script src="https://resource.mapray.com/mapray-js/v0.9.4/mapray.min.js"></script>
 ```
 #### ui packages
 ```html
-  <script src="https://resource.mapray.com/mapray-js/v0.9.3/maprayui.min.js"></script>
+  <script src="https://resource.mapray.com/mapray-js/v0.9.4/maprayui.min.js"></script>
 ```
 
 ### NPM module
@@ -53,7 +53,7 @@ Mapray Cloud managed by [Sony Group Corporation.](https://www.sony.com/) If you
     <div id="mapray-container"></div>
 </body>
 </html>
-<script src="https://resource.mapray.com/mapray-js/v0.9.3/mapray.min.js"></script>
+<script src="https://resource.mapray.com/mapray-js/v0.9.4/mapray.min.js"></script>
 <script>
      // Set Access Token for mapray cloud
        var accessToken = "<your access token here>";
@@ -101,7 +101,7 @@ Mapray Cloud managed by [Sony Group Corporation.](https://www.sony.com/) If you
 
 ## Documentation
 - [Mapray Document(Japanese)](https://mapray.com/documents/index.html)
-- [API Reference](https://resource.mapray.com/doc/api/v0.9.3/index.html)
+- [API Reference](https://resource.mapray.com/doc/api/v0.9.4/index.html)
 - [Contribution Guide (English)](/CONTRIBUTING.md)
 
 **API documents**

debug/animation/README.md

@@ -51,4 +51,8 @@ Key binding
 
 4: Easy Binding Animation
 
-5: StandardUIViewer.startFlyCamera()
+5: Heading-Tilt-Roll Interpolated Animation
+
+6: Quaternion Interpolated Animation
+
+7: StandardUIViewer.startFlyCamera()

debug/animation/index.html

@@ -27,6 +27,8 @@
         <li>Keyframe Step Animation
         <li>Simple Curve Animation
         <li>Easy Binding Animation
+        <li>Heading-Tilt-Roll Interpolated Animation
+        <li>Quaternion Interpolated Animation
         <li>StandardUIViewer.startFlyCamera()
     </ol>
 </div>

debug/animation/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "render-stage",
+  "name": "animation-debug-app",
   "version": "0.0.0",
   "license": "Apache-2.0",
+  "type": "module",
   "scripts": {
     "start": "run-p server build-watch",
     "build": "rollup -c",
@@ -10,17 +11,18 @@
     "server": "st --no-cache -H 0.0.0.0 --port 7776 --index index.html --dir ."
   },
   "devDependencies": {
+    "@rollup/plugin-node-resolve": "^15.0.2",
+    "@rollup/plugin-terser": "^0.4.3",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.16",
-    "rollup": "^2.78.1",
+    "postcss": "^8.4.23",
+    "rollup": "^3.23.0",
     "rollup-plugin-inject-process-env": "^1.3.1",
-    "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "0.33.0",
+    "rollup-plugin-sourcemaps": "^0.6.3",
+    "rollup-plugin-typescript2": "^0.34.1",
     "st": "^3.0.0",
-    "tslib": "^2.2.0",
-    "typescript": "^4.3.2"
+    "tslib": "^2.5.2",
+    "typescript": "^5.0.4"
   },
   "dependencies": {}
 }

debug/animation/rollup.config.js

@@ -1,10 +1,9 @@
-import { terser } from 'rollup-plugin-terser';
+import terser from '@rollup/plugin-terser';
 import postcss from 'rollup-plugin-postcss';
-import resolve from 'rollup-plugin-node-resolve';
+import pluginNodeResolve from '@rollup/plugin-node-resolve';
 import injectProcessEnv from 'rollup-plugin-inject-process-env';
 import typescript from 'rollup-plugin-typescript2';
-
-
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const outdir = "dist/";
 
@@ -13,6 +12,9 @@ const env = {
     BINGMAP_ACCESS_TOKEN:   process.env.BINGMAP_ACCESS_TOKEN,
 };
 
+const { BUILD } = process.env;
+const production = BUILD === 'production';
+
 [
     "MAPRAY_ACCESS_TOKEN",
 ]
@@ -28,22 +30,22 @@ export default function() {
             file: outdir + 'bundle.js',
             format: 'iife',
             indent: false,
-            sourcemap: process.env.BUILD !== 'production',
+            sourcemap:  production ? true : 'inline',
             name: "App",
         },
         plugins: [
             postcss(),
-            injectProcessEnv( env ),
-            resolve(),
+            injectProcessEnv( env, {
+                    // This plugin inserts a line into all included source codes.
+                    // The following option prevents the effect from being applied to the core library.
+                    include: ["./src/**/*.ts"],
+            }),
+            sourcemaps(),
+            pluginNodeResolve(),
             typescript({
                 tsconfig: './tsconfig.json',
-                tsconfigOverride: {
-                    compilerOptions: {
-                        sourceMap: true,
-                    }
-                }
             }),
-            (process.env.BUILD === 'production' ?
+            (production ?
                 terser({
                     compress: {
                         unused: false,

debug/animation/src/App.ts

@@ -1,4 +1,4 @@
-import mapray from "@mapray/mapray-js";
+import mapray, { GeoMath } from "@mapray/mapray-js";
 import maprayui from "@mapray/ui";
 
 import CosCurve from "./CosCurve";
@@ -93,8 +93,16 @@ export default class App extends maprayui.StandardUIViewer {
                 this._startAnimation4();
             } break;
             case "5": {
-                console.log( 'start animation 5' );
-                this._startAnimation5();
+                console.log( 'start Heading Tilt Roll animation' );
+                this.startHeadingTiltRollAnimation();
+            } break;
+            case "6": {
+                console.log( 'start Quaternion animation' );
+                this.startQuaternionAnimation();
+            } break;
+            case "7": {
+                console.log( 'camera animation' );
+                this._startCameraAnimation();
             } break;
             default: {
                 super.onKeyDown( event );
@@ -392,9 +400,9 @@ export default class App extends maprayui.StandardUIViewer {
 
 
     /**
-     * Animation Example 5
+     * Camera Animation Example
      */
-     async _startAnimation5() {
+     async _startCameraAnimation() {
          await this.startFlyCamera({
                  end_altitude: 800,
                  end_from_lookat: 300,
@@ -404,6 +412,96 @@ export default class App extends maprayui.StandardUIViewer {
          console.log( "done" );
     }
 
+
+    /**
+     * Heading Tilt Roll Animation Example
+     */
+    async startHeadingTiltRollAnimation() {
+        // Entityのクリア
+        this.viewer.scene.clearEntities();
+
+        const SCENE_3D_URL = "https://resource.mapray.com/assets/www/model/mapray-box-with-texture/scene.json";
+        const sceneResource = new mapray.URLResource( SCENE_3D_URL, {
+                transform: ( url, type ) => {
+                    if (type.id === "IMAGE" ) {
+                        return { url, init: { crossOrigin: mapray.CredentialMode.SAME_ORIGIN } };
+                    }
+                    else return { url }
+                }
+        });
+
+        await new mapray.SceneLoader( this.viewer.scene, sceneResource, {
+                onEntity: (loader, entity, props) => {
+                    if ( entity instanceof mapray.ModelEntity ) {
+                        const position = new mapray.GeoPoint(139.699985, 35.690777, 300);
+                        entity.setPosition(position);
+                        entity.setScale([2.0, 2.0, 2.0]);
+                        loader.scene.addEntity(entity);
+
+                        const vector3 = mapray.animation.Type.find( "vector3" );
+                        let curve = new mapray.animation.KFLinearCurve( vector3 );
+                        const keyframes = [];
+                        keyframes.push( mapray.animation.Time.fromNumber( 0 ) );
+                        keyframes.push( mapray.GeoMath.createVector3([0,30,0]));
+                        keyframes.push( mapray.animation.Time.fromNumber( 3 ));
+                        keyframes.push( mapray.GeoMath.createVector3([180,-30,0]));
+                        curve.setKeyFrames( keyframes );
+
+                        // 経過時間の初期化
+                        this._total_time = 0;
+                        entity.animation.bind("orientation", this._animation_updater, curve);
+
+                        // Animation開始
+                        this._is_animation_start = true;
+                    }
+                }
+        } ).load();
+    }
+
+
+    /**
+     * Quaternion Animation Example
+     */
+    async startQuaternionAnimation() {
+        // Entityのクリア
+        this.viewer.scene.clearEntities();
+
+        const SCENE_3D_URL = "https://resource.mapray.com/assets/www/model/mapray-box-with-texture/scene.json";
+        const sceneResource = new mapray.URLResource( SCENE_3D_URL, {
+                transform: ( url, type ) => {
+                    if (type.id === "IMAGE" ) {
+                        return { url, init: { crossOrigin: mapray.CredentialMode.SAME_ORIGIN } };
+                    }
+                    else return { url }
+                }
+        });
+
+        await new mapray.SceneLoader( this.viewer.scene, sceneResource, {
+                onEntity: (loader, entity, props) => {
+                    if ( entity instanceof mapray.ModelEntity ) {
+                        const position = new mapray.GeoPoint(139.699985, 35.690777, 300);
+                        entity.setPosition(position);
+                        entity.setScale([2.0, 2.0, 2.0]);
+                        loader.scene.addEntity(entity);
+
+                        let curve = new mapray.animation.KFQuatLinearCurve();
+                        const keyframes = [];
+                        keyframes.push( mapray.animation.Time.fromNumber( 0 ) );
+                        keyframes.push( mapray.GeoMath.createVector4([-0.183013, 0.183013, 0.683013, 0.683013]));
+                        keyframes.push( mapray.animation.Time.fromNumber( 3 ));
+                        keyframes.push( mapray.GeoMath.createVector4([-0.183013, -0.183013, -0.683013, 0.683012]));
+                        curve.setKeyFrames( keyframes );
+
+                        // 経過時間の初期化
+                        this._total_time = 0;
+                        entity.animation.bind("orientation", this._animation_updater, curve);
+
+                        // Animation開始
+                        this._is_animation_start = true;
+                    }
+                }
+        } ).load();
+    }
 }
 
 

debug/animation/tsconfig.json

@@ -7,9 +7,13 @@
     "esModuleInterop": true,
 
     "allowJs": true,
-    "removeComments": true,
+    "removeComments": false,
     "downlevelIteration": true,
 
+    "sourceMap": true,
+    "declaration": true,
+    "declarationMap": true,
+
     "strict": true,
     "strictNullChecks": true,
     "noImplicitReturns": true,
@@ -20,12 +24,14 @@
     "noFallthroughCasesInSwitch": true,
 
     "outDir": "dist",
+    "rootDir": "src",
+    "baseUrl": "src/"
   },
   "include": [
     "src/**/*",
   ],
   "exclude": [
-    "node_module",
-    "dist",
+    "node_modules/**/*",
+    "dist/**/*"
   ]
 }