A lot of cleaning, and compilation of the js code

This commit is contained in:
Thomas FORGIONE 2015-05-22 16:59:33 +02:00
parent fe34290802
commit a6a6c3521c
45 changed files with 100 additions and 41 deletions

View File

@ -1,9 +1,11 @@
extends ../../../views/withjs extends ../../../views/main
block title block title
title #{title} - Bouncing cube title #{title} - Bouncing cube
block extrajs block extrajs
script(src="/static/js/bouncing/BouncingMain.js") script(src="/static/js/three.min.js")
script(src="/static/js/threetools.min.js")
script(src="/static/js/bouncing.min.js")
block content block content
h2 Bouncing cube h2 Bouncing cube

View File

@ -1,10 +1,12 @@
extends ../../../views/withjs extends ../../../views/main.jade
block title block title
title #{title} - Multi-sphere title #{title} - Multi-sphere
block extrajs block extrajs
script(src="/static/js/multisphere/MultiSphere.js") script(src="/static/js/three.min.js")
script(src="/static/js/threetools.min.js")
script(src="/static/js/multisphere.min.js")
block content block content
h2 Multiresolution sphere h2 Multiresolution sphere

View File

@ -4,17 +4,7 @@ block title
title #{title} - Prototype title #{title} - Prototype
block extrajs block extrajs
script(src="/static/js/prototype/ArrowCamera.js") script(src="/static/js/prototypetools.min.js")
script(src="/static/js/prototype/FixedCamera.js")
script(src="/static/js/prototype/OldFixedCamera.js")
script(src="/static/js/prototype/ReverseCamera.js")
script(src="/static/js/prototype/initScene.js")
script(src="/static/js/prototype/raycasterTools.js")
script(src="/static/js/prototype/Previewer.js")
script(src="/static/js/prototype/ButtonManager.js")
script(src="/static/js/prototype/Coin.js")
script(src="/static/js/Logger.js")
block configjs block configjs
block mainjs block mainjs
script document.getElementById('music').volume = 0.5; script document.getElementById('music').volume = 0.5;

View File

@ -4,7 +4,7 @@ block title
title #{title} - Prototype title #{title} - Prototype
block mainjs block mainjs
script(src="/static/js/prototype/main.js") script(src="/static/js/prototypeinteractive.min.js")
block description block description
#instructions.panel.panel-default #instructions.panel.panel-default

View File

@ -6,7 +6,6 @@ block title
block configjs block configjs
script RecommendedCamera = FixedCamera; script RecommendedCamera = FixedCamera;
script var params = params || {}; params.get = params.get || {}; params.get.id = #{id}; script var params = params || {}; params.get = params.get || {}; params.get.id = #{id};
script(src="/static/js/ReplayCamera.js")
block mainjs block mainjs
script(src="/static/js/prototype/replay.js") script(src="/static/js/replay.min.js")

View File

@ -1,11 +1,13 @@
extends ../../../views/withjs extends ../../../views/main
block title block title
title #{title} - Streaming simulator title #{title} - Streaming simulator
block extrajs block extrajs
script params = {}; params.get= {}; params.get.res = #{resolution} script params = {}; params.get= {}; params.get.res = #{resolution}
script(src="/static/js/stream/main.js") script(src="/static/js/three.min.js")
script(src="/static/js/threetools.min.js")
script(src="/static/js/streamingsimulator.min.js")
block content block content
h2 Streaming simulator h2 Streaming simulator

78
js/Makefile Normal file
View File

