tforgione/3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

From mixed convetion (_, and camel case) to all camel case

Browse Source
This commit is contained in:
Thomas FORGIONE
2015-08-28 21:34:29 +02:00
parent f136ce833f
commit 74cad3824b
40 changed files with 323 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/l3d/src/canvases/MousePointer.js
View File

@@ -132,11 +132,11 @@ L3D.MousePointer.prototype.render = function(style, force) {
this.domElement.width = this.domElement.width;
var i = container_size.width() / 2;
var i = containerSize.width() / 2;
var imin = i - this.size;
var imax = i + this.size;
var j = container_size.height() / 2;
var j = containerSize.height() / 2;
var jmin = j - this.size;
var jmax = j + this.size;

28
js/l3d/src/canvases/Previewer.js
View File

@@ -61,15 +61,15 @@ L3D.Previewer = function(renderer, scene) {
/**
* Renders the preview
* @param {Number} container_width width of the container
* @param {Number} container_height height of the container
* @param {Number} containerWidth width of the container
* @param {Number} containerHeight height of the container
*/
L3D.Previewer.prototype.render = function(container_width, container_height) {
L3D.Previewer.prototype.render = function(containerWidth, containerHeight) {
var width, height, left, bottom;
if (this.camera) {
width = Math.floor(container_width / 5);
height = Math.floor(container_height / 5);
width = Math.floor(containerWidth / 5);
height = Math.floor(containerHeight / 5);
if (!this.fixed) {
left = Math.floor(this.mouse.x - width/2);
bottom = Math.floor(this.renderer.domElement.height - this.mouse.y + height/5);
@@ -88,22 +88,22 @@ L3D.Previewer.prototype.render = function(container_width, container_height) {
}
// Draw border
var can_bottom = container_height - bottom - height ;
var canBottom = containerHeight - bottom - height ;
this.ctx.strokeStyle = "#ffffff";
this.ctx.beginPath();
this.ctx.moveTo(left-1, can_bottom);
this.ctx.lineTo(left-1, can_bottom + height);
this.ctx.lineTo(left + width-1, can_bottom + height);
this.ctx.lineTo(left + width-1, can_bottom);
this.ctx.moveTo(left-1, canBottom);
this.ctx.lineTo(left-1, canBottom + height);
this.ctx.lineTo(left + width-1, canBottom + height);
this.ctx.lineTo(left + width-1, canBottom);
this.ctx.closePath();
this.ctx.stroke();
this.ctx.strokeStyle = "#000000";
this.ctx.beginPath();
this.ctx.moveTo(left, can_bottom + 1);
this.ctx.lineTo(left, can_bottom + height - 1);
this.ctx.lineTo(left + width - 2 , can_bottom + height-1);
this.ctx.lineTo(left + width - 2, can_bottom+1);
this.ctx.moveTo(left, canBottom + 1);
this.ctx.lineTo(left, canBottom + height - 1);
this.ctx.lineTo(left + width - 2 , canBottom + height-1);
this.ctx.lineTo(left + width - 2, canBottom+1);
this.ctx.closePath();
this.ctx.stroke();

2
js/l3d/src/canvases/StartCanvas.js
View File

@@ -44,7 +44,7 @@ L3D.StartCanvas.prototype.render = function(force) {
this.ctx.font = '30px Verdana';
this.ctx.globalAlpha = 1;
this.ctx.fillStyle = 'black';
this.ctx.fillText('Click here to lock the pointer !', container_size.width()/3.25, container_size.height()/2-10);
this.ctx.fillText('Click here to lock the pointer !', containerSize.width()/3.25, containerSize.height()/2-10);
this.shown = true;