Skip to content

Commit d50c04e

Browse files
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/loader/filetypes/AudioFile.js
2 parents 999b7d9 + e2d71e2 commit d50c04e

29 files changed

Lines changed: 513 additions & 488 deletions

src/geom/point/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Point.Floor = require('./Floor');
1414
Point.GetCentroid = require('./GetCentroid');
1515
Point.GetMagnitude = require('./GetMagnitude');
1616
Point.GetMagnitudeSq = require('./GetMagnitudeSq');
17+
Point.GetRectangleFromPoints = require('./GetRectangleFromPoints');
1718
Point.Interpolate = require('./Interpolate');
1819
Point.Invert = require('./Invert');
1920
Point.Multiply = require('./Multiply');

src/loader/FileTypesManager.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
var types = {};
2+
3+
var FileTypesManager = {
4+
5+
install: function (loader)
6+
{
7+
for (var key in types)
8+
{
9+
loader[key] = types[key];
10+
}
11+
},
12+
13+
register: function (key, factoryFunction)
14+
{
15+
types[key] = factoryFunction;
16+
17+
// console.log('FileTypesManager.register', key);
18+
},
19+
20+
destroy: function ()
21+
{
22+
types = {};
23+
}
24+
25+
};
26+
27+
module.exports = FileTypesManager;

src/loader/Loader.js

Lines changed: 0 additions & 337 deletions
This file was deleted.

0 commit comments

Comments
 (0)