Skip to content

Commit ea3e645

Browse files
mschoefflermschoeffler
committed
Implemented Faro's feedback.
1 parent 3b54564 commit ea3e645

16 files changed

+19
-39
lines changed

‎configs/spatial.yaml

+1-13
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,9 @@ pages:
3434
bezierInnerLeft: [50,0,-100]
3535
bezierInnerRight: [-50,0,-100]
3636
bezierOuterRight: [-100,0,-50]
37-
# - type: hwd
38-
# name: hwd
39-
# label: HWD1
40-
# color: 0x987654
41-
# stimulus: C2
42-
# bezierOuterLeft: [-100,50,50]
43-
# bezierInnerLeft: [-50,50,100]
44-
# bezierInnerRight: [299,50,100]
45-
# bezierOuterRight: [200,50,50]
46-
# height: 100
47-
# depth: 50
4837
views:
4938
- view: front
5039
- view: top
51-
# - view: 3d
5240
position: [400,50,400]
5341
objects:
5442
- type: listener
@@ -119,7 +107,7 @@ pages:
119107
- type: localization
120108
name: locA
121109
label: A
122-
color: 0xff0000
110+
color: 0xff0000
123111
stimulus: C1
124112
position: [100,100,0]
125113
size: 20

‎lib/webmushra/datamodel/SpatialASWRating.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
44
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55

‎lib/webmushra/datamodel/SpatialHWDRating.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
44
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55

‎lib/webmushra/datamodel/SpatialLEVRating.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
44
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55

‎lib/webmushra/datamodel/SpatialLocalizationRating.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
44
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55

‎lib/webmushra/pages/SpatialPage.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
4-
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
4+
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55
6-
**************************************************************************/
6+
**************************************************************************/
77

