Changes to the mineral practice page
This commit is contained in:
@@ -5,12 +5,15 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>3DVOL - 3D Virtual Object Library</title>
|
||||
|
||||
{% block includes %}
|
||||
<link href="{% static "three_d_viewer/css/styles.css" %}" rel="stylesheet" media="screen" />
|
||||
<script type="text/javascript" src="{% static "three_d_viewer/js/jquery.min.js" %}"></script>
|
||||
<script type='text/javascript' src="{% static "three_d_viewer/js/menu_jquery.js.js" %}"></script>
|
||||
<script type='text/javascript' src="{% static "three_d_viewer/js/menu_jquery.js" %}"></script>
|
||||
{% endblock %}
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body onload={% block loadscript %}""{% endblock %}>
|
||||
<div id="wrapper">
|
||||
<div id="container">
|
||||
<div id="header">
|
||||
|
||||
463
three_d_viewer/templates/three_d_viewer/mineral_detail.html
Normal file
463
three_d_viewer/templates/three_d_viewer/mineral_detail.html
Normal file
@@ -0,0 +1,463 @@
|
||||
{% extends "three_d_viewer/minerals_practice.html" %}
|
||||
{% load static %}
|
||||
|
||||
{% block includes %}
|
||||
{{ block.super }}
|
||||
<script type="text/javascript" src="{% static "three_d_viewer/js/lzma.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "three_d_viewer/js/ctm.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "three_d_viewer/js/glMatrix-0.9.5.min.js" %}"></script>
|
||||
|
||||
<script id="shader-vs" type="x-shader/x-vertex">
|
||||
attribute vec3 aVertexPosition;
|
||||
attribute vec4 aVertexColor;
|
||||
|
||||
uniform mat4 uMVMatrix;
|
||||
uniform mat4 uPMatrix;
|
||||
|
||||
varying vec4 vColor;
|
||||
|
||||
void main(void){
|
||||
gl_Position = uPMatrix * uMVMatrix * vec4(aVertexPosition, 1);
|
||||
|
||||
vColor = aVertexColor;
|
||||
}
|
||||
</script>
|
||||
|
||||
<script id="shader-fs" type="x-shader/x-fragment">
|
||||
#ifdef GL_ES
|
||||
precision highp float;
|
||||
#endif
|
||||
|
||||
varying vec4 vColor;
|
||||
|
||||
void main(void){
|
||||
gl_FragColor = vec4(vColor.rgb, 1);;
|
||||
}
|
||||
</script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var request;
|
||||
var file;
|
||||
var gl;
|
||||
var shaderProgram;
|
||||
var mvMatrix = mat4.create();
|
||||
var pMatrix = mat4.create();
|
||||
var vertexIndexBuffer;
|
||||
var vertexPositionBuffer;
|
||||
var vertexColorBuffer;
|
||||
var offsets = [];
|
||||
var mouseDown = false;
|
||||
var lastMouseX;
|
||||
var lastMouseY;
|
||||
var translationMatrix = vec3.create();
|
||||
var rotationMatrix = mat4.create();
|
||||
|
||||
window.requestAnimFrame = (function(){
|
||||
return window.requestAnimationFrame ||
|
||||
window.webkitRequestAnimationFrame ||
|
||||
window.mozRequestAnimationFrame ||
|
||||
window.oRequestAnimationFrame ||
|
||||
window.msRequestAnimationFrame ||
|
||||
function(callback, element){
|
||||
window.setTimeout(callback, 1000/60);
|
||||
};
|
||||
})();
|
||||
|
||||
function formatNumber(numero, decimales){
|
||||
var pot = Math.pow(10, decimales);
|
||||
return parseInt(numero * pot) / pot;
|
||||
}
|
||||
|
||||
{% block load %}
|
||||
function load(){
|
||||
window.addEventListener('resize', resizeCanvas, false);
|
||||
resizeCanvas();
|
||||
|
||||
var sampleFilename = '{{ mineral.model_filename|escapejs }}';
|
||||
|
||||
if (sampleFilename.trim() == "")
|
||||
{
|
||||
document.getElementById("progress").innerHTML = "No model defined!";
|
||||
return;
|
||||
}
|
||||
|
||||
request = new XMLHttpRequest();
|
||||
request.open("GET", '{{ MEDIA_URL }}' + sampleFilename, true);
|
||||
request.overrideMimeType("text/plain; charset=x-user-defined");
|
||||
request.onreadystatechange = function(){
|
||||
if (this.readyState == 3 || this.readyState == 4){
|
||||
document.getElementById("progress").innerHTML = "Downloading... "
|
||||
+ formatNumber(this.responseText.length / 1048576, 2) + " MB";
|
||||
}
|
||||
if (this.readyState == 4 && (this.status == 200 || this.status == 0) ){
|
||||
document.getElementById("progress").innerHTML = "Unpacking...";
|
||||
setTimeout(loaded, 1);
|
||||
}
|
||||
}
|
||||
request.send();
|
||||
}
|
||||
{% endblock load %}
|
||||
|
||||
function loaded(){
|
||||
/*if ( navigator.userAgent.indexOf("WebKit") == -1){
|
||||
var worker = new Worker("loader.js");
|
||||
|
||||
worker.onmessage = function(event){
|
||||
file = event.data;
|
||||
webGLStart();
|
||||
document.getElementById("progress").innerHTML = "";
|
||||
};
|
||||
|
||||
worker.postMessage(request.responseText);
|
||||
|
||||
}else{*/
|
||||
file = new CTM.File( new CTM.Stream(request.responseText) );
|
||||
webGLStart();
|
||||
document.getElementById("progress").innerHTML = "";
|
||||
//}
|
||||
}
|
||||
|
||||
function webGLStart(){
|
||||
var canvas = document.getElementById("canvas");
|
||||
canvas.oncontextmenu = function() { return false; } // supress the context menu in the canvas
|
||||
|
||||
|
||||
initGL(canvas);
|
||||
initBoundingBox();
|
||||
initOffsets();
|
||||
initShaders();
|
||||
initBuffers();
|
||||
|
||||
gl.clearColor(1.0, 1.0, 1.0, 1.0);
|
||||
gl.enable(gl.DEPTH_TEST);
|
||||
gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
|
||||
|
||||
vec3.set(translationMatrix, [0, 0, -100]);
|
||||
mat4.identity(rotationMatrix);
|
||||
|
||||
canvas.onmousedown = handleMouseDown;
|
||||
canvas.onmouseup = handleMouseUp;
|
||||
canvas.onmousemove = handleMouseMove;
|
||||
canvas.onmousewheel = handleMouseWheel;
|
||||
|
||||
canvas.addEventListener("DOMMouseScroll", handleMouseWheel, false);
|
||||
|
||||
tick();
|
||||
}
|
||||
|
||||
function initGL(canvas){
|
||||
try{
|
||||
gl = canvas.getContext("experimental-webgl");
|
||||
gl.viewportWidth = canvas.width;
|
||||
gl.viewportHeight = canvas.height;
|
||||
}catch(e){
|
||||
}
|
||||
if (!gl){
|
||||
alert("Could not initialise WebGL, sorry :-(");
|
||||
}
|
||||
}
|
||||
|
||||
function initBoundingBox(){
|
||||
var v = file.body.vertices;
|
||||
var x = Infinity, y = Infinity, z = Infinity;
|
||||
var X = -Infinity, Y = -Infinity, Z = -Infinity;
|
||||
|
||||
for (var i = 0; i < v.length; i += 3){
|
||||
if (v[i] < x) x = v[i];
|
||||
if (v[i+1] < y) y = v[i+1];
|
||||
if (v[i+2] < z) z = v[i+2];
|
||||
|
||||
if (v[i] > X) X = v[i];
|
||||
if (v[i+1] > Y) Y = v[i+1];
|
||||
if (v[i+2] > Z) Z = v[i+2];
|
||||
}
|
||||
|
||||
for (var i = 0; i < v.length; i += 3){
|
||||
v[i] = -( (X-x)/2 ) + ( v[i] - x);
|
||||
v[i+1] = -( (Y-y)/2 ) + ( v[i+1] - y);
|
||||
v[i+2] = -( (Z-z)/2 ) + ( v[i+2] - z);
|
||||
}
|
||||
}
|
||||
|
||||
function initOffsets(){
|
||||
var indices = file.body.indices;
|
||||
var start = 0;
|
||||
var min = file.body.vertices.length;
|
||||
var max = 0;
|
||||
var minPrev = min;
|
||||
|
||||
for (var i = 0; i < indices.length;){
|
||||
|
||||
for (var j = 0; j < 3; ++ j){
|
||||
var idx = indices[i ++];
|
||||
|
||||
if (idx < min) min = idx;
|
||||
if (idx > max) max = idx;
|
||||
}
|
||||
|
||||
if (max - min > 65535){
|
||||
i -= 3;
|
||||
|
||||
for (var k = start; k < i; ++ k){
|
||||
indices[k] -= minPrev;
|
||||
}
|
||||
offsets.push( {start: start, count: i - start, index: minPrev} );
|
||||
|
||||
start = i;
|
||||
min = file.body.vertices.length;
|
||||
max = 0;
|
||||
}
|
||||
|
||||
minPrev = min;
|
||||
}
|
||||
|
||||
for (var k = start; k < i; ++ k){
|
||||
indices[k] -= minPrev;
|
||||
}
|
||||
offsets.push( {start: start, count: i - start, index: minPrev} );
|
||||
}
|
||||
|
||||
function initShaders(){
|
||||
var fragmentShader = getShader(gl, "shader-fs");
|
||||
var vertexShader = getShader(gl, "shader-vs");
|
||||
|
||||
shaderProgram = gl.createProgram();
|
||||
gl.attachShader(shaderProgram, vertexShader);
|
||||
gl.attachShader(shaderProgram, fragmentShader);
|
||||
gl.linkProgram(shaderProgram);
|
||||
gl.useProgram(shaderProgram);
|
||||
|
||||
shaderProgram.vertexPositionAttribute = gl.getAttribLocation(shaderProgram, "aVertexPosition");
|
||||
gl.enableVertexAttribArray(shaderProgram.vertexPositionAttribute);
|
||||
|
||||
shaderProgram.vertexColorAttribute = gl.getAttribLocation(shaderProgram, "aVertexColor");
|
||||
gl.enableVertexAttribArray(shaderProgram.vertexColorAttribute);
|
||||
|
||||
shaderProgram.pMatrixUniform = gl.getUniformLocation(shaderProgram, "uPMatrix");
|
||||
shaderProgram.mvMatrixUniform = gl.getUniformLocation(shaderProgram, "uMVMatrix");
|
||||
}
|
||||
|
||||
function getShader(gl, id){
|
||||
var shaderScript = document.getElementById(id);
|
||||
|
||||
var str = "";
|
||||
var node = shaderScript.firstChild;
|
||||
while(node){
|
||||
if (node.nodeType == 3){
|
||||
str += node.textContent;
|
||||
}
|
||||
node = node.nextSibling;
|
||||
}
|
||||
|
||||
var shader;
|
||||
if (shaderScript.type == "x-shader/x-fragment"){
|
||||
shader = gl.createShader(gl.FRAGMENT_SHADER);
|
||||
}else if (shaderScript.type == "x-shader/x-vertex"){
|
||||
shader = gl.createShader(gl.VERTEX_SHADER);
|
||||
}
|
||||
|
||||
gl.shaderSource(shader, str);
|
||||
gl.compileShader(shader);
|
||||
|
||||
return shader;
|
||||
}
|
||||
|
||||
function initBuffers(){
|
||||
vertexIndexBuffer = gl.createBuffer();
|
||||
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, vertexIndexBuffer);
|
||||
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER,
|
||||
new Uint16Array(file.body.indices), gl.STATIC_DRAW);
|
||||
vertexIndexBuffer.itemSize = 1;
|
||||
vertexIndexBuffer.numItems = file.body.indices.length;
|
||||
|
||||
vertexPositionBuffer = gl.createBuffer();
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER, vertexPositionBuffer);
|
||||
gl.bufferData(gl.ARRAY_BUFFER,
|
||||
file.body.vertices, gl.STATIC_DRAW);
|
||||
vertexPositionBuffer.itemSize = 3;
|
||||
vertexPositionBuffer.numItems = file.body.vertices.length;
|
||||
|
||||
vertexColorBuffer = gl.createBuffer();
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER, vertexColorBuffer);
|
||||
gl.bufferData(gl.ARRAY_BUFFER,
|
||||
file.body.attrMaps[0].attr, gl.STATIC_DRAW);
|
||||
vertexColorBuffer.itemSize = 4;
|
||||
vertexColorBuffer.numItems = file.body.attrMaps[0].attr.length;
|
||||
}
|
||||
|
||||
function tick(){
|
||||
drawScene();
|
||||
requestAnimFrame(tick);
|
||||
}
|
||||
|
||||
function drawScene(){
|
||||
gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
|
||||
|
||||
mat4.perspective(45, gl.viewportWidth / gl.viewportHeight, 0.01, 1200.0, pMatrix);
|
||||
mat4.translate(pMatrix, [0.0, 0,-.6]);
|
||||
|
||||
mat4.identity(mvMatrix);
|
||||
mat4.translate(mvMatrix, translationMatrix);
|
||||
mat4.multiply(mvMatrix, rotationMatrix);
|
||||
|
||||
gl.uniformMatrix4fv(shaderProgram.pMatrixUniform, false, pMatrix);
|
||||
gl.uniformMatrix4fv(shaderProgram.mvMatrixUniform, false, mvMatrix);
|
||||
|
||||
var normalMatrix = mat3.create();
|
||||
mat4.toInverseMat3(mvMatrix, normalMatrix);
|
||||
mat3.transpose(normalMatrix);
|
||||
gl.uniformMatrix3fv(shaderProgram.nMatrixUniform, false, normalMatrix);
|
||||
|
||||
for (var i = 0; i < offsets.length; ++ i){
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER, vertexPositionBuffer);
|
||||
gl.vertexAttribPointer(shaderProgram.vertexPositionAttribute,
|
||||
vertexPositionBuffer.itemSize, gl.FLOAT, false, 0, offsets[i].index * 4 * 3);
|
||||
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER, vertexColorBuffer);
|
||||
gl.vertexAttribPointer(shaderProgram.vertexColorAttribute,
|
||||
vertexColorBuffer.itemSize, gl.FLOAT, false, 0, offsets[i].index * 4 * 4);
|
||||
|
||||
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, vertexIndexBuffer);
|
||||
gl.drawElements(gl.TRIANGLES, offsets[i].count, gl.UNSIGNED_SHORT, offsets[i].start * 2); // 2 = uint16
|
||||
}
|
||||
}
|
||||
|
||||
function degToRad(degrees){
|
||||
return degrees * Math.PI / 180;
|
||||
}
|
||||
|
||||
function handleMouseWheel(event){
|
||||
event.preventDefault();
|
||||
|
||||
var delta = event.wheelDelta | -event.detail;
|
||||
if (delta < 0){
|
||||
translationMatrix[2] -= .05;
|
||||
}else{
|
||||
translationMatrix[2] += .05;
|
||||
}
|
||||
|
||||
event.returnValue=false;
|
||||
}
|
||||
|
||||
function handleMouseDown(event){
|
||||
mouseDown = true;
|
||||
lastMouseX = event.clientX;
|
||||
lastMouseY = event.clientY;
|
||||
}
|
||||
|
||||
function handleMouseUp(event){
|
||||
mouseDown = false;
|
||||
}
|
||||
|
||||
function handleMouseMove(event){
|
||||
if (mouseDown){
|
||||
var newX = event.clientX;
|
||||
var newY = event.clientY;
|
||||
var deltaX = newX - lastMouseX;
|
||||
var deltaY = newY - lastMouseY;
|
||||
|
||||
switch (event.which) {
|
||||
case 1: // left mouse
|
||||
|
||||
|
||||
var newRotationMatrix = mat4.create();
|
||||
mat4.identity(newRotationMatrix);
|
||||
mat4.rotate(newRotationMatrix, degToRad(deltaX / 5), [0, 1, 0]);
|
||||
|
||||
mat4.rotate(newRotationMatrix, degToRad(deltaY / 5), [1, 0, 0]);
|
||||
mat4.multiply(newRotationMatrix, rotationMatrix, rotationMatrix);
|
||||
|
||||
break;
|
||||
case 3: // right mouse
|
||||
//translationMatrix[0] += deltaX;
|
||||
//translationMatrix[1] += deltaY;
|
||||
var newTranslateMatrix = mat4.create();
|
||||
mat4.identity(newTranslateMatrix);
|
||||
mat4.translate(newTranslateMatrix, [deltaX, deltaY, 0], [deltaX, deltaY, 0])
|
||||
console.log('moving ' + deltaX + ', ' + deltaY)
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
lastMouseX = newX
|
||||
lastMouseY = newY;
|
||||
}
|
||||
}
|
||||
|
||||
function resizeCanvas() {
|
||||
var canvas = document.getElementById("canvas") ;
|
||||
var parent = document.getElementById("virtualObject");
|
||||
|
||||
var canvasWidth1 = canvas.width;
|
||||
var canvasHeight1 = canvas.height;
|
||||
|
||||
canvas.width = parent.offsetWidth;
|
||||
canvas.height = parent.offsetHeight;
|
||||
|
||||
if (gl){
|
||||
/*hmove = canvas.width / 2 - canvasWidth1 / 2
|
||||
vmove = canvas.height / 2 - canvasHeight1 / 2
|
||||
mat4.translate(mvMatrix, [hmove, vmove, 0.0])
|
||||
console.log('Resizing from ' + canvasWidth1 + ' x ' + canvasHeight1 + ' to ' + canvas.width + ' x ' + canvas.height);
|
||||
console.log('moving centre ' + hmove + ' x ' + vmove)*/
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
{% block loadscript %}"load()"{% endblock %}
|
||||
|
||||
{% block mineral_detail %}
|
||||
<div id="mineralContainer">
|
||||
<div id="mineralOne">
|
||||
<h1 class="subHeadings">{{ mineral.name }}</h1>
|
||||
<h2 class="theoryHeadings">Physical properties</h2>
|
||||
<table class="table">
|
||||
<tr>
|
||||
<td>Chemical Formula:</td>
|
||||
<td>{{ mineral.chemical_formula|safe }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Hardness:</td>
|
||||
<td>{{ mineral.hardness }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Specific Gravity:</td>
|
||||
<td>{{ mineral.specific_gravity }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Cleavage/Fracture:</td>
|
||||
<td>{{ mineral.cleavage_fracture }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Lustre:</td>
|
||||
<td>{{ mineral.lustre }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Colour:</td>
|
||||
<td>{{ mineral.colour }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Streak:</td>
|
||||
<td>{{ mineral.habit }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Crystallography:</td>
|
||||
<td>{{ mineral.crystallography }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<h2 class="theoryHeadings">Diagnostic features</h2>
|
||||
<p>{{ mineral.identifying_features }}</p>
|
||||
<h2 class="theoryHeadings">Geological significance</h2>
|
||||
<p>{{ mineral.occurance }}</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block 3dcontent %}
|
||||
<div id="virtualObject">
|
||||
<canvas id="canvas" class="example"></canvas>
|
||||
<div><br><span id="progress" style="color: red"></span></div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -7,45 +7,17 @@
|
||||
<li class="has-sub mainitem"><a href="#">Select a mineral</a>
|
||||
<ul>
|
||||
{% for sample in active_samples %}
|
||||
<li>{{ sample.name }}</li>
|
||||
<li><a href={% url sample.url sample.id %}>{{ sample.name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div><!-- close MINERALMENU !-->
|
||||
<div id="mineralContainer">
|
||||
<div id="mineralOne" style="display:none">
|
||||
<h1 class="subHeadings">Mineral name here</h1>
|
||||
<h2 class="theoryHeadings">Physical properties</h2>
|
||||
<p>Info about the mineral here</p>
|
||||
<p>Info about the mineral here</p>
|
||||
<p>Info about the mineral here</p>
|
||||
<h2 class="theoryHeadings">Diagnostic features</h2>
|
||||
<p>Info about the mineral here</p>
|
||||
<p>Info about the mineral here</p>
|
||||
<p>Info about the mineral here</p>
|
||||
<h2 class="theoryHeadings">Geological significance</h2>
|
||||
<p>Info about the mineral here</p>
|
||||
<p>Info about the mineral here</p>
|
||||
<p>Info about the mineral here</p>
|
||||
</div>
|
||||
<div id="mineralTwo" style="display:none">
|
||||
<p>Info about mineral 2</p>
|
||||
</div>
|
||||
<div id="mineralThree" style="display:none">
|
||||
<p>Info about mineral 3</p>
|
||||
</div>
|
||||
<div id="mineralFour" style="display:none">
|
||||
<p>Info about mineral 4</p>
|
||||
</div>
|
||||
<div id="mineralFive" style="display:none">
|
||||
<p>Info about mineral 5</p>
|
||||
</div>
|
||||
</div>
|
||||
{% block mineral_detail %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
<div id="virtualObject">
|
||||
<img src="images/rock_example.jpeg" class="example" />
|
||||
</div>
|
||||
{% block 3dcontent %}
|
||||
{% endblock %}
|
||||
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user