Merge pull request #29 from sarvaje/issue-12

Fixed #12
This commit is contained in:
Anton Molleda 2015-04-29 07:19:30 -07:00
Родитель 73d6997720 0d4866f84f
Коммит de6a8b8d25
2 изменённых файлов: 20 добавлений и 17 удалений

Просмотреть файл

@ -1,23 +1,26 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Learn how to use WebAudio, WebGL and pointer events thanks to Babylon.js</title>
<meta name="og:title" content="Music Lounge" />
<meta name="description" content="Music Lounge is an interactive demo that showcase WebGL audio positioning within a minimalistic UI based on babylon.js" />
<meta name="keywords" content="Graphics, webgl, webaudio, pointer events" />
<meta name="author" content="deltakosh, meulta, davrous" />
<title>Learn how to use WebAudio, WebGL and pointer events thanks to Babylon.js</title>
<meta name="og:title" content="Music Lounge"/>
<meta name="description"
content="Music Lounge is an interactive demo that showcase WebGL audio positioning within a minimalistic UI based on babylon.js"/>
<meta name="keywords" content="Graphics, webgl, webaudio, pointer events"/>
<meta name="author" content="deltakosh, meulta, davrous"/>
<link href="styles/demo.css" rel="stylesheet" />
<link href="styles/demo.css" rel="stylesheet"/>
</head>
<body>
<canvas id="renderCanvas"></canvas>
<script src="scripts/hand.minified-1.2.js"></script>
<script src="scripts/babylon.max.js"></script>
<script src="scripts/musicLounge.soundsLoader.js"></script>
<script src="scripts/musiclounge.soundCube.js"></script>
<script src="scripts/musicLoung.asgardRing.js"></script>
<script src="scripts/musicLounge.globalEqualizer.js"></script>
<script src="scripts/musiclounge.main.js"></script>
<script src="scripts/index.js"></script>
<div class="container">
<canvas id="renderCanvas"></canvas>
</div>
<script src="scripts/hand.minified-1.2.js"></script>
<script src="scripts/babylon.max.js"></script>
<script src="scripts/musicLounge.soundsLoader.js"></script>
<script src="scripts/musiclounge.soundCube.js"></script>
<script src="scripts/musicLoung.asgardRing.js"></script>
<script src="scripts/musicLounge.globalEqualizer.js"></script>
<script src="scripts/musiclounge.main.js"></script>
<script src="scripts/index.js"></script>
</body>
</html>

Просмотреть файл

@ -10,7 +10,7 @@ var MusicLounge;
this._box = BABYLON.Mesh.CreateBox(name, this._boxSize, scene);
this._material = new BABYLON.StandardMaterial(name + ' material', this._scene);
this._material.diffuseColor = color;
var diffuseTexture = new BABYLON.Texture('/assets/flare.png', scene);
var diffuseTexture = new BABYLON.Texture('assets/flare.png', scene);
diffuseTexture.hasAlpha = true;
diffuseTexture.uScale = 0.5;
diffuseTexture.vScale = 0.5;
@ -122,7 +122,7 @@ var MusicLounge;
};
SoundCube.prototype.move = function (point, checkCollisionWith) {
//if (BABYLON.Vector3.Distance(point, BABYLON.Vector3.Zero()) > 30) {
// this.deMagnetize();
// this.deMagnetize();
// this.box.computeWorldMatrix(true);
//}
if (this.box.parent === undefined) {