|
@@ -10,51 +10,58 @@
|
|
|
* @param VrmlParser.Renderer.ThreeJs renderer
|
|
|
* @constructor
|
|
|
*/
|
|
|
-THREE.VRMLLoader = function (parser, manager) {
|
|
|
-
|
|
|
- this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager;
|
|
|
- this.parser = parser;
|
|
|
+THREE.VRMLLoader = function (parser, manager, debug) {
|
|
|
|
|
|
+ this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager;
|
|
|
+ this.parser = parser;
|
|
|
+ this.debug = debug;
|
|
|
};
|
|
|
|
|
|
THREE.VRMLLoader.prototype = {
|
|
|
|
|
|
- constructor: THREE.VRMLLoader,
|
|
|
+ constructor: THREE.VRMLLoader,
|
|
|
+
|
|
|
+ log: function (obj) {
|
|
|
+ if ( this.debug ) {
|
|
|
+ console.log(obj);
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
+ parse: function (data) {
|
|
|
+ try {
|
|
|
+ var tree = this.parser.parse(data);
|
|
|
|
|
|
- parse: function (data) {
|
|
|
- try {
|
|
|
- var tree = this.parser.parse(data);
|
|
|
- console.log(tree);
|
|
|
- return tree;
|
|
|
- } catch ( e ) {
|
|
|
- console.log('Exception with message ' + e.message);
|
|
|
+ this.log(tree);
|
|
|
+ return tree;
|
|
|
+ } catch ( e ) {
|
|
|
+ this.log('Exception with message ' + e.message);
|
|
|
|
|
|
- if ( undefined !== e.location ) {
|
|
|
- console.log('Exception at location start: offset: ' + e.location.start.offset + ' line: ' + e.location.start.line + ' column: ' + e.location.start.column);
|
|
|
- console.log('Exception at location end: offset: ' + e.location.end.offset + ' line: ' + e.location.end.line + ' column: ' + e.location.end.column);
|
|
|
- }
|
|
|
+ if ( undefined !== e.location ) {
|
|
|
+ this.log('Exception at location start: offset: ' + e.location.start.offset + ' line: ' + e.location.start.line + ' column: ' + e.location.start.column);
|
|
|
+ this.log('Exception at location end: offset: ' + e.location.end.offset + ' line: ' + e.location.end.line + ' column: ' + e.location.end.column);
|
|
|
+ }
|
|
|
|
|
|
- return;
|
|
|
- }
|
|
|
- },
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ },
|
|
|
|
|
|
- load: function (url, onLoad, onProgress, onError) {
|
|
|
+ load: function (url, onLoad, onProgress, onError) {
|
|
|
|
|
|
- var scope = this;
|
|
|
+ var scope = this;
|
|
|
|
|
|
- var loader = new THREE.XHRLoader(this.manager);
|
|
|
- loader.load(url, function (text) {
|
|
|
+ var loader = new THREE.FileLoader(this.manager);
|
|
|
+ loader.load(url, function (text) {
|
|
|
|
|
|
- onLoad(scope.parse(text));
|
|
|
+ onLoad(scope.parse(text));
|
|
|
|
|
|
- }, onProgress, onError);
|
|
|
+ }, onProgress, onError);
|
|
|
|
|
|
- },
|
|
|
+ },
|
|
|
|
|
|
- setCrossOrigin: function (value) {
|
|
|
+ setCrossOrigin: function (value) {
|
|
|
|
|
|
- this.crossOrigin = value;
|
|
|
+ this.crossOrigin = value;
|
|
|
|
|
|
- },
|
|
|
+ },
|
|
|
|
|
|
};
|