Correct bug
This commit is contained in:
parent
11c42f8ee2
commit
650481bd54
|
@ -15,6 +15,7 @@ block extrahead
|
||||||
block content
|
block content
|
||||||
#main-div.panel-group(style={'margin-top':'10px', 'margin-bottom':'10px'})
|
#main-div.panel-group(style={'margin-top':'10px', 'margin-bottom':'10px'})
|
||||||
block description
|
block description
|
||||||
|
#alert-placeholder
|
||||||
|
|
||||||
button#full.btn.btn-primary(style={'margin-right': '10px', 'margin-bottom': '10px'}) Fullscreen
|
button#full.btn.btn-primary(style={'margin-right': '10px', 'margin-bottom': '10px'}) Fullscreen
|
||||||
button#reset.btn.btn-primary(style={'margin-right': '10px', 'margin-bottom':'10px'}) Reset camera
|
button#reset.btn.btn-primary(style={'margin-right': '10px', 'margin-bottom':'10px'}) Reset camera
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
OPT=--compilation_level SIMPLE_OPTIMIZATIONS
|
OPT=--compilation_level SIMPLE_OPTIMIZATIONS
|
||||||
|
|
||||||
|
ifeq ($(TYPE),RELEASE)
|
||||||
CLOSURE=java -jar /usr/share/java/closure-compiler/closure-compiler.jar
|
CLOSURE=java -jar /usr/share/java/closure-compiler/closure-compiler.jar
|
||||||
|
else
|
||||||
|
CLOSURE=./compiler.sh
|
||||||
|
endif
|
||||||
|
|
||||||
all: Three Stats ThreeTools Bouncing Multisphere StreamingSimulator PrototypeTools PrototypeReplay PrototypeInteractive Tutorial
|
all: Three Stats ThreeTools Bouncing Multisphere StreamingSimulator PrototypeTools PrototypeReplay PrototypeInteractive Tutorial
|
||||||
|
|
||||||
|
@ -76,6 +81,8 @@ PrototypeReplay:
|
||||||
|
|
||||||
Tutorial:
|
Tutorial:
|
||||||
$(CLOSURE) $(OPT) \
|
$(CLOSURE) $(OPT) \
|
||||||
|
--js TutoCamera.js \
|
||||||
|
--js prototype/TutorialSteps.js \
|
||||||
--js prototype/tutorial.js \
|
--js prototype/tutorial.js \
|
||||||
--js_output_file ../static/js/tutorial.min.js
|
--js_output_file ../static/js/tutorial.min.js
|
||||||
|
|
||||||
|
|
|
@ -262,8 +262,8 @@ function initBobombScene(scene, collidableObjects, loader, static_path) {
|
||||||
|
|
||||||
function resetBobombElements() {
|
function resetBobombElements() {
|
||||||
return {
|
return {
|
||||||
position: new THREE.Vector3(-8.849933489419644, 9.050627639459208, 0.6192960680432451),
|
position: new THREE.Vector3(38.115627509754646,10.829803024792419,-19.862035691341315),
|
||||||
target: new THREE.Vector3(17.945323228767702, -15.156828589982375, -16.585740412769756)
|
target: new THREE.Vector3(-1.4518898576752122,5.048214777643772,-18.869661407832535)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,7 @@ function init() {
|
||||||
// Initialize pointer camera
|
// Initialize pointer camera
|
||||||
var camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, container);
|
var camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, container);
|
||||||
camera1.speed = 0.005;
|
camera1.speed = 0.005;
|
||||||
camera1.resetBobomb();
|
camera1.reset();
|
||||||
camera1.save();
|
camera1.save();
|
||||||
scene.add(camera1);
|
scene.add(camera1);
|
||||||
|
|
||||||
|
|
|
@ -11,12 +11,12 @@ var spheres = new Array(mesh_number);
|
||||||
var visible = 0;
|
var visible = 0;
|
||||||
var stats;
|
var stats;
|
||||||
var previewer;
|
var previewer;
|
||||||
|
|
||||||
var loader;
|
var loader;
|
||||||
var coins;
|
var coins;
|
||||||
var beenFullscreen = false;
|
var beenFullscreen = false;
|
||||||
var isFullscreen = false;
|
var isFullscreen = false;
|
||||||
var previousTime;
|
var previousTime;
|
||||||
|
var tutorial;
|
||||||
|
|
||||||
var main_section = document.getElementById('main-section');
|
var main_section = document.getElementById('main-section');
|
||||||
var offset = function() {
|
var offset = function() {
|
||||||
|
@ -91,7 +91,8 @@ function init() {
|
||||||
scene.add(ambient_light);
|
scene.add(ambient_light);
|
||||||
|
|
||||||
// Initialize pointer camera
|
// Initialize pointer camera
|
||||||
var camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, container);
|
var camera1 = new TutoCamera(50, container_size.width() / container_size.height(), 0.01, 100000, container);
|
||||||
|
tutorial = camera1.tutorial;
|
||||||
camera1.speed = 0.001;
|
camera1.speed = 0.001;
|
||||||
camera1.resetElements = resetPeachElements();
|
camera1.resetElements = resetPeachElements();
|
||||||
camera1.reset();
|
camera1.reset();
|
||||||
|
@ -231,7 +232,6 @@ function render() {
|
||||||
// Update the recommendations
|
// Update the recommendations
|
||||||
cameras.update(cameras.mainCamera());
|
cameras.update(cameras.mainCamera());
|
||||||
|
|
||||||
|
|
||||||
// Set current position of camera
|
// Set current position of camera
|
||||||
cameras.look();
|
cameras.look();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue