Commit: 43 - takoyaki_umaaaaHideout (svn)

JavaScriptを色々あれこれしようとするがひたすら失敗を繰り返している

Commit MetaInfo

• Revision: 43 (tree)
• Time: 2016-12-09 17:18:26
• Author: takoyaki_umaaaa

Log Message

(empty log message)

Change Summary

• modified: HtmlDrawApp/HTMLDrawApp/HTMLDrawApp.jsproj
• modified: HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/css/default.css
• modified: HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/index.html
• modified: HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/js/Common.js
• modified: HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/js/DispObj.js
• modified: HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/js/main.js
• modified: HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/resources.pri
• modified: HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/vs.appxrecipe
• modified: HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/HTMLDrawApp.build.appxrecipe
• modified: HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/ReverseMap/resources.pri
• modified: HtmlDrawApp/HTMLDrawApp/bld/x64/Debug/layout.resfiles
• modified: HtmlDrawApp/HTMLDrawApp/bld/x64/Debug/layout.resfiles.intermediate
• modified: HtmlDrawApp/HTMLDrawApp/css/default.css
• modified: HtmlDrawApp/HTMLDrawApp/index.html
• modified: HtmlDrawApp/HTMLDrawApp/js/Common.js
• modified: HtmlDrawApp/HTMLDrawApp/js/DispObj.js
• modified: HtmlDrawApp/HTMLDrawApp/js/main.js
• modified: HtmlDrawApp/doc/TextColorSample/クォータービュー.txt

Incremental Difference

--- HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/css/default.css	(revision 42)
+++ HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/css/default.css	(revision 43)
@@ -20,7 +20,7 @@
 				user-select: none;
 		font-family: 游明朝, YuMincho, ヒラギノ明朝 ProN W3, Hiragino Mincho ProN, HG明朝E, ＭＳ Ｐ明朝, ＭＳ 明朝, serif;
 		-webkit-font-smoothing: antialiased;
-		-webkit-overflow-scrolling: touch;
+//		-webkit-overflow-scrolling: touch;
 	}
 
 	.buttonstyle {
@@ -65,7 +65,7 @@
 		background-color: transparent;
 	}
 	.DispField {
-		overflow: hidden;
+		overflow: scroll;
 	}
 
 	#FrameArea{

--- HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/index.html	(revision 42)
+++ HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/index.html	(revision 43)
@@ -20,6 +20,8 @@
 		<button type=button class="pal" data-objid="pal" data-palid="2" title="設定画面を表示します">設定Drop</button>
 		<button type=button class="pal" data-objid="pal" data-palid="3" title="アニメーションを停止します">アニメ停止</button>
 		<button type=button class="pal" data-objid="pal" data-palid="4" >枠表示</button>
+		<button type=button class="pal" data-objid="pal" data-palid="5">背景大</button>
+		<button type=button class="pal" data-objid="pal" data-palid="6">背景小</button>
 		<a href="#" id="save" download="DragDraw.dd" title="DragDraw.ddという名前でダウンロードフォルダに保存します">画像保存</a><br />
 		<a href="#apparea">停止</a>
 
@@ -103,6 +105,7 @@
 		</fieldset>
 	</div>
 
+	<script type="text/javascript" src="js/numeric-1.2.6.min.js"></script>
 	<script type="text/javascript" src="js/Common.js"></script>
 	<script type="text/javascript" src="js/Queue.js"></script>
 	<script type="text/javascript" src="js/CommandObj.js"></script>

--- HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/js/Common.js	(revision 42)
+++ HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/js/Common.js	(revision 43)
@@ -439,3 +439,53 @@
 }
 
 
