Skip to content

T
three.js

车家大少爷 / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 00f48a54 编写于 作者: M Mr.doob 提交者： GitHub
浏览文件
操作

Merge pull request #14208 from Mugen87/dev1 

XLoader: Harmonize constructor
上级 31222d80 4579236b
隐藏空白更改
内联 并排
Showing with 23 addition and 20 deletion
examples/js/loaders/XLoader.js
浏览文件 @ 00f48a54
/**
* @author adrs2002 / https://github.com/adrs2002
*/
( function ( global, factory ) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
......@@ -203,13 +208,13 @@
var XLoader = function () {
function XLoader( manager, texloader ) {
function XLoader( manager ) {
classCallCheck( this, XLoader );
this.debug = false;
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.baseDir = "";
this._putMatLength = 0;
......
examples/webgl_loader_x.html
浏览文件 @ 00f48a54
......@@ -23,22 +23,22 @@
a {
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;
}
</style>
</head>
<body>
......@@ -71,7 +71,7 @@
<script src='js/Detector.js'></script>
<script src='js/libs/stats.min.js'></script>
<script src='js/libs/dat.gui.min.js'></script>
<script>
if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
......@@ -81,7 +81,6 @@
var clock = new THREE.Clock();
var mixers = [];
var manager = null;
var Texloader = null;
var skeletonHelper = null;
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 ] = {};
......@@ -244,7 +242,7 @@
} 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 () {
// !! important!
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或