Sākums Izpētīt Palīdzība
Pierakstīties
javascript
/
three.js
spogulis no https://github.com/tazdij/three.js.git
2
0
Atdalīts 0
Faili Problēmas 0 Vikivietne
Pārlūkot izejas kodu

XLoader: Harmonize construtor

Mugen87 7 gadi atpakaļ
vecāks
7a87900029
revīzija
4579236bc7
2 mainītis faili ar 23 papildinājumiem un 20 dzēšanām
Apvienotais skats Rādīt salīdzināšanas statistiku
  1. 7 2
      examples/js/loaders/XLoader.js
  2. 16 18
      examples/webgl_loader_x.html

+ 7 - 2
examples/js/loaders/XLoader.js
Parādīt failu 

@@ -1,3 +1,8 @@
 
+/**
 
+ * @author adrs2002 / https://github.com/adrs2002
 
+ */
 
+
 
+
 
 ( function ( global, factory ) {
 
 ( function ( global, factory ) {
 
 
 
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 
@@ -203,13 +208,13 @@
 
 
 
 	var XLoader = function () {
 
 	var XLoader = function () {
 
 
 
-		function XLoader( manager, texloader ) {
 
+		function XLoader( manager ) {
 
 
 
 			classCallCheck( this, XLoader );
 
 			classCallCheck( this, XLoader );
 
 
 
 			this.debug = false;
 
 			this.debug = false;
 
 			this.manager = manager !== undefined ? manager : new THREE.DefaultLoadingManager();
 
 			this.manager = manager !== undefined ? manager : new THREE.DefaultLoadingManager();
 
-			this.texloader = texloader !== undefined ? texloader : new THREE.TextureLoader();
 
+			this.texloader = new THREE.TextureLoader( this.manager );
 
 			this.url = "";
 
 			this.url = "";
 
 			this.baseDir = "";
 
 			this.baseDir = "";
 
 			this._putMatLength = 0;
 
 			this._putMatLength = 0;

+ 16 - 18
examples/webgl_loader_x.html
Parādīt failu 

@@ -23,22 +23,22 @@
 
         a {
 
         a {
 
             color: #ff0000
 
             color: #ff0000
 
         }
 
         }
 
-        
-        #info2 { 
-            color: #fff; 
-            background-color: #000; 
-            position: absolute; 
-            top: 3em; 
-            right : 0px; 
-            width: 10em; 
-            z-index: 200; 
-            display: block;  
+
 
+        #info2 {
 
+            color: #fff;
 
+            background-color: #000;
 
+            position: absolute;
 
+            top: 3em;
 
+            right : 0px;
 
+            width: 10em;
 
+            z-index: 200;
 
+            display: block;
 
         }
 
         }
 
-    
-        td { 
+
 
+        td {
 
             padding: 0.5em;
 
             padding: 0.5em;
 
         }
 
         }
 
-        
+
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -71,7 +71,7 @@
 
 	<script src='js/Detector.js'></script>
 
 	<script src='js/Detector.js'></script>
 
 	<script src='js/libs/stats.min.js'></script>
 
 	<script src='js/libs/stats.min.js'></script>
 
 	<script src='js/libs/dat.gui.min.js'></script>
 
 	<script src='js/libs/dat.gui.min.js'></script>
 
-    
+
 
     <script>
 
     <script>
 
 
 
         if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
 
         if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
 
@@ -81,7 +81,6 @@
 
         var clock = new THREE.Clock();
 
         var clock = new THREE.Clock();
 
         var mixers = [];
 
         var mixers = [];
 
         var manager = null;
 
         var manager = null;
 
-        var Texloader = null;
 
 
 
         var skeletonHelper = null;
 
         var skeletonHelper = null;
 
         var animates = [];
 
         var animates = [];
 
@@ -156,8 +155,7 @@
 
 
 
             };
 
             };
 
 
 
-            Texloader = new THREE.TextureLoader();
 
-            var loader = new THREE.XLoader( manager, Texloader );
 
+            var loader = new THREE.XLoader( manager );
 
 
 
             actions[ 0 ] = {};
 
             actions[ 0 ] = {};
 
 
 
@@ -244,7 +242,7 @@
 
 
 
             } else {
 
             } else {
 
 
 
-                var loader2 = new THREE.XLoader( manager, Texloader );
 
+                var loader2 = new THREE.XLoader( manager );
 
                 loader2.load( [ 'models/xfile/' + animeName + '.x', { putPos: false, putScl: false } ], function () {
 
                 loader2.load( [ 'models/xfile/' + animeName + '.x', { putPos: false, putScl: false } ], function () {
 
 
 
                     // !! important!
 
                     // !! important!