+
autorenew
diff --git a/src/app/component/ui-panel/ui-panel.component.html b/src/app/component/ui-panel/ui-panel.component.html
index 2cf4420ef..ab4eda908 100644
--- a/src/app/component/ui-panel/ui-panel.component.html
+++ b/src/app/component/ui-panel/ui-panel.component.html
@@ -19,7 +19,6 @@
[dispByMouse]="tachieDispByMouse" >
- AAAA
diff --git a/src/app/component/vote-menu/vote-menu.component.ts b/src/app/component/vote-menu/vote-menu.component.ts
index 92e263144..47700acc9 100644
--- a/src/app/component/vote-menu/vote-menu.component.ts
+++ b/src/app/component/vote-menu/vote-menu.component.ts
@@ -104,7 +104,7 @@ export class VoteMenuComponent implements OnInit, OnDestroy, AfterViewInit {
voteTitle = '点呼';
}else{
choicesInput = choicesInput.length == 0 ? '賛成 反対' : choicesInput;
- startMessage = '投票開始！';
+ startMessage = '投票開始！(' + this.voteTitle + ')';
voteTitle = this.voteTitle;
}
let choices = choicesInput.split(/\s+/i);
diff --git a/src/app/directive/movable.directive.ts b/src/app/directive/movable.directive.ts
index 8cb4e22ec..6a2cb5030 100644
--- a/src/app/directive/movable.directive.ts
+++ b/src/app/directive/movable.directive.ts
@@ -44,13 +44,32 @@ export class MovableDirective implements AfterViewInit, OnDestroy {
private _posX: number = 0;
private _posY: number = 0;
private _posZ: number = 0;
-
+/*
get posX(): number { return this._posX; }
set posX(posX: number) { this._posX = posX; this.setUpdateTimer(); }
get posY(): number { return this._posY; }
set posY(posY: number) { this._posY = posY; this.setUpdateTimer(); }
get posZ(): number { return this._posZ; }
set posZ(posZ: number) { this._posZ = posZ; this.setUpdateTimer(); }
+*/
+
+ private mathFloor: boolean = true;
+/*
+ get posX(): number { return this._posX; }
+ set posX(posX: number) { this._posX = Math.floor(posX); this.setUpdateTimer(); }
+ get posY(): number { return this._posY; }
+ set posY(posY: number) { this._posY = Math.floor(posY); this.setUpdateTimer(); }
+ get posZ(): number { return this._posZ; }
+ set posZ(posZ: number) { this._posZ = Math.floor(posZ); this.setUpdateTimer(); }
+*/
+
+ get posX(): number { return this._posX; }
+ set posX(posX: number) { this._posX = this.mathFloor? Math.floor(posX):posX; this.setUpdateTimer(); }
+ get posY(): number { return this._posY; }
+ set posY(posY: number) { this._posY = this.mathFloor? Math.floor(posY):posY; this.setUpdateTimer(); }
+ get posZ(): number { return this._posZ; }
+ set posZ(posZ: number) { this._posZ = this.mathFloor? Math.floor(posZ*100)/100:posZ; this.setUpdateTimer(); }
+
private pointerOffset2d: PointerCoordinate = { x: 0, y: 0, z: 0 };
private pointerStart3d: PointerCoordinate = { x: 0, y: 0, z: 0 };
@@ -241,9 +260,20 @@ export class MovableDirective implements AfterViewInit, OnDestroy {
}
private setPosition(object: TabletopObject) {
+/*
this._posX = object.location.x;
this._posY = object.location.y;
this._posZ = object.posZ;
+
+
+ this._posX = Math.floor(object.location.x);
+ this._posY = Math.floor(object.location.y);
+ this._posZ = Math.floor(object.posZ);
+*/
+ this._posX = this.mathFloor? Math.floor(object.location.x):object.location.x;
+ this._posY = this.mathFloor? Math.floor(object.location.y):object.location.y;
+ this._posZ = this.mathFloor? Math.floor(object.posZ*100)/100:object.posZ;
+
this.updateTransformCss();
}
@@ -305,7 +335,13 @@ export class MovableDirective implements AfterViewInit, OnDestroy {
}
private updateTransformCss() {
- let css = this.transformCssOffset + ' translateX(' + this.posX + 'px) translateY(' + this.posY + 'px) translateZ(' + this.posZ + 'px)';
+// let css = this.transformCssOffset + ' translateX(' + this.posX + 'px) translateY(' + this.posY + 'px) translateZ(' + this.posZ + 'px)';
+// let css = 'translateX(' + this.posX + 'px) translateY(' + this.posY + 'px) translateZ(' + this.posZ + 'px)';
+ let css = 'translate3d(' + this.posX + 'px,' + this.posY + 'px,' + this.posZ + 'px) ' + this.transformCssOffset;
+// let css = 'translate3d(' + this.posX + 'px,' + this.posY + 'px,' + this.posZ + 'px) ' + ' translate3d(0px,0px,1px) translate3d(0px,0px,1px) translate3d(0px,0px,1px) translate3d(0px,0px,1px) translate3d(0px,0px,1px)';
+
+// let css = 'translate3d(' + this.posX + 'px,' + this.posY + 'px,' + (this.posZ +100 )+ 'px) ';
+ console.log(css);
this.nativeElement.style.transform = css;
}
diff --git a/src/index.html b/src/index.html
index 6a90436e3..852b80bd3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,7 +9,7 @@
}
-
UdonariumLily 1.07.0b3
+ UdonariumLily 1.07.0b4
@@ -291,4 +296,4 @@