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

Some cleaning, and lot of bugs corrected

Browse Source
This commit is contained in:
Thomas FORGIONE
2015-07-08 15:09:33 +02:00
parent 91e1d14e35
commit 6ef5a7c8fe
12 changed files with 352 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ L3D.MousePointer.toColor = function(style) {
* Re-renders the canvas
* For performance reasons, the rendering is done only if the style changed.
* @param {Number} style the L3D.MousePointer style you want to render
* @param {Boolean} force force the re-rendering (even if the style did not change)
* @param {Boolean} [force=false] force the re-rendering (even if the style did not change)
*
*/
L3D.MousePointer.prototype.render = function(style, force) {

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

@@ -54,6 +54,8 @@ L3D.Previewer = function(renderer, scene) {
* @description true if the rendering was done before
*/
this.drawnBefore = false;
this.mouse = {x: null, y: null};
};
/**
@@ -68,15 +70,15 @@ L3D.Previewer = function(renderer, scene) {
* @param {Number} container_width width of the container
* @param {Number} container_height height of the container
*/
L3D.Previewer.prototype.render = function(prev, container_width, container_height) {
L3D.Previewer.prototype.render = function(container_width, container_height) {
var width, height, left, bottom;
if (prev.go) {
if (this.camera) {
width = Math.floor(container_width / 5);
height = Math.floor(container_height / 5);
if (!this.fixed) {
left = Math.floor(prev.x - width/2);
bottom = Math.floor(this.renderer.domElement.height - prev.y + height/5);
left = Math.floor(this.mouse.x - width/2);
bottom = Math.floor(this.renderer.domElement.height - this.mouse.y + height/5);
// Translate box if too high
if (bottom + height > this.renderer.domElement.height) {
@@ -112,19 +114,19 @@ L3D.Previewer.prototype.render = function(prev, container_width, container_heigh
this.ctx.stroke();
// Do render in previsualization
prev.camera.look();
this.camera.look();
this.renderer.setScissor(left, bottom, width, height);
this.renderer.enableScissorTest(true);
this.renderer.setViewport(left, bottom, width, height);
this.renderer.render(this.scene, prev.camera.camera);
this.renderer.render(this.scene, this.camera);
this.update(true);
if (this.prevCamera !== prev.camera) {
if (this.prevCamera !== this.camera) {
this.clearNeeded = true;
}
this.prevCamera = prev.camera;
this.prevCamera = this.camera;
} else {
this.update(false);
}
@@ -162,3 +164,12 @@ L3D.Previewer.prototype.update = function(arg) {
this.drawnBefore = this.drawn;
this.drawn = arg;
};
L3D.Previewer.prototype.setCamera = function(camera) {
this.camera = camera;
}
L3D.Previewer.prototype.setPosition = function(x, y) {
this.mouse.x = x;
this.mouse.y = y;
}