Skip to content

Commit f4ea5ed

Browse files
committed
Fix: Standardize prefix of gltf extensions.
1 parent 31fd007 commit f4ea5ed

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

Hilo3d

Submodule Hilo3d updated 279 files

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "seinjs",
3-
"version": "1.5.18",
3+
"version": "1.6.0",
44
"description": "Modern game engine.",
55
"main": "lib/seinjs.js",
66
"module": "lib/seinjs.es.js",
@@ -24,7 +24,7 @@
2424
],
2525
"repository": {
2626
"type": "git",
27-
"url": "[email protected]:SeinJS/Sein.js.git"
27+
"url": "[email protected]:hiloteam/Sein.js.git"
2828
},
2929
"authors": [
3030
{
@@ -40,9 +40,9 @@
4040
"CHANGELOG.md"
4141
],
4242
"bugs": {
43-
"url": "http://github.com/SeinJS/Sein.js/issues"
43+
"url": "http://github.com/hiloteam/Sein.js/issues"
4444
},
45-
"homepage": "http://github.com/SeinJS/Sein.js#readme",
45+
"homepage": "http://github.com/hiloteam/Sein.js#readme",
4646
"devDependencies": {
4747
"@types/cannon": "^0.1.3",
4848
"@types/classnames": "0.0.32",

src/Resource/GlTFExtensions.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export const AliAMCExtension = (Hilo3d as any).AliAMCExtension as {
104104
* @hidden
105105
*/
106106
export const SeinNodeExtension: IGlTFExtension<ISeinNodeExtension> = {
107-
name: 'Sein_node',
107+
name: 'SEIN_node',
108108
optionParsers: {},
109109
registerOptionParsers(type: string, parser: (value: any, parser: IGlTFParser, info: ISeinNodeExtension) => any) {
110110
SeinNodeExtension.optionParsers[type] = parser;
@@ -195,7 +195,7 @@ SeinNodeExtension.registerOptionParsers('Object', (value: Object, parser: IGlTFP
195195
* @hidden
196196
*/
197197
export const SeinPhysicBodyExtension: IGlTFExtension<ISeinPhysicBodyExtension> = {
198-
name: 'Sein_physicBody',
198+
name: 'SEIN_physicBody',
199199
instantiate(entity: SceneActor | SceneComponent, info: ISeinPhysicBodyExtension, game: Game) {
200200
if (!isSceneActor(entity)) {
201201
Debug.warn(`You could not add physicBody to a component: ${entity.name}, ignore...`);
@@ -246,7 +246,7 @@ export const SeinPhysicBodyExtension: IGlTFExtension<ISeinPhysicBodyExtension> =
246246
* @hidden
247247
*/
248248
export const SeinAnimatorExtension: IGlTFExtension<ISeinNodeExtension> = {
249-
name: 'Sein_animator',
249+
name: 'SEIN_animator',
250250
instantiate(entity: SceneActor | SceneComponent) {
251251
if (!isSceneActor(entity)) {
252252
Debug.warn(`You could not add animator to a component: ${entity.name}, ignore...`);
@@ -259,7 +259,7 @@ export const SeinAnimatorExtension: IGlTFExtension<ISeinNodeExtension> = {
259259
* @hidden
260260
*/
261261
export const SeinRendererExtension: IGlTFExtension<ISeinRendererExtension> = {
262-
name: 'Sein_renderer',
262+
name: 'SEIN_renderer',
263263
parseOnLoad(info, parser: IGlTFParser) {
264264
parser['renderer'] = parser.json.extensions.Sein_renderer || {};
265265
},
@@ -316,7 +316,7 @@ export const SeinRendererExtension: IGlTFExtension<ISeinRendererExtension> = {
316316
* @hidden
317317
*/
318318
export const SeinAmbientLightExtension: IGlTFExtension<ISeinAmbientLightExtension> = {
319-
name: 'Sein_ambientLight',
319+
name: 'SEIN_ambientLight',
320320
parseOnEnd(info, parser: IGlTFParser, model: IGlTFModel) {
321321
const {color, intensity} = info;
322322

@@ -358,7 +358,7 @@ function getRelativePath(basePath: string, path: string) {
358358
* @hidden
359359
*/
360360
export const SeinCubeTextureExtension: IGlTFExtension = {
361-
name: 'Sein_cubeTexture',
361+
name: 'SEIN_cubeTexture',
362362
init(_, parser: IGlTFParser) {
363363
const game: Game = parser.game;
364364
const actions = [];
@@ -421,7 +421,7 @@ export const SeinCubeTextureExtension: IGlTFExtension = {
421421
* @hidden
422422
*/
423423
export const SeinImageBasedLightingExtension: IGlTFExtension<ISeinImageBasedLightingExtension> = {
424-
name: 'Sein_imageBasedLighting',
424+
name: 'SEIN_imageBasedLighting',
425425
init(_, parser: IGlTFParser) {
426426
const game: Game = parser.game;
427427
const extensions = parser.json.extensions || {};
@@ -527,7 +527,7 @@ export const SeinImageBasedLightingExtension: IGlTFExtension<ISeinImageBasedLigh
527527
* @hidden
528528
*/
529529
export const SeinAtlasExtension: IGlTFExtension = {
530-
name: 'Sein_atlas',
530+
name: 'SEIN_atlas',
531531
init(_, parser: IGlTFParser) {
532532
const game: Game = parser.game;
533533
const actions = [];
@@ -588,7 +588,7 @@ export const SeinAtlasExtension: IGlTFExtension = {
588588
* 这里的扩展仅仅是全局用于加载材质脚本的。
589589
*/
590590
export const SeinCustomMaterialExtension: IGlTFExtension = {
591-
name: 'Sein_customMaterial',
591+
name: 'SEIN_customMaterial',
592592
cache: {},
593593
init(_, parser: IGlTFParser) {
594594
const actions = [];
@@ -632,7 +632,7 @@ export class FakeHiloSprite extends Hilo3d.Node {
632632
* @hidden
633633
*/
634634
export const SeinSpriteExtension: IGlTFExtension<ISeinSpriteExtension> = {
635-
name: 'Sein_sprite',
635+
name: 'SEIN_sprite',
636636
init(_, parser: IGlTFParser) {
637637
const extensions = parser.json.extensions || {};
638638
const ex: ISeinSpriteSourceExtension = extensions.Sein_sprite || {};
@@ -666,7 +666,7 @@ export const SeinSpriteExtension: IGlTFExtension<ISeinSpriteExtension> = {
666666
* @hidden
667667
*/
668668
export const SeinSkyboxExtension: IGlTFExtension<ISeinSkyboxExtension> = {
669-
name: 'Sein_skybox',
669+
name: 'SEIN_skybox',
670670
parse(info: ISeinSkyboxExtension, parser: IGlTFParser, entity: any) {
671671
const camera = entity;
672672

@@ -699,7 +699,7 @@ export const SeinSkyboxExtension: IGlTFExtension<ISeinSkyboxExtension> = {
699699
* @hidden
700700
*/
701701
export const SeinTextureImproveExtension: IGlTFExtension<ISeinTextureImproveExtension> = {
702-
name: 'Sein_textureImprove',
702+
name: 'SEIN_textureImprove',
703703
parse(info: ISeinTextureImproveExtension, parser: IGlTFParser, texture: Texture) {
704704
texture.isImageCanRelease = info.isImageCanRelease;
705705
texture.anisotropic = info.anisotropic || texture.anisotropic;

src/Resource/GlTFLoader.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ export type IGlTFInstantResult = SArray<SceneActor>;
7777
* @hidden
7878
*/
7979
function materialCreator(name: string, metaData: any, json: any, parser: IGlTFParser) {
80-
if (!metaData || !metaData.extensions || !metaData.extensions['Sein_customMaterial']) {
80+
if (!metaData || !metaData.extensions || !metaData.extensions['SEIN_customMaterial']) {
8181
return;
8282
}
8383

8484
const {extensions, alphaMode, doubleSided} = metaData;
85-
const {className, uniforms, cloneForInst, renderOrder} = extensions['Sein_customMaterial'];
85+
const {className, uniforms, cloneForInst, renderOrder} = extensions['SEIN_customMaterial'];
8686

8787
const MaterialClass = MetaSMaterials[className] as {new(...args: any): RawShaderMaterial};
8888

0 commit comments

Comments
 (0)