+function matRotateX(rx) {
+	var rad = degToRad(rx);
+	var matrix = [
+		[1, 0, 0, 0],
+		[0, Math.cos(rad), -Math.sin(rad), 0],
+		[0, Math.sin(rad),  Math.cos(rad), 0],
+		[0, 0, 0, 1]
+	];
+	return matrix;
+}
+function matRotateY(rx) {
+	var rad = degToRad(rx);
+	var matrix = [
+		[ Math.cos(rad), 0, Math.sin(rad), 0],
+		[0, 1, 0, 0],
+		[-Math.sin(rad), 0, Math.cos(rad), 0],
+		[0, 0, 0, 1]
+	];
+	return matrix;
+}
+function matRotateZ(rx) {
+	var rad = degToRad(rx);
+	var matrix = [
+		[Math.cos(rad), -Math.sin(rad), 0, 0],
+		[Math.sin(rad),  Math.cos(rad), 0, 0],
+		[0, 0, 1, 0],
+		[0, 0, 0, 1]
+	];
+	return matrix;
+}
+function matTranslate(x,y,z) {
+	var rad = degToRad(rx);
+	var matrix = [
+		[1, 0, 0, x],
+		[0, 1, 0, y],
+		[0, 0, 1, z],
+		[0, 0, 0, 1]
+	];
+	return matrix;
+}
+function matPerspective(d) {
+	var dist = -1.0 / parseFloat(d);
+	var matrix = [
+		[1, 0,    0, 0],
+		[0, 1,    0, 0],
+		[0, 0,    1, 0],
+		[0, 0, dist, 1]
+	];
+	return matrix;
+}

--- HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/js/DispObj.js	(revision 42)
+++ HtmlDrawApp/HTMLDrawApp/bin/x64/Debug/AppX/js/DispObj.js	(revision 43)
@@ -316,6 +316,23 @@
 		evt.stopPropagation();				// event伝播を自分のところで止める(上位に行かなくなる)
 		evt.preventDefault();				// 要素既定のdefault動作を止める
 
+/*	test
+		let xy1 = rotateUD(0, -45, parseInt(evt.pageX), parseInt(evt.pageY));
+		let xy2 = rotateZ(0, 0, 45, xy1[0], xy1[1]);
+		this.startDragX = xy2[0];
+		this.startDragY = xy2[1];
+
+		let xy0 = [parseInt(evt.pageX), parseInt(evt.pageY)];
+		let matx = matRotateX(-45);
+		let xx = numeric.dot(matx, [xy0[0],xy0[1],0,1]);
+		let matz = matRotateZ(45);
+		let xx2 = numeric.dot(matz, [xy1[0], xy1[1], 0, 1]);
+		let xx3 = numeric.dot(matz, matx);
+		let xx4 = numeric.dot(xx3, [xy0[0], xy0[1], 0, 1]);
+		let matp = matPerspective(800);
+		let xx5 = numeric.dot(matp, [xx4[0], xx4[1], 0, 1]);
+*/
+
 		// 移動元として座標を保持
 		this.startDragX = evt.pageX;
 		this.startDragY = evt.pageY;
@@ -324,10 +341,23 @@
 		window.partsFocus.setClingingPartner(this.DOMbase);
 
 	}
