From 32785e06cd47fc6c5c64c7e9c077769a462ae5ea Mon Sep 17 00:00:00 2001 From: yo mama Date: Thu, 12 Feb 2015 20:23:41 -0800 Subject: moving over...adding cgi --- js/3D_Landscape.js | 60 +++++++++++++++++++++++++++++++----------------------- js/generating.js | 8 ++++++++ js/pb.js | 2 ++ js/username.js | 30 +++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 25 deletions(-) create mode 100644 js/generating.js create mode 100644 js/username.js (limited to 'js') diff --git a/js/3D_Landscape.js b/js/3D_Landscape.js index ca71ea6..1619de5 100644 --- a/js/3D_Landscape.js +++ b/js/3D_Landscape.js @@ -42,6 +42,11 @@ function initGraphics(textureFile, heightmapFile, cb) { var img = new Image(); img.src = heightmapFile; + img.onerror = function() { + alert("The following url did not work: "+heightmapFile.slice(14)); + is_generating = false; + toggle_background(); + }; img.onload = function(){ context.drawImage(img, 0, 0); @@ -99,6 +104,35 @@ function initGraphics(textureFile, heightmapFile, cb) { rot_x = mesh.rotation.x; rot_y = mesh.rotation.y; rot_z = mesh.rotation.z; + is_generating = false; + toggle_background(); + cb(); + }; +} + +var requestId; +function loop() { + render(); + requestId = window.requestAnimationFrame(loop); +} +function animate() { + if (!requestId) { + loop(); + } +} +function stop_animating() { + if (requestId) { + window.cancelAnimationFrame(requestId); + requestId = undefined; + } +} + + +function render() { + renderer.render(scene, camera); +} + +function init_controls(){ //{{{init controls //Controls @@ -169,32 +203,8 @@ function initGraphics(textureFile, heightmapFile, cb) { }); //}}} - cb(); - }; -} - -var requestId; -function loop() { - render(); - requestId = window.requestAnimationFrame(loop); -} -function animate() { - if (!requestId) { - loop(); - } -} -function stop_animating() { - if (requestId) { - window.cancelAnimationFrame(requestId); - requestId = undefined; - } } - - -function render() { - renderer.render(scene, camera); -} - window.onload= function(e){ runWebGLSimulation(); + init_controls(); } diff --git a/js/generating.js b/js/generating.js new file mode 100644 index 0000000..1b1cf03 --- /dev/null +++ b/js/generating.js @@ -0,0 +1,8 @@ +var is_generating = false; +function toggle_background(){ + if (is_generating){ + $('body').css("background", "url(img/generating_background.gif)"); + }else{ + $('body').css("background", "whitesmoke"); + } +} diff --git a/js/pb.js b/js/pb.js index b2babb5..6fad993 100644 --- a/js/pb.js +++ b/js/pb.js @@ -53,6 +53,8 @@ function loadNew() { textureURL = document.getElementById("texture").value.replace(/\s/,""); heightmapURL = document.getElementById("heightmap").value.replace(/\s/,""); + is_generating = true; + toggle_background(); console.log(textureURL); console.log(heightmapURL); stop_animating(); diff --git a/js/username.js b/js/username.js new file mode 100644 index 0000000..1222127 --- /dev/null +++ b/js/username.js @@ -0,0 +1,30 @@ +$(document).ready(function(){ + var name = get_name_from_cookie() + $("#username").val(name) +}); + +function get_name_from_cookie() + { + if (document.cookie) + { + var cookies = document.cookie.split(";") + for (i in cookies) + { + var cookie = cookies[i].split("=") + if (cookie[0].indexOf("imname") !== -1) + { + if (cookie[1] !== 'false' && cookie[1] !== 'undefined' && cookie[1].length) + { + return cookie[1] + } + } + } + } + return "" +}; + +function update_username(data){ + if (data.username.length > 0){ + document.cookie = "imname="+data.username+";path=/;domain=.asdf.us;max-age=1086400" + } +} -- cgit v1.2.3-70-g09d2