Skip to content

Commit

Permalink
Merge pull request #387 from WhitestormJS/#386
Browse files Browse the repository at this point in the history
PR for #386
  • Loading branch information
hirako2000 committed Jun 28, 2018
2 parents bb11c55 + 1ce4bfd commit 1c2f8e2
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 11 deletions.
9 changes: 9 additions & 0 deletions types/modules/DefineModule.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export class DefineModule {

/**
* @constructor Creates a Define Module.
* @param name name of the module
* @param data
*/
constructor(name: String, data: Object);
}
3 changes: 2 additions & 1 deletion types/modules/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export * from './app';
export * from './mesh';
export * from './mesh';
export * from './DefineModule';
24 changes: 14 additions & 10 deletions types/whs-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
CameraComponent,
LightComponent,
MeshComponent
} from "./core";
} from './core';

import {
Box,
Expand Down Expand Up @@ -59,6 +59,8 @@ import {
TextureModule,
} from './modules/mesh';

import {DefineModule} from './modules';

import {
ControlsModule,
ElementModule,
Expand Down Expand Up @@ -141,14 +143,14 @@ cone.buildGeometry({buffer: true});
cone.addTo(app);

const shapeNative = new ShapeNative([
new Vector2(-4,-4),
new Vector2(-2,0),
new Vector2(-4,4),
new Vector2(0,2),
new Vector2(4,4),
new Vector2(2,0),
new Vector2(4,-4),
new Vector2(0,-2)
new Vector2(-4, -4),
new Vector2(-2, 0),
new Vector2(-4, 4),
new Vector2(0, 2),
new Vector2(4, 4),
new Vector2(2, 0),
new Vector2(4, -4),
new Vector2(0, -2)
]);

let extrude = new Extrude({
Expand Down Expand Up @@ -232,7 +234,7 @@ line.addTo(app);
const octahedron = new Octahedron({
geometry: {
radius: 1,
detail: 0
detail: 0
},

buffer: true
Expand Down Expand Up @@ -436,3 +438,5 @@ const data = stateModule.get('key');
const virtualMouseModule = new VirtualMouseModule();
virtualMouseModule.hovers(new Box(), false);
virtualMouseModule.track(new Sphere(), false);

const defineModule = new DefineModule('camera', new PerspectiveCamera());

0 comments on commit 1c2f8e2

Please sign in to comment.