-	mouseMove(evt, target) {
+	mouseMove(evt, xy) {
 		evt.stopPropagation();				// event伝播を自分のところで止める(上位に行かなくなる)
 		evt.preventDefault();				// 要素既定のdefault動作を止める
 
+/*	test
+		let matp = matPerspective(1);
+		let mati = numeric.inv(matp);
+//		let xx5 = numeric.dot(mati, [parseInt(evt.pageX), parseInt(evt.pageY), 0, 1]);
+		let xy1 = rotateUD(0, -45, parseInt(evt.pageX), parseInt(evt.pageY));
+//		let xy1 = rotateUD(0, -45, xx5[0], xx5[1]);
+		let xy2 = rotateZ(0, 0, 45, xy1[0], xy1[1]);
+		let xx5 = numeric.dot(matp, [xy2[0], xy2[1], 0, 1]);
+		this.endDragX = xx5[0];
+		this.endDragY = xx5[1];
+//		this.endDragX = xy2[0];
+//		this.endDragY = xy2[1];
+*/
 		// 画像の仮移動
 		this.endDragX = evt.pageX;
 		this.endDragY = evt.pageY;

Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

--- HtmlDrawApp/HTMLDrawApp/css/default.css	(revision 42)
+++ HtmlDrawApp/HTMLDrawApp/css/default.css	(revision 43)
@@ -20,7 +20,7 @@
 				user-select: none;
 		font-family: 游明朝, YuMincho, ヒラギノ明朝 ProN W3, Hiragino Mincho ProN, HG明朝E, ＭＳ Ｐ明朝, ＭＳ 明朝, serif;
 		-webkit-font-smoothing: antialiased;
-		-webkit-overflow-scrolling: touch;
+//		-webkit-overflow-scrolling: touch;
 	}
 
 	.buttonstyle {
@@ -65,7 +65,7 @@
 		background-color: transparent;
 	}
 	.DispField {
-		overflow: hidden;
+		overflow: scroll;
 	}
 
 	#FrameArea{

--- HtmlDrawApp/HTMLDrawApp/index.html	(revision 42)
+++ HtmlDrawApp/HTMLDrawApp/index.html	(revision 43)
@@ -20,6 +20,8 @@
 		<button type=button class="pal" data-objid="pal" data-palid="2" title="設定画面を表示します">設定Drop</button>
 		<button type=button class="pal" data-objid="pal" data-palid="3" title="アニメーションを停止します">アニメ停止</button>
 		<button type=button class="pal" data-objid="pal" data-palid="4" >枠表示</button>
+		<button type=button class="pal" data-objid="pal" data-palid="5">背景大</button>
+		<button type=button class="pal" data-objid="pal" data-palid="6">背景小</button>
 		<a href="#" id="save" download="DragDraw.dd" title="DragDraw.ddという名前でダウンロードフォルダに保存します">画像保存</a><br />
 		<a href="#apparea">停止</a>
 
@@ -103,6 +105,7 @@
 		</fieldset>
 	</div>
 
+	<script type="text/javascript" src="js/numeric-1.2.6.min.js"></script>
 	<script type="text/javascript" src="js/Common.js"></script>
 	<script type="text/javascript" src="js/Queue.js"></script>
 	<script type="text/javascript" src="js/CommandObj.js"></script>

--- HtmlDrawApp/HTMLDrawApp/js/Common.js	(revision 42)
+++ HtmlDrawApp/HTMLDrawApp/js/Common.js	(revision 43)
@@ -439,3 +439,53 @@
 }
 
 
+function matRotateX(rx) {
+	var rad = degToRad(rx);
+	var matrix = [
+		[1, 0, 0, 0],
+		[0, Math.cos(rad), -Math.sin(rad), 0],
+		[0, Math.sin(rad),  Math.cos(rad), 0],
+		[0, 0, 0, 1]
+	];
+	return matrix;
+}
+function matRotateY(rx) {
+	var rad = degToRad(rx);
+	var matrix = [
+		[ Math.cos(rad), 0, Math.sin(rad), 0],
+		[0, 1, 0, 0],
+		[-Math.sin(rad), 0, Math.cos(rad), 0],
+		[0, 0, 0, 1]
+	];
+	return matrix;
+}
+function matRotateZ(rx) {
+	var rad = degToRad(rx);
+	var matrix = [
+		[Math.cos(rad), -Math.sin(rad), 0, 0],
+		[Math.sin(rad),  Math.cos(rad), 0, 0],
+		[0, 0, 1, 0],
+		[0, 0, 0, 1]
+	];
+	return matrix;
+}
+function matTranslate(x,y,z) {
+	var rad = degToRad(rx);
+	var matrix = [
+		[1, 0, 0, x],
+		[0, 1, 0, y],
+		[0, 0, 1, z],
+		[0, 0, 0, 1]
+	];
+	return matrix;
+}
+function matPerspective(d) {
+	var dist = -1.0 / parseFloat(d);
+	var matrix = [
+		[1, 0,    0, 0],
+		[0, 1,    0, 0],
+		[0, 0,    1, 0],
+		[0, 0, dist, 1]
+	];
+	return matrix;
+}

