From 3ebb0e866a37940750d9c4c9f647ae1cdbc6c862 Mon Sep 17 00:00:00 2001 From: Shane Frischkorn Date: Sat, 22 Feb 2014 14:26:54 +1000 Subject: [PATCH] Fixed size of model window, and made the background transparent --- three_d_viewer/static/three_d_viewer/css/styles.css | 2 +- three_d_viewer/templates/three_d_viewer/mineral_detail.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/three_d_viewer/static/three_d_viewer/css/styles.css b/three_d_viewer/static/three_d_viewer/css/styles.css index a06ec58..5cd2624 100644 --- a/three_d_viewer/static/three_d_viewer/css/styles.css +++ b/three_d_viewer/static/three_d_viewer/css/styles.css @@ -234,7 +234,7 @@ body { #virtualObject { width: 80%; - height: auto; + height: 100%; float: right; } diff --git a/three_d_viewer/templates/three_d_viewer/mineral_detail.html b/three_d_viewer/templates/three_d_viewer/mineral_detail.html index fe76d4a..ef931f1 100644 --- a/three_d_viewer/templates/three_d_viewer/mineral_detail.html +++ b/three_d_viewer/templates/three_d_viewer/mineral_detail.html @@ -128,7 +128,7 @@ function webGLStart(){ initShaders(); initBuffers(); - gl.clearColor(1.0, 1.0, 1.0, 1.0); + gl.clearColor(0, 0, 0, 0); gl.enable(gl.DEPTH_TEST); gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight); @@ -385,7 +385,7 @@ function handleMouseMove(event){ } function resizeCanvas() { - var canvas = document.getElementById("canvas") ; + var canvas = document.getElementById("canvas"); var parent = document.getElementById("virtualObject"); var canvasWidth1 = canvas.width;