Skip to content

Commit 44b2865

Browse files
authored
Merge pull request mrdoob#16758 from looeee/tidy_ctm_loader
Tidy up loaders/ctm folder
2 parents 607cb74 + ebc1efc commit 44b2865

File tree

9 files changed

+26
-64
lines changed

9 files changed

+26
-64
lines changed
File renamed without changes.

examples/js/loaders/ctm/lzma.js renamed to examples/js/libs/lzma.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ LZMA.RangeDecoder.prototype.init = function() {
9898

9999
this._code = 0;
100100
this._range = -1;
101-
101+
102102
while (i --) {
103103
this._code = (this._code << 8) | this._stream.readByte();
104104
}

examples/js/loaders/ctm/CTMLoader.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,30 @@
66
* http://code.google.com/p/js-openctm/
77
*
88
* @author alteredq / http://alteredqualia.com/
9+
*
10+
* OpenCTM LICENSE:
11+
*
12+
* Copyright (c) 2009-2010 Marcus Geelnard
13+
*
14+
* This software is provided 'as-is', without any express or implied
15+
* warranty. In no event will the authors be held liable for any damages
16+
* arising from the use of this software.
17+
*
18+
* Permission is granted to anyone to use this software for any purpose,
19+
* including commercial applications, and to alter it and redistribute it
20+
* freely, subject to the following restrictions:
21+
*
22+
* 1. The origin of this software must not be misrepresented; you must not
23+
* claim that you wrote the original software. If you use this software
24+
* in a product, an acknowledgment in the product documentation would be
25+
* appreciated but is not required.
26+
*
27+
* 2. Altered source versions must be plainly marked as such, and must not
28+
* be misrepresented as being the original software.
29+
*
30+
* 3. This notice may not be removed or altered from any source
31+
* distribution.
32+
*
933
*/
1034

1135
THREE.CTMLoader = function () {

examples/js/loaders/ctm/CTMWorker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
importScripts( "lzma.js", "ctm.js" );
1+
importScripts( "../../libs/lzma.js", "../../libs/ctm.js" );
22

33
self.onmessage = function ( event ) {
44

examples/js/loaders/ctm/license/OpenCTM.txt

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

examples/js/loaders/ctm/license/js-lzma.txt

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

examples/js/loaders/ctm/license/js-openctm.txt

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

examples/webgl_loader_ctm.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
<script src="../build/three.js"></script>
2020

21-
<script src="js/loaders/ctm/lzma.js"></script>
22-
<script src="js/loaders/ctm/ctm.js"></script>
2321
<script src="js/loaders/ctm/CTMLoader.js"></script>
2422

2523
<script src="js/WebGL.js"></script>

examples/webgl_loader_ctm_materials.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
<script src="js/controls/OrbitControls.js"></script>
2020

21-
<script src="js/loaders/ctm/lzma.js"></script>
22-
<script src="js/loaders/ctm/ctm.js"></script>
2321
<script src="js/loaders/ctm/CTMLoader.js"></script>
2422

2523
<script src="js/WebGL.js"></script>

0 commit comments

Comments
 (0)