@ -0,0 +1,78 @@
OPT=--compilation_level SIMPLE_OPTIMIZATIONS
CLOSURE=java -jar /usr/share/java/closure-compiler/closure-compiler.jar
all: Three Stats ThreeTools Bouncing Multisphere StreamingSimulator PrototypeTools PrototypeReplay PrototypeInteractive
Three:
cp three/three.min.js ../static/js/
Stats:
cp three/stats.min.js ../static/js/
ThreeTools:
$(CLOSURE) $(OPT) \
--js three/DDSLoader.js \
--js three/MTLLoader.js \
--js three/OBJMTLLoader.js \
--js three/OBJLoader.js \
--js three/OrbitControls.js \
--js Tools.js \
--js_output_file ../static/js/threetools.min.js
Bouncing:
$(CLOSURE) $(OPT) \
--js Camera.js \
--js Cube.js \
--js BouncingCube.js \
--js bouncing/BouncingMain.js \
--js_output_file ../static/js/bouncing.min.js
Multisphere:
$(CLOSURE) $(OPT) \
--js StaticPath.js \
--js Camera.js \
--js Cube.js \
--js multisphere/MultiSphere.js \
--js_output_file ../static/js/multisphere.min.js
StreamingSimulator:
$(CLOSURE) $(OPT) \
--js StaticPath.js \
--js Camera.js \
--js Cube.js \
--js ProgressiveSphere.js \
--js stream/main.js \
--js_output_file ../static/js/streamingsimulator.min.js
PrototypeTools:
$(CLOSURE) $(OPT) \
--js StaticPath.js \
--js Hermite.js \
--js Camera.js \
--js PointerCamera.js \
--js CameraContainer.js \
--js prototype/ArrowCamera.js \
--js prototype/FixedCamera.js \
--js prototype/OldFixedCamera.js \
--js prototype/ReverseCamera.js \
--js prototype/ReplayCamera.js \
--js prototype/initScene.js \
--js prototype/raycasterTools.js \
--js prototype/Previewer.js \
--js prototype/ButtonManager.js \
--js prototype/Coin.js \
--js Logger.js \
--js_output_file ../static/js/prototypetools.min.js
PrototypeInteractive:
$(CLOSURE) $(OPT) \
--js prototype/main.js \
--js_output_file ../static/js/prototypeinteractive.min.js
PrototypeReplay:
$(CLOSURE) $(OPT) \
--js prototype/replay.js \
--js_output_file ../static/js/replay.min.js
clean:
rm -ri ../static/js/*

View File

@ -179,7 +179,6 @@ PointerCamera.prototype.vectorsFromAngles = function() {
} }
PointerCamera.prototype.anglesFromVectors = function() { PointerCamera.prototype.anglesFromVectors = function() {
// Update phi and theta so that return to reality does not hurt
var forward = Tools.diff(this.target, this.position); var forward = Tools.diff(this.target, this.position);
forward.normalize(); forward.normalize();

1
js/StaticPath.js Normal file
View File

@ -0,0 +1 @@
static_path = "/static/";

View File

@ -15,9 +15,9 @@ CREATE TYPE PREVIOUSNEXT AS ENUM(
); );
CREATE TYPE VECTOR3 AS( CREATE TYPE VECTOR3 AS(
x FLOAT, x REAL,
y FLOAT, y REAL,
z FLOAT z REAL
); );
CREATE TYPE CAMERA AS( CREATE TYPE CAMERA AS(

View File

@ -1,20 +1,6 @@
extends ./main extends ./main
block js block js
script(src="/static/js/three.js") script(src="/static/js/three.min.js")
script(src="/static/js/Tools.js") script(src="/static/js/stats.min.js")
script(src="/static/js/three/stats.min.js") script(src="/static/js/threetools.min.js")
script(src="/static/js/three/DDSLoader.js")
script(src="/static/js/three/MTLLoader.js")
script(src="/static/js/three/OBJLoader.js")
script(src="/static/js/three/OBJMTLLoader.js")
-//script(src="/static/js/three/OrbitControls.js")
script(src="/static/js/Cube.js")
script(src="/static/js/ProgressiveSphere.js")
script(src="/static/js/Camera.js")
script(src="/static/js/BouncingCube.js")
script(src="/static/js/BufferGeometryToGeometry.js")
script(src="/static/js/PointerCamera.js")
script(src="/static/js/CameraContainer.js")
script(src="/static/js/Hermite.js")
script static_path="/static/";