--- HtmlDrawApp/HTMLDrawApp/js/DispObj.js	(revision 42)
+++ HtmlDrawApp/HTMLDrawApp/js/DispObj.js	(revision 43)
@@ -316,6 +316,23 @@
 		evt.stopPropagation();				// event伝播を自分のところで止める(上位に行かなくなる)
 		evt.preventDefault();				// 要素既定のdefault動作を止める
 
+/*	test
+		let xy1 = rotateUD(0, -45, parseInt(evt.pageX), parseInt(evt.pageY));
+		let xy2 = rotateZ(0, 0, 45, xy1[0], xy1[1]);
+		this.startDragX = xy2[0];
+		this.startDragY = xy2[1];
+
+		let xy0 = [parseInt(evt.pageX), parseInt(evt.pageY)];
+		let matx = matRotateX(-45);
+		let xx = numeric.dot(matx, [xy0[0],xy0[1],0,1]);
+		let matz = matRotateZ(45);
+		let xx2 = numeric.dot(matz, [xy1[0], xy1[1], 0, 1]);
+		let xx3 = numeric.dot(matz, matx);
+		let xx4 = numeric.dot(xx3, [xy0[0], xy0[1], 0, 1]);
+		let matp = matPerspective(800);
+		let xx5 = numeric.dot(matp, [xx4[0], xx4[1], 0, 1]);
+*/
+
 		// 移動元として座標を保持
 		this.startDragX = evt.pageX;
 		this.startDragY = evt.pageY;
@@ -324,10 +341,23 @@
 		window.partsFocus.setClingingPartner(this.DOMbase);
 
 	}
-	mouseMove(evt, target) {
+	mouseMove(evt, xy) {
 		evt.stopPropagation();				// event伝播を自分のところで止める(上位に行かなくなる)
 		evt.preventDefault();				// 要素既定のdefault動作を止める
 
+/*	test
+		let matp = matPerspective(1);
+		let mati = numeric.inv(matp);
+//		let xx5 = numeric.dot(mati, [parseInt(evt.pageX), parseInt(evt.pageY), 0, 1]);
+		let xy1 = rotateUD(0, -45, parseInt(evt.pageX), parseInt(evt.pageY));
+//		let xy1 = rotateUD(0, -45, xx5[0], xx5[1]);
+		let xy2 = rotateZ(0, 0, 45, xy1[0], xy1[1]);
+		let xx5 = numeric.dot(matp, [xy2[0], xy2[1], 0, 1]);
+		this.endDragX = xx5[0];
+		this.endDragY = xx5[1];
+//		this.endDragX = xy2[0];
+//		this.endDragY = xy2[1];
+*/
 		// 画像の仮移動
 		this.endDragX = evt.pageX;
 		this.endDragY = evt.pageY;

--- HtmlDrawApp/HTMLDrawApp/js/main.js	(revision 42)
+++ HtmlDrawApp/HTMLDrawApp/js/main.js	(revision 43)
@@ -312,10 +312,15 @@
 					elestyle.sheet.insertRule(dispobjRuleBefore + setStr + dispobjRuleAfter, 0);
 				}
 				break;
-			case 5:
-				let color = parseInt(evt.target.dataset.value);
-				setBkColorFocusedObject(color);
+			case 5:	// 背景大
+				window.displayField.DOMobject.style.overflow = "scroll";
+				window.frameArea.DOMobject.style.width = 1200 + 'px';
+				window.frameArea.DOMobject.style.height = 600 + 'px';
 				break;
+			case 6: // 背景小
+				window.frameArea.DOMobject.style.width = 600 + 'px';
+				window.frameArea.DOMobject.style.height = 300 + 'px';
+				break;
 		}
 	};
 	

--- HtmlDrawApp/doc/TextColorSample/クォータービュー.txt	(revision 42)
+++ HtmlDrawApp/doc/TextColorSample/クォータービュー.txt	(revision 43)
@@ -1,2 +1,3 @@
 	overflow: visible;
+	transform-style: preserve-3d;
 	transform: translateX(0%) rotateX(45deg) rotateZ(-45deg);