Skip to content

Commit af5b423

Browse files
committed
Add an index.js to /resource to make the require statements easier
1 parent 6788905 commit af5b423

File tree

13 files changed

+18
-14
lines changed

13 files changed

+18
-14
lines changed

src/base/adapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var Events = require("../interface/notification.js");
22
var config = require("../interface/elements.js").config;
3-
var Resource = require("../resource/coordinator.js");
3+
var Resource = require("../resource");
44

55
/**
66
* A normal adapter that doesn't need to be connected to a DOM node

src/data/adapter/asset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var Asset = require("../../asset/asset.js").Asset;
77
var SubData = require("../../asset/asset.js").SubData;
88
var Events = require("../../interface/notification.js");
99
var dispatchCustomEvent = require("../../utils/misc.js").dispatchCustomEvent;
10-
var Resource = require("../../resource/fetcher.js");
10+
var Resource = require("../../resource");
1111

1212
var NodeAdapter = require("../../base/adapter.js").NodeAdapter;
1313
var createClass = XML3D.createClass;

src/global.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,8 @@ XML3D.options = require("./utils/options.js");
4949
XML3D.materials = require("./renderer/webgl/materials/urn/registery.js");
5050
//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
5151
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"));
5453
XML3D.extend(XML3D.resource, require("./utils/uri.js"));
55-
XML3D.resource.FormatHandler = require("./resource/formathandler.js");
5654
//XML3D.resource.AdapterFactory
5755
XML3D.webcl = require("./utils/webcl.js").webcl;
5856
XML3D.math = require("gl-matrix");

src/interface/attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var Resource = require("../resource/coordinator.js");
1+
var Resource = require("../resource");
22

33
var string2bool = function(string) {
44
if (!string) {

src/interface/elements.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var events = require("./notification.js");
22
var ClassInfo = require("./configuration.js").classInfo;
3-
var Resource = require("../resource/coordinator.js");
3+
var Resource = require("../resource");
44

55
var MutationObserver = (window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver),
66
mutObserver;

src/interface/methods.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var sendAdapterEvent = require("../utils/misc.js").sendAdapterEvent;
22
var callAdapterFunc = require("../utils/misc.js").callAdapterFunc;
33
var CSS = require("../utils/css.js");
4-
var Resource = require("../resource/coordinator.js");
4+
var Resource = require("../resource");
55

66
var Vec3 = require("../types/vec3.js");
77
var Mat4 = require("../types/mat4.js");

src/renderer/renderer/adapter/light.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var SceneElementAdapter = require("./scene-element.js");
22

33
var Events = require("../../../interface/notification.js");
44
var LightConfiguration = require("../scene/configuration.js");
5-
var Resource = require("../../../resource/coordinator.js");
5+
var Resource = require("../../../resource");
66

77
var DEFAULT_LIGHT_MODEL = "urn:xml3d:light:directional";
88
/**

src/renderer/renderer/adapter/material.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var RenderAdapter = require("./base.js");
22
var Events = require("../../../interface/notification.js");
33
var URI = require("../../../utils/uri.js").URI;
44
var AdapterHandle = require("../../../base/adapterhandle.js");
5-
var Resource = require("../../../resource/coordinator.js");
5+
var Resource = require("../../../resource");
66

77
/**
88
* @param factory

src/renderer/renderer/adapter/mesh.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var SceneElementAdapter = require("./scene-element.js");
22

33
var Events = require("../../../interface/notification.js");
44
var encodeZIndex = require("../../../utils/misc.js").encodeZIndex;
5-
var Resource = require("../../../resource/coordinator.js");
5+
var Resource = require("../../../resource");
66

77
var DEFAULT_PRIMITIVE_TYPE = "triangles";
88

src/renderer/renderer/adapter/model.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var Events = require("../../../interface/notification.js");
44
var AdapterHandle = require("../../../base/adapterhandle.js");
55
var encodeZIndex = require("../../../utils/misc.js").encodeZIndex;
66
var mat4 = require("gl-matrix").mat4;
7-
var Resource = require("../../../resource/coordinator.js");
7+
var Resource = require("../../../resource");
88

99

1010
var ModelRenderAdapter = function (factory, node) {

src/renderer/renderer/adapter/view.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var SceneElementAdapter = require("./scene-element.js");
22
var CameraConfiguration = require("../scene/configuration.js");
3-
var Resource = require("../../../resource/coordinator.js");
3+
var Resource = require("../../../resource");
44

55
var DEFAULT_CAMERA_MODEL = "urn:xml3d:view:perspective";
66

src/resource/index.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
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;

src/types/data-observer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var XC = require("../xflow/interface/constants.js");
2-
var Resource = require("../resource/coordinator.js");
2+
var Resource = require("../resource");
33

44
var c_XflowObserverList = [];
55

0 commit comments

Comments
 (0)