From 7931a56bbbe22793bc92dd77a6953db9ffff6807 Mon Sep 17 00:00:00 2001 From: Manfred Touron Date: Mon, 9 Jan 2012 16:49:49 +0100 Subject: [PATCH] . --- rocket-3d/web/jquery.rocket-3d.js | 13 +++++++++++-- rocket-3d/web/jquery.rocket-3d.min.js | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/rocket-3d/web/jquery.rocket-3d.js b/rocket-3d/web/jquery.rocket-3d.js index 85a7aca..3afd533 100644 --- a/rocket-3d/web/jquery.rocket-3d.js +++ b/rocket-3d/web/jquery.rocket-3d.js @@ -27,7 +27,8 @@ fire_color: 0xFFBB00, onInitCallback: false, //playSong: 'http://files.42k.fr/files/hehengT016-space.mp3' - playSong: 'mus/space-loop-2.ogg' + playSong: ['mus/space-loop-2.ogg', 'mus/space-loop-2.mp3', 'mus/space-loop-2.mp4'], + playSong_volume: 0.7 }; var options = $.extend(defaults, options); @@ -165,7 +166,15 @@ oscilNewTween(dummy); if (options.playSong) { - $('body').append(''); + var audio = document.createElement('audio'); + for (var i = 0; i < options.playSong.length; i++) { + var source = document.createElement('source'); + source.src = options.playSong[i]; + audio.appendChild(source); + } + audio.volume = options.playSong_volume; + audio.play(); + //$('body').append(''); } animate(); }); diff --git a/rocket-3d/web/jquery.rocket-3d.min.js b/rocket-3d/web/jquery.rocket-3d.min.js index 7acac52..d9810ca 100644 --- a/rocket-3d/web/jquery.rocket-3d.min.js +++ b/rocket-3d/web/jquery.rocket-3d.min.js @@ -1,10 +1,10 @@ -(function(b){b.fn.rocket3d=function(a){var l={enterOn:"now",delayTime:5E3,width:b(window).width(),height:b(window).height(),far:1E4,near:0.1,angle:40,show_stats:!1,stars:800,konami_code:"38,38,40,40,37,39,37,39,66,65",show_wireframes:!1,use_mouse:!0,camera_z_position:1500,light_color:16777215,orbit_light_color:16746496,rocket_obj:"obj/rocket3d.js",rocket_tex:"tex/rocket3d_uvmap.png",rocket_rotation:{x:Math.PI/2,y:Math.PI*1.1,z:Math.PI/2},fire_obj:"obj/rocket3d_flame.js",fire_color:16759552,onInitCallback:!1, -playSong:"mus/space-loop-2.ogg"},a=b.extend(l,a);return this.each(function(){function i(){function q(a,b){var d=Math.random()*100+100;b&&(new TWEEN.Tween(b)).to({intensity:d/5},150).easing(TWEEN.Easing.Cubic.EaseIn).start();(new TWEEN.Tween(a.scale)).to({x:d,y:d,z:d},150).easing(TWEEN.Easing.Cubic.EaseIn).onComplete(function(){q(a,b,d)}).start()}function i(a){(new TWEEN.Tween(a.rotation)).to({x:Math.random()*Math.PI/15,y:Math.random()*Math.PI/20,z:Math.random()*Math.PI/15},930).easing(TWEEN.Easing.Linear.EaseNone).onComplete(function(){i(a)}).start()} -function l(){requestAnimationFrame(l);if(j){var b=Date.now()*5.0E-4;j.position.x=Math.sin(b*1)*500;j.position.y=Math.cos(b*1)*300;j.position.z=Math.cos(b*1)*200}c.position.x+=(m-c.position.x)*1;c.position.y+=(-r-c.position.y)*1;c.lookAt(f.position);s.position.x-=0.5;TWEEN.update();n.render(f,c);a.show_stats&&g&&g.update()}if(!t)if(t=!0,typeof Detector=="undefined"||!Detector.webgl)Detector.addGetWebGLMessage();else{var c,f,h,n,e,k,o,j,g=!1,m=0,r=0,p=a.width/2,x=a.height/2;k=a.width/a.height;b("body").append('
'); -h=b("#rocket3dcontainer");h.css({position:"absolute",width:a.width,height:a.height,top:0,left:0});h.css({background:"#000000"});h.hide();h.fadeIn(3E3);c=new THREE.PerspectiveCamera(a.angle,k,a.near,a.far);c.position.z=a.camera_z_position;f=new THREE.Scene;f.fog=new THREE.FogExp2(8947848,3.0E-4);f.fog.color.setRGB(0.5,0.5,0.5);k=new THREE.DirectionalLight(a.light_color);k.position.set(0,0,1).normalize();f.add(k);var u=new THREE.JSONLoader;k=new THREE.ParticleBasicMaterial({color:16738047,size:15,blending:THREE.AdditiveBlending, -transparent:!0});for(var v=new THREE.Geometry,w=0;w');l()})});n=new THREE.WebGLRenderer({antialias:!0});n.setSize(a.width,a.height);h.append(n.domElement);if(a.show_stats&&typeof Stats!="undefined")g=new Stats,g.domElement.style.position="absolute", -g.domElement.style.top="0px",g.domElement.style.right="0px",h.append(g.domElement);a.use_mouse&&document.addEventListener("mousemove",function(a){m=(a.clientX-p)*2;r=(a.clientY-x)*2},!1)}}var l=b(this),t=!1;if(a.enterOn=="now")i();else if(a.enterOn=="timer")setTimeout(i,a.delayTime);else if(a.enterOn=="click")l.bind("click",function(a){a.preventDefault();i()});else if(a.enterOn=="konami-code"){var m=[],p=a.konami_code;b(window).bind("keydown.rocketz",function(a){m.push(a.keyCode);m.toString().indexOf(p)>= -0&&(i(),m=[])},!0)}})}})(jQuery); +(function(e){e.fn.rocket3d=function(a){var l={enterOn:"now",delayTime:5E3,width:e(window).width(),height:e(window).height(),far:1E4,near:0.1,angle:40,show_stats:!1,stars:800,konami_code:"38,38,40,40,37,39,37,39,66,65",show_wireframes:!1,use_mouse:!0,camera_z_position:1500,light_color:16777215,orbit_light_color:16746496,rocket_obj:"obj/rocket3d.js",rocket_tex:"tex/rocket3d_uvmap.png",rocket_rotation:{x:Math.PI/2,y:Math.PI*1.1,z:Math.PI/2},fire_obj:"obj/rocket3d_flame.js",fire_color:16759552,onInitCallback:!1, +playSong:["mus/space-loop-2.ogg","mus/space-loop-2.mp3","mus/space-loop-2.mp4"],playSong_volume:0.7},a=e.extend(l,a);return this.each(function(){function i(){function q(a,d){var c=Math.random()*100+100;d&&(new TWEEN.Tween(d)).to({intensity:c/5},150).easing(TWEEN.Easing.Cubic.EaseIn).start();(new TWEEN.Tween(a.scale)).to({x:c,y:c,z:c},150).easing(TWEEN.Easing.Cubic.EaseIn).onComplete(function(){q(a,d,c)}).start()}function i(a){(new TWEEN.Tween(a.rotation)).to({x:Math.random()*Math.PI/15,y:Math.random()* +Math.PI/20,z:Math.random()*Math.PI/15},930).easing(TWEEN.Easing.Linear.EaseNone).onComplete(function(){i(a)}).start()}function l(){requestAnimationFrame(l);if(j){var d=Date.now()*5.0E-4;j.position.x=Math.sin(d*1)*500;j.position.y=Math.cos(d*1)*300;j.position.z=Math.cos(d*1)*200}b.position.x+=(m-b.position.x)*1;b.position.y+=(-r-b.position.y)*1;b.lookAt(f.position);s.position.x-=0.5;TWEEN.update();n.render(f,b);a.show_stats&&g&&g.update()}if(!t)if(t=!0,typeof Detector=="undefined"||!Detector.webgl)Detector.addGetWebGLMessage(); +else{var b,f,h,n,d,k,o,j,g=!1,m=0,r=0,p=a.width/2,x=a.height/2;k=a.width/a.height;e("body").append('
');h=e("#rocket3dcontainer");h.css({position:"absolute",width:a.width,height:a.height,top:0,left:0});h.css({background:"#000000"});h.hide();h.fadeIn(3E3);b=new THREE.PerspectiveCamera(a.angle,k,a.near,a.far);b.position.z=a.camera_z_position;f=new THREE.Scene;f.fog=new THREE.FogExp2(8947848,3.0E-4);f.fog.color.setRGB(0.5,0.5,0.5);k=new THREE.DirectionalLight(a.light_color); +k.position.set(0,0,1).normalize();f.add(k);var u=new THREE.JSONLoader;k=new THREE.ParticleBasicMaterial({color:16738047,size:15,blending:THREE.AdditiveBlending,transparent:!0});for(var v=new THREE.Geometry,w=0;w=0&&(i(),m=[])},!0)}})}})(jQuery);