<画像表示、サーバの切り替え、JSの整理>

[vem/WITs.git] / JS / canvas.js

diff --git a/JS/canvas.js b/JS/canvas.js
index 741849b..efb85a7 100644 (file)
--- a/JS/canvas.js
+++ b/JS/canvas.js
@@ -12,7 +12,7 @@ function tabcheck() {
 
     if (insingle.style.display == "") {
         canvasmode = 1;
-        canvasApp();
+        //canvasApp();
         console.log("canvasmode=" + canvasmode);
     }else if(intomo.style.display ==""){
         canvasmode = 2;
@@ -31,7 +31,7 @@ function tabcheck() {
 function eventWindowLoaded() {
     //画面がロードされたら、canvasAppを呼び出す
   /*  if (canvasmode == 1) {
-        canvasApp();
+        //canvasApp();
     } else if (canvasmode == 2) {
         canvastomo();
     }
@@ -66,76 +66,9 @@ var moveformy=0;
 var moveformz=0;
 var moveformas=0;
 var moveformat=0;
-
+var movingdistance =1;
 var tiltmode = 1;
 
-
-function switchkey(onoff) {
-    mode = onoff;
-    console.log(onoff);
-
-}
-
-console.log("mode=" + mode);
-
-
-document.onkeydown = function(e) {
-    // UP
-    if (mode == 1) {
-        if (e.keyCode == 38 || e.keyCode == 87 || e.keyCode == 72) {
-            movey = parseInt(movey) + parseInt(1);
-            stagecontrol('stage',movex,movey,movez,movea);
-            emcondition('request');
-            if (canvasmode == 1) {
-                canvasApp();
-            }else if(canvasmode ==2){
-                canvastomo();
-            }else if(canvasmode ==3 ){
-                canvasmds();
-            }
-        }
-        // DOWN
-        if (e.keyCode == 40 || e.keyCode == 83 || e.keyCode == 74) {
-            movey = parseInt(movey) - parseInt(1);
-            stagecontrol('stage',movex,movey,movez,movea);
-            emcondition('request');
-            if (canvasmode == 1) {
-                canvasApp();
-            }else if(canvasmode ==2){
-                canvastomo();
-            }else if(canvasmode ==3 ){
-                canvasmds();
-            }
-        }
-        // LEFT
-        if (e.keyCode == 37 || e.keyCode == 65 || e.keyCode == 75) {
-            movex = parseInt(movex) - parseInt(1);
-            stagecontrol('stage',movex,movey,movez,movea);
-            emcondition('request');
-            if (canvasmode == 1) {
-                canvasApp();
-            }else if(canvasmode ==2){
-                canvastomo();
-            }else if(canvasmode ==3 ){
-                canvasmds();
-            }
-        }
-        // RIGHT
-        if (e.keyCode == 39 || e.keyCode == 68 || e.keyCode == 76) {
-            movex = parseInt(movex) + parseInt(1);
-            stagecontrol('stage',movex,movey,movez,movea);
-            emcondition('request');
-            if (canvasmode == 1) {
-                canvasApp();
-            }else if(canvasmode ==2){
-                canvastomo();
-            }else if(canvasmode ==3 ){
-                canvasmds();
-            }
-        }
-    }
-};
-
 function gamepad() {
     if (navigator.getGamepads) {
         // ゲームパッドリストを取得する
@@ -173,19 +106,19 @@ function gamepad() {
      if (gamepad.axes[0] < -0.5) {
      movex = parseInt(movex) + parseInt(10);
      console.log("left!");
-     canvasApp();
+     ////canvasApp();
      }
      if (gamepad.axes[0] > 0.5) {
      movex = parseInt(movex) - parseInt(10);
-     canvasApp();
+     //canvasApp();
      }
      if (gamepad.axes[1] < -0.5) {
      movey = parseInt(movey) - parseInt(10);
-     canvasApp();
+     //canvasApp();
      }
      if (gamepad.axes[1] > 0.5) {
      movey = parseInt(movey) + parseInt(10);
-     canvasApp();
+     //canvasApp();
 
      }
      },1000/60);
@@ -246,7 +179,7 @@ function gamepad() {
                             stagecontrol('stage',movex,movey,movez,movea);
                             emcondition('request');
                             if (canvasmode == 1) {
-                                canvasApp();
+                                //canvasApp();
                             } else if (canvasmode == 2) {
                                 canvastomo();
                             } else if (canvasmode == 3) {
@@ -258,7 +191,7 @@ function gamepad() {
                             stagecontrol('stage',movex,movey,movez,movea);
                             emcondition('request');
                             if (canvasmode == 1) {
-                                canvasApp();
+                                //canvasApp();
                             } else if (canvasmode == 2) {
                                 canvastomo();
                             } else if (canvasmode == 3){
@@ -271,7 +204,7 @@ function gamepad() {
                             stagecontrol('stage',movex,movey,movez,movea);
                             emcondition('request');
                             if (canvasmode == 1) {
-                                canvasApp();
+                                //canvasApp();
                             } else if (canvasmode == 2) {
                                 canvastomo();
                             } else if (canvasmode ==3 ) {
@@ -283,7 +216,7 @@ function gamepad() {
                             stagecontrol('stage',movex,movey,movez,movea);
                             emcondition('request');
                             if (canvasmode == 1) {
-                                canvasApp();
+                                //canvasApp();
                             } else if (canvasmode == 2) {
                                 canvastomo();
                             } else if (canvasmode == 3){
@@ -359,6 +292,8 @@ function canvasApp() {
             document.getElementById("currenty").innerHTML = movey;
             console.log("x=" + movex);
             console.log("y=" + movey);
+            var movingdistance = $("#movingdistance");
+            console.log(movingdistance[0]);
         }
 
         //見る画像
@@ -614,6 +549,7 @@ function canvasroot() {
             document.getElementById("currenty").innerHTML = movey;
             console.log("x=" + movex);
             console.log("y=" + movey);
+
         }
 
         //見る画像