88
function SpatialPage(_pageManager, _pageConfig, _session, _audioContext, _bufferSize, _audioFileLoader, _errorHandler, _language) {
99
this.session = _session;
@@ -273,8 +273,6 @@ SpatialPage.prototype.render = function(_id) {
273273
div.appendChild(tableStimuli);
274274

275275
// responses
276-
//var tableButtons = $("<table>");
277-
//var trButton = ("tr");
278276

279277
for (var i = 0; i < this.pageConfig.responses.length; ++i) {
280278
var respConfig = this.pageConfig.responses[i];
@@ -372,7 +370,6 @@ SpatialPage.prototype.load = function() {
372370

373371
SpatialPage.prototype.save = function() {
374372
clearInterval(this.frameUpdateInterval);
375-
// this.fpc.unbind();
376373
this.time += (new Date() - this.startTimeOnPage);
377374
this.filePlayer.free();
378375
};

‎lib/webmushra/spatial/Camera.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
44
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55

‎lib/webmushra/spatial/Scene.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
44
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55
@@ -47,8 +47,6 @@ function Scene(_parentDomElement, _camera, _pageConfig, _viewConfig) {
4747

4848
Scene.prototype.transformRelativeCoordinates = function(_relX, _relY, _activeObjX, _activeObjY, _activeObjZ) {
4949

50-
// console.log("X: " + _activeObjX + "; Y: " + _activeObjY + "; Z: " + _activeObjZ);
51-
5250
var position = [null, null, null];
5351
if(this.wmCamera.type == 1){ //orthographic camera
5452
if(this.viewConfig.view == 'front'){
@@ -136,7 +134,7 @@ Scene.prototype.buildRectangularElement = function() {
136134
this.height = this.pageConfig.roomMeasurements[1];
137135
this.depth = this.pageConfig.roomMeasurements[2];
138136

139-
var carpet = THREE.ImageUtils.loadTexture('lib/webmushra/spatial/resources/carpet.png');
137+
var carpet = THREE.ImageUtils.loadTexture('res/spatial/carpet.png');
140138
carpet.wrapS = THREE.RepeatWrapping;
141139
carpet.wrapT = THREE.RepeatWrapping;
142140
carpet.repeat.x = 8;
@@ -149,13 +147,13 @@ Scene.prototype.buildRectangularElement = function() {
149147
});
150148
this.floor = new THREE.Mesh(new THREE.PlaneGeometry(this.width, this.depth), this.materialFloor);
151149

152-
var wallpaper = new THREE.ImageUtils.loadTexture("lib/webmushra/spatial/resources/ceiling.png");
150+
var wallpaper = new THREE.ImageUtils.loadTexture("res/spatial/ceiling.png");
153151
wallpaper.wrapS = THREE.RepeatWrapping;
154152
wallpaper.wrapT = THREE.RepeatWrapping;
155153
wallpaper.repeat.x = 8;
156154
wallpaper.repeat.y = 8;
157155

158-
var wall = new THREE.ImageUtils.loadTexture("lib/webmushra/spatial/resources/wall.png");
156+
var wall = new THREE.ImageUtils.loadTexture("res/spatial/wall.png");
159157
wall.wrapS = THREE.RepeatWrapping;
160158
wall.wrapT = THREE.RepeatWrapping;
161159
wall.repeat.x = 4;
@@ -261,7 +259,7 @@ Scene.prototype.addListener = function(_configListener) {
261259
var rotz = _configListener.rotation[2] * 2 * Math.PI / 360.0;
262260
var loader = new THREE.ColladaLoader();
263261

264-
var str = "var tempScene = this.scene; loader.load('lib/webmushra/spatial/resources/listener_head.dae', function(collada) {";
262+
var str = "var tempScene = this.scene; loader.load('res/spatial/listener_head.dae', function(collada) {";
265263
str += "collada.scene.scale.x = collada.scene.scale.y = collada.scene.scale.z = 10;";
266264
str += "collada.scene.rotation.x =-Math.PI / 2 + " + rotx + ";";
267265
str += "collada.scene.rotation.y = " + roty + " - Math.PI;";

‎lib/webmushra/spatial/objects/ASWObject.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
44
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55
@@ -8,7 +8,7 @@ This source code is protected by copyright law and international treaties. This
88
function ASWObject(_objConfig) {
99

1010
this.objConfig = _objConfig;
11-
this.group;//new THREE.Object3D();
11+
this.group;
1212
this.height = _objConfig.height;
1313
this.depth = _objConfig.depth;
1414
if(_objConfig.depth == null){
@@ -273,7 +273,6 @@ ASWObject.prototype.getCenterPosition = function() {
273273
* Returns a hash map with values to save.
274274
*/
275275
ASWObject.prototype.storeValues = function(_trial, _session, _trial_id) {
276-
// var trial = this.session.getTrial(this.pageConfig.type, this.pageConfig.id);
277276
if (_trial === null) {
278277
_trial = new Trial();
279278
_trial.type = this.objConfig.type;

‎lib/webmushra/spatial/objects/LEVObject.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
44
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55
@@ -350,7 +350,6 @@ LEVObject.prototype.setPosition3 = function(_x,_y,_z){
350350
* Returns a hash map with values to save.
351351
*/
352352
LEVObject.prototype.storeValues = function(_trial, _session, _trial_id) {
353-
// var trial = this.session.getTrial(this.pageConfig.type, this.pageConfig.id);
354353
if (_trial === null) {
355354
_trial = new Trial();
356355
_trial.type = this.objConfig.type;

‎lib/webmushra/spatial/objects/LocalizationObject.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
44
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55
@@ -51,7 +51,6 @@ LocalizationObject.prototype.getCenterPosition = function() {
5151
* Returns a hash map with values to save.
5252
*/
5353
LocalizationObject.prototype.storeValues = function(_trial, _session, _trial_id) {
54-
// var trial = this.session.getTrial(this.pageConfig.type, this.pageConfig.id);
5554
if (_trial === null) {
5655
_trial = new Trial();
5756
_trial.type = this.objConfig.type;

‎lib/webmushra/spatial/objects/SpatialObject.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************************
2-
(C) Copyright AudioLabs 2015
2+
(C) Copyright AudioLabs 2017
33
44
This source code is protected by copyright law and international treaties. This source code is made available to You subject to the terms and conditions of the Software License for the webMUSHRA.js Software. Said terms and conditions have been made available to You prior to Your download of this source code. By downloading this source code You agree to be bound by the above mentionend terms and conditions, which can also be found here: https://www.audiolabs-erlangen.de/resources/webMUSHRA. Any unauthorised use of this source code may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
55

‎lib/webmushra/spatial/resources/carpet.png renamed to ‎res/spatial/carpet.png

File renamed without changes.

‎lib/webmushra/spatial/resources/ceiling.png renamed to ‎res/spatial/ceiling.png

File renamed without changes.

‎lib/webmushra/spatial/resources/listener_head.dae renamed to ‎res/spatial/listener_head.dae

File renamed without changes.

‎lib/webmushra/spatial/resources/wall.png renamed to ‎res/spatial/wall.png

File renamed without changes.

0 commit comments

Comments
 (0)