File tree 13 files changed +18
-14
lines changed
renderer/renderer/adapter
13 files changed +18
-14
lines changed Original file line number Diff line number Diff line change 1
1
var Events = require ( "../interface/notification.js" ) ;
2
2
var config = require ( "../interface/elements.js" ) . config ;
3
- var Resource = require ( "../resource/coordinator.js " ) ;
3
+ var Resource = require ( "../resource" ) ;
4
4
5
5
/**
6
6
* A normal adapter that doesn't need to be connected to a DOM node
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ var Asset = require("../../asset/asset.js").Asset;
7
7
var SubData = require ( "../../asset/asset.js" ) . SubData ;
8
8
var Events = require ( "../../interface/notification.js" ) ;
9
9
var dispatchCustomEvent = require ( "../../utils/misc.js" ) . dispatchCustomEvent ;
10
- var Resource = require ( "../../resource/fetcher.js " ) ;
10
+ var Resource = require ( "../../resource" ) ;
11
11
12
12
var NodeAdapter = require ( "../../base/adapter.js" ) . NodeAdapter ;
13
13
var createClass = XML3D . createClass ;
Original file line number Diff line number Diff line change @@ -49,10 +49,8 @@ XML3D.options = require("./utils/options.js");
49
49
XML3D . materials = require ( "./renderer/webgl/materials/urn/registery.js" ) ;
50
50
//XML3D.resource = require("./base/resourcemanager.js").Resource; //Required for the test library because the RM needs to "belong" to the same document as the XML3D element in order to resolve references correctly
51
51
XML3D . resource = { } ;
52
- XML3D . extend ( XML3D . resource , require ( "./resource/fetcher.js" ) ) ;
53
- XML3D . extend ( XML3D . resource , require ( "./resource/coordinator.js" ) ) ;
52
+ XML3D . extend ( XML3D . resource , require ( "./resource" ) ) ;
54
53
XML3D . extend ( XML3D . resource , require ( "./utils/uri.js" ) ) ;
55
- XML3D . resource . FormatHandler = require ( "./resource/formathandler.js" ) ;
56
54
//XML3D.resource.AdapterFactory
57
55
XML3D . webcl = require ( "./utils/webcl.js" ) . webcl ;
58
56
XML3D . math = require ( "gl-matrix" ) ;
Original file line number Diff line number Diff line change 1
- var Resource = require ( "../resource/coordinator.js " ) ;
1
+ var Resource = require ( "../resource" ) ;
2
2
3
3
var string2bool = function ( string ) {
4
4
if ( ! string ) {
Original file line number Diff line number Diff line change 1
1
var events = require ( "./notification.js" ) ;
2
2
var ClassInfo = require ( "./configuration.js" ) . classInfo ;
3
- var Resource = require ( "../resource/coordinator.js " ) ;
3
+ var Resource = require ( "../resource" ) ;
4
4
5
5
var MutationObserver = ( window . MutationObserver || window . WebKitMutationObserver || window . MozMutationObserver ) ,
6
6
mutObserver ;
Original file line number Diff line number Diff line change 1
1
var sendAdapterEvent = require ( "../utils/misc.js" ) . sendAdapterEvent ;
2
2
var callAdapterFunc = require ( "../utils/misc.js" ) . callAdapterFunc ;
3
3
var CSS = require ( "../utils/css.js" ) ;
4
- var Resource = require ( "../resource/coordinator.js " ) ;
4
+ var Resource = require ( "../resource" ) ;
5
5
6
6
var Vec3 = require ( "../types/vec3.js" ) ;
7
7
var Mat4 = require ( "../types/mat4.js" ) ;
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ var SceneElementAdapter = require("./scene-element.js");
2
2
3
3
var Events = require ( "../../../interface/notification.js" ) ;
4
4
var LightConfiguration = require ( "../scene/configuration.js" ) ;
5
- var Resource = require ( "../../../resource/coordinator.js " ) ;
5
+ var Resource = require ( "../../../resource" ) ;
6
6
7
7
var DEFAULT_LIGHT_MODEL = "urn:xml3d:light:directional" ;
8
8
/**
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ var RenderAdapter = require("./base.js");
2
2
var Events = require ( "../../../interface/notification.js" ) ;
3
3
var URI = require ( "../../../utils/uri.js" ) . URI ;
4
4
var AdapterHandle = require ( "../../../base/adapterhandle.js" ) ;
5
- var Resource = require ( "../../../resource/coordinator.js " ) ;
5
+ var Resource = require ( "../../../resource" ) ;
6
6
7
7
/**
8
8
* @param factory
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ var SceneElementAdapter = require("./scene-element.js");
2
2
3
3
var Events = require ( "../../../interface/notification.js" ) ;
4
4
var encodeZIndex = require ( "../../../utils/misc.js" ) . encodeZIndex ;
5
- var Resource = require ( "../../../resource/coordinator.js " ) ;
5
+ var Resource = require ( "../../../resource" ) ;
6
6
7
7
var DEFAULT_PRIMITIVE_TYPE = "triangles" ;
8
8
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ var Events = require("../../../interface/notification.js");
4
4
var AdapterHandle = require ( "../../../base/adapterhandle.js" ) ;
5
5
var encodeZIndex = require ( "../../../utils/misc.js" ) . encodeZIndex ;
6
6
var mat4 = require ( "gl-matrix" ) . mat4 ;
7
- var Resource = require ( "../../../resource/coordinator.js " ) ;
7
+ var Resource = require ( "../../../resource" ) ;
8
8
9
9
10
10
var ModelRenderAdapter = function ( factory , node ) {
Original file line number Diff line number Diff line change 1
1
var SceneElementAdapter = require ( "./scene-element.js" ) ;
2
2
var CameraConfiguration = require ( "../scene/configuration.js" ) ;
3
- var Resource = require ( "../../../resource/coordinator.js " ) ;
3
+ var Resource = require ( "../../../resource" ) ;
4
4
5
5
var DEFAULT_CAMERA_MODEL = "urn:xml3d:view:perspective" ;
6
6
Original file line number Diff line number Diff line change
1
+ var Resource = { } ;
2
+ XML3D . extend ( Resource , require ( "./coordinator.js" ) ) ;
3
+ XML3D . extend ( Resource , require ( "./fetcher.js" ) ) ;
4
+ Resource . FormatHandler = require ( "./formathandler.js" ) ;
5
+
6
+ module . exports = Resource ;
Original file line number Diff line number Diff line change 1
1
var XC = require ( "../xflow/interface/constants.js" ) ;
2
- var Resource = require ( "../resource/coordinator.js " ) ;
2
+ var Resource = require ( "../resource" ) ;
3
3
4
4
var c_XflowObserverList = [ ] ;
5
5
You can’t perform that action at this time.
0 commit comments