Merge pull request #21559 from bertoritger/master

A-Frame register custom geometry fix
This commit is contained in:
Benjamin Lichtman 2017-11-21 10:35:16 -08:00 committed by GitHub
commit 91d0d1fa53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions

View File

@ -1,5 +1,4 @@
// Global
const threeCamera = new AFRAME.THREE.Camera();
AFRAME.TWEEN.Easing;
@ -42,9 +41,18 @@ entity.addEventListener('child-detached', (event) => {
const Component = AFRAME.registerComponent('test', {});
// Scene
const scene = document.querySelector('a-scene');
scene.hasLoaded;
// System
const system = scene.systems['systemName'];
// Register Custom Geometry
AFRAME.registerGeometry('a-test-geometry', {
schema: {
groupIndex: { default: 0 }
},
init(data) {
this.geometry = new THREE.Geometry();
}
});

View File

@ -1,6 +1,7 @@
// Type definitions for AFRAME 0.5
// Type definitions for AFRAME 0.7
// Project: https://aframe.io/
// Definitions by: Paul Shannon <https://github.com/devpaul>
// Roberto Ritger <https://github.com/bertoritger>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 2.3
@ -40,7 +41,7 @@ declare namespace AFrame {
primitives: { [ key: string ]: Entity };
registerComponent(name: string, component: ComponentDefinition): ComponentConstructor;
registerElement(name: string, element: ANode): void;
registerGeometry(name: string, geometery: THREE.Geometry): Geometry;
registerGeometry(name: string, geometry: GeometryDefinition): Geometry;
registerPrimitive(name: string, primitive: PrimitiveDefinition): void;
registerShader(name: string, shader: any): void;
registerSystem(name: string, definition: SystemDefinition): void;
@ -101,7 +102,7 @@ declare namespace AFrame {
name: string;
schema: Schema;
init(): void;
init(data?: any): void;
pause(): void;
play(): void;
remove(): void;
@ -124,7 +125,7 @@ declare namespace AFrame {
multiple?: boolean;
schema?: Schema;
init?(): void;
init?(data?: any): void;
pause?(): void;
play?(): void;
remove?(): void;
@ -222,6 +223,10 @@ declare namespace AFrame {
[ key: string ]: any;
}
interface GeometryDefinition extends ComponentDefinition {
geometry?: THREE.Geometry;
}
interface GeometryDescriptor {
Geometry: Geometry;
schema: Schema;