diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 92b9bb1e..00000000 --- a/.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -#root = true - -[*] -indent_style = space -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true -max_line_length = 100 -indent_size = 2 - -[*.md] -trim_trailing_whitespace = false diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 00000000..467def3b --- /dev/null +++ b/.eslintignore @@ -0,0 +1,7 @@ +node_modules +dist +storybook +src/extensions/DynamicTerrain.ts +src/generatedCode.ts +src/generatedProps.ts +tools \ No newline at end of file diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 00000000..46c45b19 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,12 @@ +{ + "root": true, + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ] +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 277e7a5a..cca99627 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,5 @@ coverage compiled .awcache dist -storybook-static *.lock debug diff --git a/.npmignore b/.npmignore index 9c197007..fb42d64d 100644 --- a/.npmignore +++ b/.npmignore @@ -1,23 +1,24 @@ coverage +docs media node_modules src -stories -storyboard-static +storybook test tools -.editorconfig .eslintignore .eslintrc .gitattributes .gitignore +.grenrc.json .nyc_output -.storybook +.nycrc.json .travis.yml .vscode README.md rollup.config.js tsconfig.generate.json tsconfig.json +tsconfig.test.json tslint.json yarn.lock \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index c25e7fc3..8273a85f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -16,7 +16,7 @@ "console": "integratedTerminal", "internalConsoleOptions": "neverOpen", "env": { - "TS_NODE_PROJECT": "tsconfig.generate.json", + "TS_NODE_PROJECT": "tools/tsconfig.generate.json", "TS_NODE_TRANSPILE_ONLY": "true" } }, { diff --git a/media/react-babylonjs-boxes.gif b/docs/images/react-babylonjs-boxes.gif similarity index 100% rename from media/react-babylonjs-boxes.gif rename to docs/images/react-babylonjs-boxes.gif diff --git a/media/react-babylonjs-hmr.gif b/docs/images/react-babylonjs-hmr.gif similarity index 100% rename from media/react-babylonjs-hmr.gif rename to docs/images/react-babylonjs-hmr.gif diff --git a/package.json b/package.json index db6ea861..16214011 100644 --- a/package.json +++ b/package.json @@ -30,84 +30,47 @@ "node": ">=6.0.0" }, "scripts": { - "lint": "tslint -t codeFrame 'src/**/*.ts'", + "lint": "eslint . --ext .ts", "prebuild": "rimraf dist", "build": "cross-env NODE_ENV=production rollup -c", "start": "tsc-watch --onSuccess \"rollup -c\"", "deploy-docs": "ts-node tools/gh-pages-publish", - "storybook": "start-storybook -p 6006 -s ./storyboard-site", - "prestorybook": "npm run build", - "build-storybook": "build-storybook -o storybook-static -s ./storyboard-site", - "generate-code": "ts-node -P tsconfig.generate.json tools/generate-code", - "unit-test": "cross-env TS_NODE_PROJECT=\"tsconfig.test.json\" mocha --require ts-node/register --require esm \"test/**/*.spec.{js,jsx,ts,tsx}\"", + "generate-code": "ts-node -P tsconfig.generate.json tools/generate-code.ts", + "unit-test": "cross-env TS_NODE_PROJECT=\"test/tsconfig.json\" mocha --require ts-node/register --require esm \"test/**/*.spec.{js,jsx,ts,tsx}\"", "test": "npm run unit-test", "test:coverage": "nyc --reporter=lcov --reporter=text-summary npm run test" }, - "lint-staged": { - "src/**/*.ts": [ - "prettier --write --no-semi --print-width 160" - ] - }, "devDependencies": { - "@babel/core": "7.12.7", - "@babel/plugin-proposal-class-properties": "^7.12.1", "@babylonjs/core": "^4.2.0", "@babylonjs/gui": "^4.2.0", - "@babylonjs/inspector": "^4.2.0", - "@babylonjs/loaders": "^4.2.0", - "@babylonjs/materials": "^4.2.0", - "@babylonjs/procedural-textures": "^4.2.0", - "@inlet/react-pixi": "^6.5.2", "@rollup/plugin-json": "^4.0.2", - "@rollup/plugin-typescript": "^6.1.0", - "@storybook/addon-actions": "^6.1.9", - "@storybook/addon-links": "^6.1.9", - "@storybook/addon-storysource": "^6.0.27", - "@storybook/addons": "^6.1.9", - "@storybook/react": "^6.1.9", - "@storybook/source-loader": "^6.1.9", - "@storybook/theming": "^6.1.9", + "@rollup/plugin-replace": "^3.0.0", "@types/lodash.camelcase": "^4.3.6", "@types/mocha": "^8.2.0", "@types/node": "^14.14.10", "@types/react": "^17.0.0", "@types/react-reconciler": "^0.18.0", "@types/sinon": "^9.0.10", - "babel-loader": "^8.2.2", - "cannon": "^0.6.2", - "chroma-js": "^2.1.0", + "@typescript-eslint/eslint-plugin": "^4.29.1", + "@typescript-eslint/parser": "^4.29.1", "cross-env": "^7.0.0", - "earcut": "^2.2.2", + "eslint": "^7.32.0", "esm": "^3.2.25", "github-release-notes": "0.17.2", - "gsap": "^3.6.1", - "honeycomb-grid": "^3.1.7", - "lerp": "^1.0.3", - "lint-staged": "^10.5.2", "lodash.camelcase": "^4.3.0", "mocha": "8.1.3", "nyc": "^15.1.0", - "pixi-projection": "^0.3.11", - "pixi.js": "^5.2.1", - "prettier": "^2.2.1", "react": "^17.0.1", - "react-babylon-spring": "^1.0.2", "react-dom": "^17.0.1", "rimraf": "^3.0.2", "rollup": "^2.0.6", "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.29.0", + "rollup-plugin-typescript2": "^0.30.0", "sinon": "^9.2.4", - "storybook": "^6.1.9", "ts-morph": "^10.1.0", "ts-node": "^9.1.1", "tsc-watch": "^4.2.9", "tsconfig-paths": "^3.9.0", - "tslint": "^6.1.3", - "tslint-config-prettier": "^1.17.0", - "tslint-config-standard": "^9.0.0", - "typedoc": "^0.20.14", - "typedoc-plugin-markdown": "^3.4.0", "typescript": "4.1.2" }, "peerDependencies": { @@ -117,7 +80,6 @@ "react-dom": ">=17" }, "dependencies": { - "@rollup/plugin-replace": "^3.0.0", "react-reconciler": "^0.26.1" } } diff --git a/rollup.config.js b/rollup.config.js index 65c2d018..33605ec3 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,6 +1,8 @@ import json from '@rollup/plugin-json'; import replace from '@rollup/plugin-replace'; import typescript from 'rollup-plugin-typescript2'; +// not working +// import typescript from '@rollup/plugin-typescript'; const pkg = require('./package.json') const libraryName = pkg.name diff --git a/src/HostRegistrationStore.ts b/src/HostRegistrationStore.ts index 2cf7d711..d6dc5577 100644 --- a/src/HostRegistrationStore.ts +++ b/src/HostRegistrationStore.ts @@ -22,9 +22,9 @@ export class HostRegistrationStore { private static _store: Record> = {}; /** - * Registers a new host element - * @param host host element to dynamically register - */ + * Registers a new host element + * @param host host element to dynamically register + */ public static Register(host: DynamicHost): void { this._store[host.hostElementName] = host; } diff --git a/src/PropsHandler.ts b/src/PropsHandler.ts index 7f20488b..9dc67094 100644 --- a/src/PropsHandler.ts +++ b/src/PropsHandler.ts @@ -1,7 +1,6 @@ import { FresnelParameters } from '@babylonjs/core/Materials/fresnelParameters.js'; import { BaseTexture } from '@babylonjs/core/Materials/Textures/baseTexture.js'; -import { Color4 } from '@babylonjs/core/Maths/math.color.js'; -import { Color3 } from '@babylonjs/core/Maths/math.color.js'; +import { Color3, Color4 } from '@babylonjs/core/Maths/math.color.js'; import { Quaternion, Vector3 } from '@babylonjs/core/Maths/math.vector.js'; import { Observable } from '@babylonjs/core/Misc/observable.js'; @@ -318,8 +317,8 @@ export const checkControlDiff = (oldProp: Control | undefined, newProp: Control }) } -export const checkObjectDiff = (oldProp: object | undefined, newProp: object | undefined, propertyName: string, changedProps: PropertyUpdate[]): void => { - propertyCheck(oldProp, newProp, propertyName, PropChangeType.Primitive, changedProps, (oldProp, newProp, changedProps) => { +export const checkObjectDiff = (oldProp: Record | undefined, newProp: Record | undefined, propertyName: string, changedProps: PropertyUpdate[]): void => { + propertyCheck>(oldProp, newProp, propertyName, PropChangeType.Primitive, changedProps, (oldProp, newProp, changedProps) => { if (newProp !== oldProp) { changedProps.push({ propertyName, diff --git a/src/ReactBabylonJSHostConfig.ts b/src/ReactBabylonJSHostConfig.ts index 91b6e7f8..c97aeb0a 100644 --- a/src/ReactBabylonJSHostConfig.ts +++ b/src/ReactBabylonJSHostConfig.ts @@ -1,4 +1,4 @@ -import ReactReconciler, { HostConfig } from 'react-reconciler'; +import ReactReconciler, { HostConfig, Fiber } from 'react-reconciler'; import { IInspectable, InspectableType } from '@babylonjs/core/Misc/iInspectable.js'; import { Nullable } from '@babylonjs/core/types.js'; @@ -46,7 +46,7 @@ export type Container = { rootInstance: CreatedInstance } -type HostContext = {} & Container +type HostContext = Container type TimeoutHandler = number | undefined type NoTimeout = number @@ -58,11 +58,9 @@ function createCreatedInstance>( customProps?: CustomProps, lifecycleListener?: LifecycleListener ): CreatedInstance { - let createdMetadata = metadata - // TODO: move how this is generated as a boolean to a metadata on objects themselves (and the next 3 lines!). if ((propsHandlers as any).isTargetable === true) { - createdMetadata.isTargetable = true + metadata.isTargetable = true } return { @@ -70,7 +68,7 @@ function createCreatedInstance>( customProps, hostInstance, lifecycleListener, - metadata: createdMetadata, + metadata, observers: {}, parent: null, // set later in lifecycle propsHandlers, @@ -119,7 +117,7 @@ function removeChild(parentInstance: CreatedInstance, child: CreatedInstanc /** * remove child recursive */ -function removeRecursive(array: any, parent: any, clone: boolean = false): void { +function removeRecursive(array: any, parent: any, clone = false): void { if (array) { const target = clone ? [...array] : array; target.forEach((child: any) => removeChild(parent, child)); @@ -155,15 +153,18 @@ function addChild(parent: CreatedInstance | undefined, child: CreatedInstan */ const getConstructorValue = (type: string, value: any) : any => { switch(type) { - case 'BabylonjsCoreVector3': + case 'BabylonjsCoreVector3': { const v3result = CustomPropsHandler.HandlePropsChange(PropChangeType.Vector3, undefined, value); return v3result.processed ? v3result.value : value; - case 'BabylonjsCoreColor3': + } + case 'BabylonjsCoreColor3': { const c3result = CustomPropsHandler.HandlePropsChange(PropChangeType.Vector3, undefined, value); return c3result.processed ? c3result.value : value; - case 'BabylonjsCoreColor4': + } + case 'BabylonjsCoreColor4': { const c4result = CustomPropsHandler.HandlePropsChange(PropChangeType.Color4, undefined, value); return c4result.processed ? c4result.value : value; + } default: return value; } @@ -174,12 +175,12 @@ const ReactBabylonJSHostConfig: HostConfig< Props, Container, HostCreatedInstance, - {}, - {}, - {}, + Record, + Record, + Record, HostContext, UpdatePayload, - {}, + Record, TimeoutHandler, NoTimeout > & { @@ -238,11 +239,11 @@ const ReactBabylonJSHostConfig: HostConfig< if (!instance || (instance.metadata && instance.metadata.customType === true)) { return null } - let updatePayload: PropertyUpdate[] = [] + const updatePayload: PropertyUpdate[] = [] // Only custom types will not have a fiber object to handle props changes instance.propsHandlers!.getPropsHandlers().forEach((propHandler: PropsHandler) => { - let handlerUpdates: PropertyUpdate[] | null = propHandler.getPropertyUpdates( + const handlerUpdates: PropertyUpdate[] | null = propHandler.getPropertyUpdates( oldProps, newProps ) @@ -258,7 +259,7 @@ const ReactBabylonJSHostConfig: HostConfig< container.rootInstance.children.splice(0); }, - insertBefore(parentInstance: HostCreatedInstance, child: CreatedInstance, beforeChild: {} | CreatedInstance | undefined): void { + insertBefore(parentInstance: HostCreatedInstance, child: CreatedInstance, beforeChild: Record | CreatedInstance | undefined): void { let index: number | undefined = undefined; if (parentInstance && beforeChild !== undefined) { index = parentInstance.children.indexOf(beforeChild as CreatedInstance); @@ -291,7 +292,7 @@ const ReactBabylonJSHostConfig: HostConfig< props: Props, rootContainerInstance: Container, hostContext: HostContext, - internalInstanceHandle: Object + internalInstanceHandle: Fiber ): CreatedInstance | undefined => { // TODO: Make a registry like React Native host config or just build a map in /customHosts/index.ts. const customTypes: string[] = [] @@ -300,13 +301,13 @@ const ReactBabylonJSHostConfig: HostConfig< const { scene } = rootContainerInstance if (customTypes.indexOf(type) !== -1) { - let metadata = { + const metadata = { className: type, customType: true, ...props.metadata } - let createdInstance: CreatedInstance = { + const createdInstance: CreatedInstance = { children: [], customProps: {}, hostInstance: null, @@ -339,7 +340,7 @@ const ReactBabylonJSHostConfig: HostConfig< let babylonObject: any | undefined = undefined // TODO: define this type as an export. - let customProps: AnyCustomProps = { + const customProps: AnyCustomProps = { // Control3D childrenAsContent: props.childrenAsContent === true, // ie: Button3D.container instead of .addControl() // AdvancedDynamicTexture @@ -371,7 +372,7 @@ const ReactBabylonJSHostConfig: HostConfig< } else { const createInfoArgs = classDefinition.CreateInfo; metadata = classDefinition.Metadata; - let generatedParameters: GeneratedParameter[] = createInfoArgs.parameters; + const generatedParameters: GeneratedParameter[] = createInfoArgs.parameters; if (props.fromInstance !== undefined) { if (createInfoArgs.namespace.startsWith('@babylonjs/')) { @@ -389,12 +390,12 @@ const ReactBabylonJSHostConfig: HostConfig< } } else { // console.log("generated params:", generatedParameters) - let args = generatedParameters.map(generatedParameter => { + const args = generatedParameters.map(generatedParameter => { if (Array.isArray(generatedParameter.type)) { // TODO: if all props are missing, warn if main prop (ie: options) is required. - let newParameter = {} as any; + const newParameter = {} as Record; generatedParameter.type.forEach(subParameter => { - let subPropValue = getConstructorValue(subParameter.type as string, props[subParameter.name]); + const subPropValue = getConstructorValue(subParameter.type as string, props[subParameter.name]); if (subPropValue === undefined && subParameter.optional === false && generatedParameter.optional === false) { console.warn("Missing a required secondary property:", subParameter.name); } else { @@ -486,7 +487,7 @@ const ReactBabylonJSHostConfig: HostConfig< lifecycleListener = new CUSTOM_HOSTS.FallbackLifecycleListener(scene!, props); } - let createdReference = createCreatedInstance(underlyingClassName, babylonObject, fiberObject, metadata, customProps, lifecycleListener); + const createdReference = createCreatedInstance(underlyingClassName, babylonObject, fiberObject, metadata, customProps, lifecycleListener); if (lifecycleListener.onCreated) { lifecycleListener.onCreated(createdReference, scene!); @@ -529,11 +530,11 @@ const ReactBabylonJSHostConfig: HostConfig< return false; }, - hideInstance(instance: HostCreatedInstance): void { }, + hideInstance(instance: HostCreatedInstance): void { /* empty */ }, - unhideInstance(instance: HostCreatedInstance, props: Props): void { }, + unhideInstance(instance: HostCreatedInstance, props: Props): void { /* empty */ }, - createTextInstance(text: string): any { }, + createTextInstance(text: string): any { /* empty */ }, scheduleDeferredCallback(callback: (deadline: RequestIdleCallbackDeadline) => void, opts?: RequestIdleCallbackOptions | undefined): any { return window.requestIdleCallback(callback, opts) // ReactDOMHostConfig has: unstable_scheduleCallback as scheduleDeferredCallback diff --git a/src/UpdateInstance.ts b/src/UpdateInstance.ts index 7ece4c01..986d547c 100644 --- a/src/UpdateInstance.ts +++ b/src/UpdateInstance.ts @@ -5,7 +5,7 @@ import { Nullable } from '@babylonjs/core/types.js'; import { Quaternion, Vector3 } from '@babylonjs/core/Maths/math.vector.js'; export const applyUpdateToInstance = (createdInstance: CreatedInstance, update: PropertyUpdate): void => { - let target = update.target !== undefined ? createdInstance.hostInstance[update.target] : createdInstance.hostInstance; + const target = update.target !== undefined ? createdInstance.hostInstance[update.target] : createdInstance.hostInstance; switch (update.changeType) { case PropChangeType.Primitive: @@ -99,11 +99,11 @@ export const applyInitialPropsToCreatedInstance = (createdInstance: CreatedInsta return; } - let initPayload: PropertyUpdate[] = [] + const initPayload: PropertyUpdate[] = [] createdInstance.propsHandlers.getPropsHandlers().forEach((propHandler: PropsHandler) => { // NOTE: this can actually be WRONG, because here we want to compare the props with the object. // This is only needed right after object instantiation. - let handlerUpdates: PropertyUpdate[] | null = propHandler.getPropertyUpdates( + const handlerUpdates: PropertyUpdate[] | null = propHandler.getPropertyUpdates( {}, // Here we will reapply things like 'name', so we could get default props from 'babylonObject'. props ); @@ -138,9 +138,9 @@ export const applyInitialPropsToInstance = (hostInstance: any, props: any): void * @param props props to apply */ export const applyPropsToRef = (createdInstance: CreatedInstance, props: Record): void => { - let initPayload: PropertyUpdate[] = [] + const initPayload: PropertyUpdate[] = [] createdInstance.propsHandlers?.getPropsHandlers().forEach((propHandler: PropsHandler) => { - let handlerUpdates: PropertyUpdate[] | null = propHandler.getPropertyUpdates( + const handlerUpdates: PropertyUpdate[] | null = propHandler.getPropertyUpdates( {}, // We will reapply any props passed in (will not "clear" props, if we pass in an undefined prop) props ); diff --git a/src/customHosts/AbstractMeshLifecycleListener.ts b/src/customHosts/AbstractMeshLifecycleListener.ts index 3dc3093d..5e567c98 100644 --- a/src/customHosts/AbstractMeshLifecycleListener.ts +++ b/src/customHosts/AbstractMeshLifecycleListener.ts @@ -15,7 +15,7 @@ export default class AbstractMeshLifecycleListener extends BaseLifecycleListener return; } - let mesh: AbstractMesh = instance.hostInstance; + const mesh: AbstractMesh = instance.hostInstance; let tmp: CreatedInstance | null = instance.parent; while (tmp !== null) { diff --git a/src/customHosts/AdvancedDynamicTextureLifecycleListener.ts b/src/customHosts/AdvancedDynamicTextureLifecycleListener.ts index 5e9068c9..d49c8f80 100644 --- a/src/customHosts/AdvancedDynamicTextureLifecycleListener.ts +++ b/src/customHosts/AdvancedDynamicTextureLifecycleListener.ts @@ -18,7 +18,7 @@ export default class AdvancedDynamicTextureLifecycleListener extends BaseLifecyc if ((instance.customProps as ADTCustomProps).createForParentMesh) { // console.log('for parent mesh', instance.parent ? instance.parent.babylonJsObject : 'error: no parent object') - let mesh: Mesh = instance.parent!.hostInstance; // should crawl parent hierarchy for a mesh + const mesh: Mesh = instance.parent!.hostInstance; // should crawl parent hierarchy for a mesh // console.error('we will be attaching the mesh:', mesh.name, mesh); const material = new StandardMaterial('AdvancedDynamicTextureMaterial', mesh.getScene()); @@ -43,7 +43,7 @@ export default class AdvancedDynamicTextureLifecycleListener extends BaseLifecyc // set to true unless explicitly not wanted. // connects the texture to a hosting mesh to enable interactions - let supportPointerMove = (this.props as any).supportPointerMove !== false ? true : false; + const supportPointerMove = (this.props as any).supportPointerMove !== false ? true : false; instance.hostInstance!.attachToMesh(mesh, supportPointerMove); } @@ -60,7 +60,7 @@ export default class AdvancedDynamicTextureLifecycleListener extends BaseLifecyc }) if ((instance.customProps as VirtualKeyboardCustomProps).connectControlNames !== undefined && Array.isArray((instance.customProps as VirtualKeyboardCustomProps).connectControlNames)) { - let controlNames: string[] = (instance.customProps as VirtualKeyboardCustomProps).connectControlNames!; + const controlNames: string[] = (instance.customProps as VirtualKeyboardCustomProps).connectControlNames!; let root = instance; while (root.parent !== null) { root = root.parent; diff --git a/src/customHosts/BaseLifecycleListener.ts b/src/customHosts/BaseLifecycleListener.ts index bd913ee2..afc854ac 100644 --- a/src/customHosts/BaseLifecycleListener.ts +++ b/src/customHosts/BaseLifecycleListener.ts @@ -7,7 +7,7 @@ import { applyInitialPropsToCreatedInstance } from '../UpdateInstance'; export default abstract class BaseLifecycleListener implements LifecycleListener { - constructor(protected scene: Scene, protected props: U) {/* empty */} + constructor(protected scene: Scene, protected props: U) {/* empty */ } onParented(parent: CreatedInstance, child: CreatedInstance): void { if (child.customProps.assignFrom !== undefined) { @@ -28,13 +28,13 @@ export default abstract class BaseLifecycleListener implements LifecycleLi console.warn('cannot assign deferred props. they are lost.'); } child.deferredCreationProps = undefined; - } + } } } - onChildAdded(child: CreatedInstance, parent: CreatedInstance): void { /* empty */}; + onChildAdded(child: CreatedInstance, parent: CreatedInstance): void { /* empty */ } - onMount(instance: CreatedInstance): void { /* empty */}; + onMount(instance: CreatedInstance): void { /* empty */ } - onUnmount(): void {/* empty */}; + onUnmount(): void {/* empty */ } } \ No newline at end of file diff --git a/src/customHosts/BaseShadowGeneratorLifecycleListener.ts b/src/customHosts/BaseShadowGeneratorLifecycleListener.ts index c553b13f..42276666 100644 --- a/src/customHosts/BaseShadowGeneratorLifecycleListener.ts +++ b/src/customHosts/BaseShadowGeneratorLifecycleListener.ts @@ -58,7 +58,7 @@ export default abstract class BaseShadowGeneratorLifecycleListener { @@ -82,7 +82,7 @@ export default abstract class BaseShadowGeneratorLifecycleListener { diff --git a/src/customHosts/BehaviorsLifecycleListener.ts b/src/customHosts/BehaviorsLifecycleListener.ts index 6ff3405a..af702f2a 100644 --- a/src/customHosts/BehaviorsLifecycleListener.ts +++ b/src/customHosts/BehaviorsLifecycleListener.ts @@ -1,7 +1,6 @@ -import { IBehaviorAware } from '@babylonjs/core/Behaviors/behavior.js'; -import { Behavior } from '@babylonjs/core/Behaviors/behavior.js'; +import { IBehaviorAware, Behavior } from '@babylonjs/core/Behaviors/behavior.js'; import { Nullable } from '@babylonjs/core/types.js'; import { CreatedInstance } from '../CreatedInstance'; diff --git a/src/customHosts/MaterialsLifecycleListener.ts b/src/customHosts/MaterialsLifecycleListener.ts index 9f7b7d74..69ed88f2 100644 --- a/src/customHosts/MaterialsLifecycleListener.ts +++ b/src/customHosts/MaterialsLifecycleListener.ts @@ -21,7 +21,7 @@ export default class MaterialsLifecycleListener extends BaseLifecycleListener { @@ -47,7 +47,7 @@ export default class MaterialsLifecycleListener extends BaseLifecycleListener | null = instance.parent; while (tmp !== null) { diff --git a/src/customHosts/ViewportLifecycleListener.ts b/src/customHosts/ViewportLifecycleListener.ts index 93db1e05..ddece62c 100644 --- a/src/customHosts/ViewportLifecycleListener.ts +++ b/src/customHosts/ViewportLifecycleListener.ts @@ -13,7 +13,7 @@ export default class ViewportLifecycleListener extends BaseLifecycleListener | null = instance.parent; while (tmp !== null) { diff --git a/src/hooks/camera.ts b/src/hooks/camera.ts index c22ac535..f755231c 100644 --- a/src/hooks/camera.ts +++ b/src/hooks/camera.ts @@ -14,7 +14,7 @@ import { SceneContext } from './scene'; * @param useCtrlForPanning (ArcRotateCamera only) * @param panningMoustButton (ArcRotateCamera only) */ -export const useCamera = (createCameraFn: (scene: Scene) => T, autoAttach: boolean = true, noPreventDefault: boolean = true/*, useCtrlForPanning: boolean = false, panningMouseButton: number*/): Nullable => { +export const useCamera = (createCameraFn: (scene: Scene) => T, autoAttach = true, noPreventDefault = true/*, useCtrlForPanning: boolean = false, panningMouseButton: number*/): Nullable => { const { scene } = useContext(SceneContext); const cameraRef = useRef>(null); diff --git a/src/render.ts b/src/render.ts index 708d9cdb..2262e17c 100644 --- a/src/render.ts +++ b/src/render.ts @@ -54,7 +54,7 @@ export function createReconciler(rendererOptions: RendererOptions): ReconcilerIn reconciler.updateContainer(element, root, parentComponent, callback); return reconciler.getPublicRootInstance(root); - }; + } function unmount(container: Container): void { const root = roots.get(container)!; diff --git a/storybook/.gitignore b/storybook/.gitignore new file mode 100644 index 00000000..82d94d38 --- /dev/null +++ b/storybook/.gitignore @@ -0,0 +1,3 @@ +node_modules +storybook-static +yarn.lock \ No newline at end of file diff --git a/.storybook/main.cjs b/storybook/.storybook/main.cjs similarity index 74% rename from .storybook/main.cjs rename to storybook/.storybook/main.cjs index daf3f5e6..fa341283 100644 --- a/.storybook/main.cjs +++ b/storybook/.storybook/main.cjs @@ -13,8 +13,9 @@ module.exports = { // '@storybook/addon-notes/register', ], webpackFinal: async (config, { configType }) => { - config.resolve.alias['react-babylonjs'] = path.resolve(__dirname, '../dist/react-babylonjs') - + config.resolve.alias['react-babylonjs'] = path.resolve(__dirname, '../../dist/react-babylonjs'); + config.resolve.alias['@babylonjs/core'] = path.resolve(__dirname, '../../node_modules/@babylonjs/core'); + config.resolve.alias['@babylonjs/gui'] = path.resolve(__dirname, '../../node_modules/@babylonjs/gui'); config.module.rules.push({ test: /\.stories\.jsx?$/, loaders: [require.resolve('@storybook/source-loader')], diff --git a/.storybook/manager-head.html b/storybook/.storybook/manager-head.html similarity index 100% rename from .storybook/manager-head.html rename to storybook/.storybook/manager-head.html diff --git a/.storybook/manager.js b/storybook/.storybook/manager.js similarity index 100% rename from .storybook/manager.js rename to storybook/.storybook/manager.js diff --git a/.storybook/preview-head.html b/storybook/.storybook/preview-head.html similarity index 100% rename from .storybook/preview-head.html rename to storybook/.storybook/preview-head.html diff --git a/.storybook/preview.js b/storybook/.storybook/preview.js similarity index 100% rename from .storybook/preview.js rename to storybook/.storybook/preview.js diff --git a/storybook/package.json b/storybook/package.json new file mode 100644 index 00000000..93941300 --- /dev/null +++ b/storybook/package.json @@ -0,0 +1,39 @@ +{ + "name": "react-babylonjs-storybook", + "private": "true", + "version": "0.0.1", + "description": "stories for react-babylonjs", + "main": "index.js", + "scripts": { + "start": "start-storybook -p 6006 -s ./storyboard-site", + "build-storybook": "build-storybook -o storybook-static -s ./storyboard-site" + }, + "devDependencies": { + "@babylonjs/inspector": "^4.2.0", + "@babylonjs/loaders": "^4.2.0", + "@babylonjs/materials": "^4.2.0", + "@babylonjs/procedural-textures": "^4.2.0", + "cannon": "^0.6.2", + "chroma-js": "^2.1.0", + "earcut": "^2.2.2", + "gsap": "^3.6.1", + "honeycomb-grid": "^3.1.7", + "lerp": "^1.0.3", + "react-babylon-spring": "^1.0.2" + }, + "dependencies": { + "@inlet/react-pixi": "^6.6.5", + "@storybook/addon-actions": "^6.3.7", + "@storybook/addon-links": "^6.3.7", + "@storybook/addon-storysource": "^6.3.7", + "@storybook/addons": "^6.3.7", + "@storybook/react": "^6.3.7", + "@storybook/source-loader": "^6.3.7", + "@storybook/theming": "^6.3.7", + "pixi-projection": "^0.4.2", + "pixi.js": "^6.1.2", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "storybook": "^6.3.7" + } +} diff --git a/stories/babylonjs/Basic/animation.stories.js b/storybook/stories/babylonjs/Basic/animation.stories.js similarity index 96% rename from stories/babylonjs/Basic/animation.stories.js rename to storybook/stories/babylonjs/Basic/animation.stories.js index 32d4626a..c56251e3 100644 --- a/stories/babylonjs/Basic/animation.stories.js +++ b/storybook/stories/babylonjs/Basic/animation.stories.js @@ -1,6 +1,6 @@ import React, { useEffect, useRef } from 'react' import { Vector3, Animation } from '@babylonjs/core'; -import { Engine, Scene, useScene } from '../../../dist/react-babylonjs' +import { Engine, Scene, useScene } from 'react-babylonjs' import '../../style.css'; export default { title: 'Babylon Basic' }; diff --git a/stories/babylonjs/Basic/babylonBasic.stories.js b/storybook/stories/babylonjs/Basic/babylonBasic.stories.js similarity index 95% rename from stories/babylonjs/Basic/babylonBasic.stories.js rename to storybook/stories/babylonjs/Basic/babylonBasic.stories.js index 8cb0849c..a569cf95 100644 --- a/stories/babylonjs/Basic/babylonBasic.stories.js +++ b/storybook/stories/babylonjs/Basic/babylonBasic.stories.js @@ -1,5 +1,5 @@ import React, { useEffect, useRef } from 'react'; -import { Engine, Scene, useScene } from '../../../dist/react-babylonjs'; +import { Engine, Scene, useScene } from 'react-babylonjs'; import { Color3 } from '@babylonjs/core/Maths/math.color'; import { Vector3 } from '@babylonjs/core/Maths/math.vector'; import '../../style.css' diff --git a/stories/babylonjs/Basic/contextBridge.stories.js b/storybook/stories/babylonjs/Basic/contextBridge.stories.js similarity index 96% rename from stories/babylonjs/Basic/contextBridge.stories.js rename to storybook/stories/babylonjs/Basic/contextBridge.stories.js index a3f7fafd..4eec3d87 100644 --- a/stories/babylonjs/Basic/contextBridge.stories.js +++ b/storybook/stories/babylonjs/Basic/contextBridge.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import { Vector3, Color3 } from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/Basic/customMeshes.stories.js b/storybook/stories/babylonjs/Basic/customMeshes.stories.js similarity index 97% rename from stories/babylonjs/Basic/customMeshes.stories.js rename to storybook/stories/babylonjs/Basic/customMeshes.stories.js index c18987c7..e7b81fb1 100644 --- a/stories/babylonjs/Basic/customMeshes.stories.js +++ b/storybook/stories/babylonjs/Basic/customMeshes.stories.js @@ -1,5 +1,5 @@ import React, { useState } from 'react' -import { Engine, Scene, useScene } from '../../../dist/react-babylonjs' +import { Engine, Scene, useScene } from 'react-babylonjs' import { Mesh, VertexData, Vector3 } from '@babylonjs/core'; import '../../style.css' diff --git a/stories/babylonjs/Basic/dynamicTerrain.stories.js b/storybook/stories/babylonjs/Basic/dynamicTerrain.stories.js similarity index 96% rename from stories/babylonjs/Basic/dynamicTerrain.stories.js rename to storybook/stories/babylonjs/Basic/dynamicTerrain.stories.js index 97203cc8..916415da 100644 --- a/stories/babylonjs/Basic/dynamicTerrain.stories.js +++ b/storybook/stories/babylonjs/Basic/dynamicTerrain.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import { Vector3, Color3, Color4 } from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/Basic/edgesRendering.stories.js b/storybook/stories/babylonjs/Basic/edgesRendering.stories.js similarity index 94% rename from stories/babylonjs/Basic/edgesRendering.stories.js rename to storybook/stories/babylonjs/Basic/edgesRendering.stories.js index f766f537..a6b07372 100644 --- a/stories/babylonjs/Basic/edgesRendering.stories.js +++ b/storybook/stories/babylonjs/Basic/edgesRendering.stories.js @@ -1,7 +1,7 @@ import React from 'react' import { Vector3, Color4 } from '@babylonjs/core'; import '@babylonjs/core/Rendering/edgesRenderer' // You this need for side-effects -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import '../../style.css'; export default { title: 'Babylon Basic' }; diff --git a/stories/babylonjs/Basic/engineView.stories.js b/storybook/stories/babylonjs/Basic/engineView.stories.js similarity index 97% rename from stories/babylonjs/Basic/engineView.stories.js rename to storybook/stories/babylonjs/Basic/engineView.stories.js index 402ad6b3..ed26f597 100644 --- a/stories/babylonjs/Basic/engineView.stories.js +++ b/storybook/stories/babylonjs/Basic/engineView.stories.js @@ -1,6 +1,6 @@ import React, { useRef } from 'react' import '@babylonjs/inspector' -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import { Vector3, Color3 } from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/Basic/fromInstance.stories.js b/storybook/stories/babylonjs/Basic/fromInstance.stories.js similarity index 95% rename from stories/babylonjs/Basic/fromInstance.stories.js rename to storybook/stories/babylonjs/Basic/fromInstance.stories.js index 6c0dfbae..2cf6c24a 100644 --- a/stories/babylonjs/Basic/fromInstance.stories.js +++ b/storybook/stories/babylonjs/Basic/fromInstance.stories.js @@ -1,5 +1,5 @@ import React, { useState, useMemo } from 'react' -import { Engine, Scene, useScene } from '../../../dist/react-babylonjs' +import { Engine, Scene, useScene } from 'react-babylonjs' import { Vector3, Color3, MeshBuilder } from '@babylonjs/core' import '../../style.css' diff --git a/stories/babylonjs/Basic/gizmo.stories.js b/storybook/stories/babylonjs/Basic/gizmo.stories.js similarity index 63% rename from stories/babylonjs/Basic/gizmo.stories.js rename to storybook/stories/babylonjs/Basic/gizmo.stories.js index f2d69b41..5953bd3b 100644 --- a/stories/babylonjs/Basic/gizmo.stories.js +++ b/storybook/stories/babylonjs/Basic/gizmo.stories.js @@ -1,18 +1,17 @@ -import React, { useEffect, useRef } from 'react'; -import { Engine, Scene, useScene } from '../../../dist/react-babylonjs'; +import React from 'react'; +import { Engine, Scene } from 'react-babylonjs'; import { Color3 } from '@babylonjs/core/Maths/math.color'; import { Vector3 } from '@babylonjs/core/Maths/math.vector'; import '../../style.css' export default { title: 'Babylon Basic' }; -const GizmoBox = (props) => { - // there is also a built-in hook called useBeforeRender that does will do this: - return ( - +const GizmoBox = ({position, color} = props) => ( + + - ); -} + +) export const Gizmo = () => (
@@ -21,8 +20,8 @@ export const Gizmo = () => ( - - + + diff --git a/stories/babylonjs/Basic/instances.stories.js b/storybook/stories/babylonjs/Basic/instances.stories.js similarity index 97% rename from stories/babylonjs/Basic/instances.stories.js rename to storybook/stories/babylonjs/Basic/instances.stories.js index aa60ec16..35b1687b 100644 --- a/stories/babylonjs/Basic/instances.stories.js +++ b/storybook/stories/babylonjs/Basic/instances.stories.js @@ -1,5 +1,5 @@ import React, { useState, useCallback } from 'react' -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import { Vector3, Color3, Color4 } from '@babylonjs/core' import { defineGrid, extendHex } from 'honeycomb-grid' import '../../style.css' diff --git a/stories/babylonjs/Basic/shapes.stories.js b/storybook/stories/babylonjs/Basic/shapes.stories.js similarity index 97% rename from stories/babylonjs/Basic/shapes.stories.js rename to storybook/stories/babylonjs/Basic/shapes.stories.js index bffc002d..9a45b8d9 100644 --- a/stories/babylonjs/Basic/shapes.stories.js +++ b/storybook/stories/babylonjs/Basic/shapes.stories.js @@ -1,6 +1,6 @@ import React, { useCallback } from 'react' import '@babylonjs/inspector' -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import { Vector3, Color3, CSG, Mesh, MeshBuilder, StandardMaterial } from '@babylonjs/core' import * as Earcut from 'earcut'; import "@babylonjs/core/Meshes/meshBuilder"; diff --git a/stories/babylonjs/Basic/skybox.stories.js b/storybook/stories/babylonjs/Basic/skybox.stories.js similarity index 96% rename from stories/babylonjs/Basic/skybox.stories.js rename to storybook/stories/babylonjs/Basic/skybox.stories.js index eafd5f89..f6d6af17 100644 --- a/stories/babylonjs/Basic/skybox.stories.js +++ b/storybook/stories/babylonjs/Basic/skybox.stories.js @@ -1,6 +1,6 @@ import React, { useState } from 'react' import '@babylonjs/inspector' -import { Engine, Scene, Skybox } from '../../../dist/react-babylonjs' +import { Engine, Scene, Skybox } from 'react-babylonjs' import { Vector3 } from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/Basic/snippetMaterial.stories.js b/storybook/stories/babylonjs/Basic/snippetMaterial.stories.js similarity index 97% rename from stories/babylonjs/Basic/snippetMaterial.stories.js rename to storybook/stories/babylonjs/Basic/snippetMaterial.stories.js index 1be187b8..4776171f 100644 --- a/stories/babylonjs/Basic/snippetMaterial.stories.js +++ b/storybook/stories/babylonjs/Basic/snippetMaterial.stories.js @@ -2,7 +2,7 @@ import React, { useState, useCallback, useEffect } from 'react' import { Vector3, NodeMaterial, Color3 } from '@babylonjs/core'; import { Texture } from "@babylonjs/core/Materials/Textures/texture"; import '@babylonjs/core/Rendering/edgesRenderer' // You this need for side-effects -import { Engine, Scene, useScene } from '../../../dist/react-babylonjs' +import { Engine, Scene, useScene } from 'react-babylonjs' import '../../style.css'; diff --git a/stories/babylonjs/Basic/toggleMesh.stories.js b/storybook/stories/babylonjs/Basic/toggleMesh.stories.js similarity index 97% rename from stories/babylonjs/Basic/toggleMesh.stories.js rename to storybook/stories/babylonjs/Basic/toggleMesh.stories.js index 993d649c..c6f20fae 100644 --- a/stories/babylonjs/Basic/toggleMesh.stories.js +++ b/storybook/stories/babylonjs/Basic/toggleMesh.stories.js @@ -1,5 +1,5 @@ import React, { useState } from 'react' -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import { Vector3 } from '@babylonjs/core/Maths/math' import '../../style.css' import { Color3 } from "@babylonjs/core"; diff --git a/stories/babylonjs/Basic/toggleScene.stories.js b/storybook/stories/babylonjs/Basic/toggleScene.stories.js similarity index 97% rename from stories/babylonjs/Basic/toggleScene.stories.js rename to storybook/stories/babylonjs/Basic/toggleScene.stories.js index 6b98ea50..991d399e 100644 --- a/stories/babylonjs/Basic/toggleScene.stories.js +++ b/storybook/stories/babylonjs/Basic/toggleScene.stories.js @@ -1,5 +1,5 @@ import React, {useState} from 'react' -import {Engine, Scene, useScene} from '../../../dist/react-babylonjs' +import {Engine, Scene, useScene} from 'react-babylonjs' import {Vector3} from '@babylonjs/core/Maths/math' import '../../style.css' import {Color3} from "@babylonjs/core"; diff --git a/stories/babylonjs/Basic/transformNode.stories.js b/storybook/stories/babylonjs/Basic/transformNode.stories.js similarity index 96% rename from stories/babylonjs/Basic/transformNode.stories.js rename to storybook/stories/babylonjs/Basic/transformNode.stories.js index 5ee9ba53..7f3eabfc 100644 --- a/stories/babylonjs/Basic/transformNode.stories.js +++ b/storybook/stories/babylonjs/Basic/transformNode.stories.js @@ -1,6 +1,6 @@ import React, {useEffect, useState} from 'react' import '@babylonjs/inspector' -import {Engine, Scene} from '../../../dist/react-babylonjs' +import {Engine, Scene} from 'react-babylonjs' import {Vector3} from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/Basic/viewport.stories.js b/storybook/stories/babylonjs/Basic/viewport.stories.js similarity index 97% rename from stories/babylonjs/Basic/viewport.stories.js rename to storybook/stories/babylonjs/Basic/viewport.stories.js index f72dba53..a3cf51b2 100644 --- a/stories/babylonjs/Basic/viewport.stories.js +++ b/storybook/stories/babylonjs/Basic/viewport.stories.js @@ -1,6 +1,6 @@ import React from 'react' import '@babylonjs/inspector' -import { Engine, Scene, useScene } from '../../../dist/react-babylonjs' +import { Engine, Scene, useScene } from 'react-babylonjs' import { Vector3, Color3 } from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/Behaviors/dragNdrop.stories.js b/storybook/stories/babylonjs/Behaviors/dragNdrop.stories.js similarity index 98% rename from stories/babylonjs/Behaviors/dragNdrop.stories.js rename to storybook/stories/babylonjs/Behaviors/dragNdrop.stories.js index cf748127..5b28aea2 100644 --- a/stories/babylonjs/Behaviors/dragNdrop.stories.js +++ b/storybook/stories/babylonjs/Behaviors/dragNdrop.stories.js @@ -1,5 +1,5 @@ import React, { useEffect, useState, useRef } from 'react' -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import { Vector3, Color3 } from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/Behaviors/pointerDragBehavior.stories.js b/storybook/stories/babylonjs/Behaviors/pointerDragBehavior.stories.js similarity index 92% rename from stories/babylonjs/Behaviors/pointerDragBehavior.stories.js rename to storybook/stories/babylonjs/Behaviors/pointerDragBehavior.stories.js index e4a9d5c4..74804369 100644 --- a/stories/babylonjs/Behaviors/pointerDragBehavior.stories.js +++ b/storybook/stories/babylonjs/Behaviors/pointerDragBehavior.stories.js @@ -1,6 +1,5 @@ import React from 'react' -import {storiesOf} from '@storybook/react' -import {Engine, Scene} from '../../../dist/react-babylonjs' +import {Engine, Scene} from 'react-babylonjs' import {Vector3} from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/GUI/gui.stories.js b/storybook/stories/babylonjs/GUI/gui.stories.js similarity index 98% rename from stories/babylonjs/GUI/gui.stories.js rename to storybook/stories/babylonjs/GUI/gui.stories.js index e44546ca..f4e932b7 100644 --- a/stories/babylonjs/GUI/gui.stories.js +++ b/storybook/stories/babylonjs/GUI/gui.stories.js @@ -1,6 +1,6 @@ import React, { useRef, useCallback } from 'react' import '@babylonjs/inspector' -import {Engine, Scene} from '../../../dist/react-babylonjs' +import {Engine, Scene} from 'react-babylonjs' import {Vector3} from '@babylonjs/core/Maths/math' import '../../style.css' import {Control} from '@babylonjs/gui'; diff --git a/stories/babylonjs/GUI/with2DGUI.stories.js b/storybook/stories/babylonjs/GUI/with2DGUI.stories.js similarity index 99% rename from stories/babylonjs/GUI/with2DGUI.stories.js rename to storybook/stories/babylonjs/GUI/with2DGUI.stories.js index 635ac1d8..cc9ea5b7 100644 --- a/stories/babylonjs/GUI/with2DGUI.stories.js +++ b/storybook/stories/babylonjs/GUI/with2DGUI.stories.js @@ -1,7 +1,7 @@ import React, { Component } from 'react' import { Vector3, Color3, Color4, Animation, ExponentialEase, EasingFunction, Texture } from '@babylonjs/core' import { Control } from '@babylonjs/gui' -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import '../../style.css' diff --git a/stories/babylonjs/Hooks/hooks.stories.js b/storybook/stories/babylonjs/Hooks/hooks.stories.js similarity index 98% rename from stories/babylonjs/Hooks/hooks.stories.js rename to storybook/stories/babylonjs/Hooks/hooks.stories.js index c26813e7..a95297aa 100644 --- a/stories/babylonjs/Hooks/hooks.stories.js +++ b/storybook/stories/babylonjs/Hooks/hooks.stories.js @@ -1,5 +1,5 @@ import React, { useContext, useRef } from 'react' -import { Engine, Scene, EngineCanvasContext , SceneContext, useBeforeRender } from '../../../dist/react-babylonjs' +import { Engine, Scene, EngineCanvasContext , SceneContext, useBeforeRender } from 'react-babylonjs' import { Vector3, Color3 } from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/Hooks/more-hooks.stories.js b/storybook/stories/babylonjs/Hooks/more-hooks.stories.js similarity index 93% rename from stories/babylonjs/Hooks/more-hooks.stories.js rename to storybook/stories/babylonjs/Hooks/more-hooks.stories.js index 65d6a430..1c44c44c 100644 --- a/stories/babylonjs/Hooks/more-hooks.stories.js +++ b/storybook/stories/babylonjs/Hooks/more-hooks.stories.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Engine, Scene, useEngine, useCanvas, useScene } from '../../../dist/react-babylonjs' +import { Engine, Scene, useEngine, useCanvas, useScene } from 'react-babylonjs' import { Vector3 } from '@babylonjs/core' export default { title: 'Hooks' }; diff --git a/stories/babylonjs/Hooks/useAssetManager.stories.js b/storybook/stories/babylonjs/Hooks/useAssetManager.stories.js similarity index 97% rename from stories/babylonjs/Hooks/useAssetManager.stories.js rename to storybook/stories/babylonjs/Hooks/useAssetManager.stories.js index e9190c0b..43bccf05 100644 --- a/stories/babylonjs/Hooks/useAssetManager.stories.js +++ b/storybook/stories/babylonjs/Hooks/useAssetManager.stories.js @@ -1,6 +1,6 @@ import React, { Suspense, useState, useMemo, useRef, useLayoutEffect } from 'react'; -import { Engine, Scene, useAssetManager, TaskType, useBeforeRender } from '../../../dist/react-babylonjs'; -import { Vector3, Color4, Color3, Axis } from '@babylonjs/core'; +import { Engine, Scene, useAssetManager, TaskType, useBeforeRender } from 'react-babylonjs'; +import { Vector3, Color4, Color3 } from '@babylonjs/core'; import '../../style.css'; export default { title: 'Hooks' }; diff --git a/stories/babylonjs/Hooks/useClick.stories.js b/storybook/stories/babylonjs/Hooks/useClick.stories.js similarity index 95% rename from stories/babylonjs/Hooks/useClick.stories.js rename to storybook/stories/babylonjs/Hooks/useClick.stories.js index c56e594d..f0f2cdf9 100644 --- a/stories/babylonjs/Hooks/useClick.stories.js +++ b/storybook/stories/babylonjs/Hooks/useClick.stories.js @@ -1,5 +1,5 @@ import React, {useState} from 'react' -import {Engine, Scene, useClick} from '../../../dist/react-babylonjs' +import {Engine, Scene, useClick} from 'react-babylonjs' import {Vector3} from '@babylonjs/core/Maths/math' import '../../style.css' import {Color3} from "@babylonjs/core/Maths/math.color"; diff --git a/stories/babylonjs/Hooks/useHover.stories.js b/storybook/stories/babylonjs/Hooks/useHover.stories.js similarity index 96% rename from stories/babylonjs/Hooks/useHover.stories.js rename to storybook/stories/babylonjs/Hooks/useHover.stories.js index c76fc679..c27ded80 100644 --- a/stories/babylonjs/Hooks/useHover.stories.js +++ b/storybook/stories/babylonjs/Hooks/useHover.stories.js @@ -1,5 +1,5 @@ import React, {useState} from 'react' -import {Engine, Scene, useHover} from '../../../dist/react-babylonjs' +import {Engine, Scene, useHover} from 'react-babylonjs' import {Vector3} from '@babylonjs/core/Maths/math' import {Control} from '@babylonjs/gui/2D/controls/control'; import { TextWrapping} from '@babylonjs/gui/2D/controls' diff --git a/stories/babylonjs/Integrations/chromaJS.stories.js b/storybook/stories/babylonjs/Integrations/chromaJS.stories.js similarity index 99% rename from stories/babylonjs/Integrations/chromaJS.stories.js rename to storybook/stories/babylonjs/Integrations/chromaJS.stories.js index cb2976ba..8b55b206 100644 --- a/stories/babylonjs/Integrations/chromaJS.stories.js +++ b/storybook/stories/babylonjs/Integrations/chromaJS.stories.js @@ -1,7 +1,7 @@ import React from 'react' import { Vector3, Color3 } from '@babylonjs/core'; import { Control } from '@babylonjs/gui'; -import { Engine, Scene, PropChangeType, useCustomPropsHandler } from '../../../dist/react-babylonjs' +import { Engine, Scene, PropChangeType, useCustomPropsHandler } from 'react-babylonjs' import '../../style.css'; import chroma, { Color } from 'chroma-js' diff --git a/stories/babylonjs/Integrations/gsap.stories.js b/storybook/stories/babylonjs/Integrations/gsap.stories.js similarity index 97% rename from stories/babylonjs/Integrations/gsap.stories.js rename to storybook/stories/babylonjs/Integrations/gsap.stories.js index 98f94472..8f94204a 100644 --- a/stories/babylonjs/Integrations/gsap.stories.js +++ b/storybook/stories/babylonjs/Integrations/gsap.stories.js @@ -1,7 +1,7 @@ import '@babylonjs/inspector'; import React, { Component } from 'react'; import { TimelineLite } from 'gsap/all'; -import { Engine, Scene, Skybox } from '../../../dist/react-babylonjs'; +import { Engine, Scene, Skybox } from 'react-babylonjs'; import { Vector3, Color3, Color4 } from '@babylonjs/core'; import { StandardMaterial, FresnelParameters } from '@babylonjs/core/Materials'; import { CubeTexture } from '@babylonjs/core/Materials/Textures'; diff --git a/stories/babylonjs/Integrations/pixi-demo/VaporWave.js b/storybook/stories/babylonjs/Integrations/pixi-demo/VaporWave.js similarity index 95% rename from stories/babylonjs/Integrations/pixi-demo/VaporWave.js rename to storybook/stories/babylonjs/Integrations/pixi-demo/VaporWave.js index b1b731f5..4864766f 100644 --- a/stories/babylonjs/Integrations/pixi-demo/VaporWave.js +++ b/storybook/stories/babylonjs/Integrations/pixi-demo/VaporWave.js @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import { Vector2, Mesh } from '@babylonjs/core'; -import { useScene } from '../../../../dist/react-babylonjs'; +import { useScene } from 'react-babylonjs'; import './shaders'; let customProceduralTexture = null; let time = 0; diff --git a/stories/babylonjs/Integrations/pixi-demo/block.js b/storybook/stories/babylonjs/Integrations/pixi-demo/block.js similarity index 96% rename from stories/babylonjs/Integrations/pixi-demo/block.js rename to storybook/stories/babylonjs/Integrations/pixi-demo/block.js index ba5de36a..7a1547b3 100644 --- a/stories/babylonjs/Integrations/pixi-demo/block.js +++ b/storybook/stories/babylonjs/Integrations/pixi-demo/block.js @@ -1,5 +1,5 @@ import React, { createContext, useRef, useContext } from "react" -import { useBeforeRender } from '../../../../dist/react-babylonjs' +import { useBeforeRender } from 'react-babylonjs' import { Vector3, } from '@babylonjs/core'; import lerp from "lerp" import state from "./store" diff --git a/stories/babylonjs/Integrations/pixi-demo/pixi-styles.js b/storybook/stories/babylonjs/Integrations/pixi-demo/pixi-styles.js similarity index 100% rename from stories/babylonjs/Integrations/pixi-demo/pixi-styles.js rename to storybook/stories/babylonjs/Integrations/pixi-demo/pixi-styles.js diff --git a/stories/babylonjs/Integrations/pixi-demo/shaders/index.js b/storybook/stories/babylonjs/Integrations/pixi-demo/shaders/index.js similarity index 100% rename from stories/babylonjs/Integrations/pixi-demo/shaders/index.js rename to storybook/stories/babylonjs/Integrations/pixi-demo/shaders/index.js diff --git a/stories/babylonjs/Integrations/pixi-demo/slide.js b/storybook/stories/babylonjs/Integrations/pixi-demo/slide.js similarity index 98% rename from stories/babylonjs/Integrations/pixi-demo/slide.js rename to storybook/stories/babylonjs/Integrations/pixi-demo/slide.js index 3fd5bf8c..f3758bb8 100644 --- a/stories/babylonjs/Integrations/pixi-demo/slide.js +++ b/storybook/stories/babylonjs/Integrations/pixi-demo/slide.js @@ -1,7 +1,7 @@ import React, { useEffect, useRef } from "react" import { Effect, Vector3, Mesh, Texture, Color3, ShaderMaterial } from '@babylonjs/core'; import { Control } from '@babylonjs/gui' -import { useScene } from '../../../../dist/react-babylonjs' +import { useScene } from 'react-babylonjs' import './shaders'; import lerp from "lerp" import { Block, useBlock } from "./block" diff --git a/stories/babylonjs/Integrations/pixi-demo/store.js b/storybook/stories/babylonjs/Integrations/pixi-demo/store.js similarity index 100% rename from stories/babylonjs/Integrations/pixi-demo/store.js rename to storybook/stories/babylonjs/Integrations/pixi-demo/store.js diff --git a/stories/babylonjs/Integrations/pixi-demo/styles.css b/storybook/stories/babylonjs/Integrations/pixi-demo/styles.css similarity index 100% rename from stories/babylonjs/Integrations/pixi-demo/styles.css rename to storybook/stories/babylonjs/Integrations/pixi-demo/styles.css diff --git a/stories/babylonjs/Integrations/pixi-render.stories.js b/storybook/stories/babylonjs/Integrations/pixi-render.stories.js similarity index 96% rename from stories/babylonjs/Integrations/pixi-render.stories.js rename to storybook/stories/babylonjs/Integrations/pixi-render.stories.js index e44b112b..86479cf0 100644 --- a/stories/babylonjs/Integrations/pixi-render.stories.js +++ b/storybook/stories/babylonjs/Integrations/pixi-render.stories.js @@ -3,9 +3,9 @@ import React, { useRef, useCallback, useState, useEffect } from 'react'; import * as PIXI from 'pixi.js'; import { Vector3, Color3 } from '@babylonjs/core'; import { render as PixiRender, Text } from '@inlet/react-pixi' -import { Engine, Scene, useScene } from '../../../dist/react-babylonjs'; +import { Engine, Scene, useScene } from 'react-babylonjs'; import '@babylonjs/inspector' -import {postSpectacularGradient, retroGoldGradient} from './pixi-demo/pixi-styles'; +import {postSpectacularGradient} from './pixi-demo/pixi-styles'; import './pixi-demo/shaders'; // side-effect of registering a pixel shader import Slider from './pixi-demo/slide' import state from "./pixi-demo/store" diff --git a/stories/babylonjs/Integrations/reactSpring.stories.js b/storybook/stories/babylonjs/Integrations/reactSpring.stories.js similarity index 99% rename from stories/babylonjs/Integrations/reactSpring.stories.js rename to storybook/stories/babylonjs/Integrations/reactSpring.stories.js index bfc213f0..5ce328ed 100644 --- a/stories/babylonjs/Integrations/reactSpring.stories.js +++ b/storybook/stories/babylonjs/Integrations/reactSpring.stories.js @@ -5,8 +5,7 @@ import { useHover, CustomPropsHandler, PropChangeType, - useCustomPropsHandler, -} from '../../../dist/react-babylonjs' +} from 'react-babylonjs' import { Vector3, Color3 } from '@babylonjs/core/Maths/math'; import { useSprings, useSpring, animated } from 'react-babylon-spring'; import 'react-babylon-spring'; diff --git a/stories/babylonjs/Materials/grid-material.stories.js b/storybook/stories/babylonjs/Materials/grid-material.stories.js similarity index 100% rename from stories/babylonjs/Materials/grid-material.stories.js rename to storybook/stories/babylonjs/Materials/grid-material.stories.js diff --git a/stories/babylonjs/Models/model-loader.stories.js b/storybook/stories/babylonjs/Models/model-loader.stories.js similarity index 96% rename from stories/babylonjs/Models/model-loader.stories.js rename to storybook/stories/babylonjs/Models/model-loader.stories.js index 2082fe5e..07a2ba53 100644 --- a/stories/babylonjs/Models/model-loader.stories.js +++ b/storybook/stories/babylonjs/Models/model-loader.stories.js @@ -2,7 +2,7 @@ import React, { Suspense, useRef, useContext, useMemo } from 'react'; import '@babylonjs/inspector'; import { Vector3 } from '@babylonjs/core'; -import { Engine, Scene, useAssetManager, TaskType, useBeforeRender, AssetManagerContext, AssetManagerContextProvider } from '../../../dist/react-babylonjs'; +import { Engine, Scene, useAssetManager, TaskType, useBeforeRender, AssetManagerContext, AssetManagerContextProvider } from 'react-babylonjs'; import '../../style.css'; diff --git a/stories/babylonjs/Models/model.stories.js b/storybook/stories/babylonjs/Models/model.stories.js similarity index 97% rename from stories/babylonjs/Models/model.stories.js rename to storybook/stories/babylonjs/Models/model.stories.js index 8054969f..519cd203 100644 --- a/stories/babylonjs/Models/model.stories.js +++ b/storybook/stories/babylonjs/Models/model.stories.js @@ -1,6 +1,6 @@ import React, { Component, Suspense } from 'react'; import '@babylonjs/inspector'; -import { Engine, Scene, Model } from '../../../dist/react-babylonjs'; +import { Engine, Scene, Model } from 'react-babylonjs'; import { Vector3, Color3 } from '@babylonjs/core'; import { ActionManager, SetValueAction } from '@babylonjs/core/Actions'; import ScaledModelWithProgress from '../ScaledModelWithProgress'; diff --git a/stories/babylonjs/NonDeclarative/nonDeclarative.stories.js b/storybook/stories/babylonjs/NonDeclarative/nonDeclarative.stories.js similarity index 98% rename from stories/babylonjs/NonDeclarative/nonDeclarative.stories.js rename to storybook/stories/babylonjs/NonDeclarative/nonDeclarative.stories.js index c9a362ee..01d83f7e 100644 --- a/stories/babylonjs/NonDeclarative/nonDeclarative.stories.js +++ b/storybook/stories/babylonjs/NonDeclarative/nonDeclarative.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import { Color3, FreeCamera, Vector3, ArcRotateCamera, DefaultRenderingPipeline, HemisphericLight, DepthOfFieldEffectBlurLevel, PBRMetallicRoughnessMaterial, CubeTexture, Mesh } from '@babylonjs/core' import { Control, TextBlock, Slider, StackPanel, AdvancedDynamicTexture } from '@babylonjs/gui' import '../../style.css' diff --git a/stories/babylonjs/Physics/physics.stories.js b/storybook/stories/babylonjs/Physics/physics.stories.js similarity index 97% rename from stories/babylonjs/Physics/physics.stories.js rename to storybook/stories/babylonjs/Physics/physics.stories.js index 7c6d88b2..d649935a 100644 --- a/stories/babylonjs/Physics/physics.stories.js +++ b/storybook/stories/babylonjs/Physics/physics.stories.js @@ -1,9 +1,8 @@ import React, { useCallback } from 'react'; -import { storiesOf } from '@storybook/react' import "@babylonjs/core/Physics/physicsEngineComponent" // side-effect adds scene.enablePhysics function import { Vector3, Color4, PhysicsImpostor, Texture, Mesh } from '@babylonjs/core'; import { CannonJSPlugin } from '@babylonjs/core/Physics/Plugins' -import { Engine, Scene } from '../../../dist/react-babylonjs' +import { Engine, Scene } from 'react-babylonjs' import '../../style.css' import * as CANNON from 'cannon'; diff --git a/stories/babylonjs/PostProcess/imagePostProcess.stories.js b/storybook/stories/babylonjs/PostProcess/imagePostProcess.stories.js similarity index 100% rename from stories/babylonjs/PostProcess/imagePostProcess.stories.js rename to storybook/stories/babylonjs/PostProcess/imagePostProcess.stories.js diff --git a/stories/babylonjs/PostProcess/pipeline.stories.js b/storybook/stories/babylonjs/PostProcess/pipeline.stories.js similarity index 100% rename from stories/babylonjs/PostProcess/pipeline.stories.js rename to storybook/stories/babylonjs/PostProcess/pipeline.stories.js diff --git a/stories/babylonjs/ScaledModelWithProgress.js b/storybook/stories/babylonjs/ScaledModelWithProgress.js similarity index 98% rename from stories/babylonjs/ScaledModelWithProgress.js rename to storybook/stories/babylonjs/ScaledModelWithProgress.js index 36f1235b..e2310963 100644 --- a/stories/babylonjs/ScaledModelWithProgress.js +++ b/storybook/stories/babylonjs/ScaledModelWithProgress.js @@ -1,7 +1,7 @@ import React, { Suspense, useContext } from 'react' import { Vector3, Matrix, Color3 } from '@babylonjs/core/Maths/math' -import { Model, SceneLoaderContextProvider, SceneLoaderContext } from '../../dist/react-babylonjs'; +import { Model, SceneLoaderContextProvider, SceneLoaderContext } from 'react-babylonjs'; const ProgressFallback = (props) => { const sceneLoaderContext = useContext(SceneLoaderContext); diff --git a/stories/babylonjs/SpecialFX/glow-layer.stories.js b/storybook/stories/babylonjs/SpecialFX/glow-layer.stories.js similarity index 97% rename from stories/babylonjs/SpecialFX/glow-layer.stories.js rename to storybook/stories/babylonjs/SpecialFX/glow-layer.stories.js index acce2cc1..a36522f0 100644 --- a/stories/babylonjs/SpecialFX/glow-layer.stories.js +++ b/storybook/stories/babylonjs/SpecialFX/glow-layer.stories.js @@ -1,6 +1,6 @@ import React, { useRef } from 'react' import '@babylonjs/inspector' -import {Engine, Scene, Model} from '../../../dist/react-babylonjs' +import {Engine, Scene} from 'react-babylonjs' import {Color3, Color4, Vector3} from '@babylonjs/core/Maths/math' import '../../style.css' import ScaledModelWithProgress from '../ScaledModelWithProgress' diff --git a/stories/babylonjs/SpecialFX/highlight-layer.stories.js b/storybook/stories/babylonjs/SpecialFX/highlight-layer.stories.js similarity index 94% rename from stories/babylonjs/SpecialFX/highlight-layer.stories.js rename to storybook/stories/babylonjs/SpecialFX/highlight-layer.stories.js index 7bcc46c0..24435eda 100644 --- a/stories/babylonjs/SpecialFX/highlight-layer.stories.js +++ b/storybook/stories/babylonjs/SpecialFX/highlight-layer.stories.js @@ -1,7 +1,7 @@ import React, {useEffect, useRef} from 'react' import {Control} from '@babylonjs/gui/2D/controls/control' import '@babylonjs/inspector' -import {Engine, Scene} from '../../../dist/react-babylonjs' +import {Engine, Scene} from 'react-babylonjs' import {Color3, Vector3} from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/SpecialFX/multi-glow-layer.stories.js b/storybook/stories/babylonjs/SpecialFX/multi-glow-layer.stories.js similarity index 98% rename from stories/babylonjs/SpecialFX/multi-glow-layer.stories.js rename to storybook/stories/babylonjs/SpecialFX/multi-glow-layer.stories.js index d2301020..80327c54 100644 --- a/stories/babylonjs/SpecialFX/multi-glow-layer.stories.js +++ b/storybook/stories/babylonjs/SpecialFX/multi-glow-layer.stories.js @@ -1,6 +1,6 @@ import React, { useRef } from 'react' import '@babylonjs/inspector' -import { Engine, Scene, useScene } from '../../../dist/react-babylonjs' +import { Engine, Scene, useScene } from 'react-babylonjs' import { Color3, Color4, Vector3 } from '@babylonjs/core/Maths/math' import '../../style.css' import ScaledModelWithProgress from '../ScaledModelWithProgress' diff --git a/stories/babylonjs/Textures/fire-procedural.stories.js b/storybook/stories/babylonjs/Textures/fire-procedural.stories.js similarity index 95% rename from stories/babylonjs/Textures/fire-procedural.stories.js rename to storybook/stories/babylonjs/Textures/fire-procedural.stories.js index 52bb6880..b731e37e 100644 --- a/stories/babylonjs/Textures/fire-procedural.stories.js +++ b/storybook/stories/babylonjs/Textures/fire-procedural.stories.js @@ -1,5 +1,5 @@ import React, { useCallback } from 'react' -import { Engine, Scene, useScene } from '../../../dist/react-babylonjs' +import { Engine, Scene, useScene } from 'react-babylonjs' import { Vector3, Space } from '@babylonjs/core/Maths/math' import { FireProceduralTexture } from '@babylonjs/procedural-textures' diff --git a/stories/babylonjs/Textures/fresnelparameters.stories.js b/storybook/stories/babylonjs/Textures/fresnelparameters.stories.js similarity index 98% rename from stories/babylonjs/Textures/fresnelparameters.stories.js rename to storybook/stories/babylonjs/Textures/fresnelparameters.stories.js index d8ff14ac..d1e223b2 100644 --- a/stories/babylonjs/Textures/fresnelparameters.stories.js +++ b/storybook/stories/babylonjs/Textures/fresnelparameters.stories.js @@ -1,5 +1,5 @@ import React, { useEffect, useRef, useState } from 'react' -import { Engine, Scene, Skybox } from '../../../dist/react-babylonjs' +import { Engine, Scene, Skybox } from 'react-babylonjs' import { Vector3, Color3 } from '@babylonjs/core/Maths/math' import '../../style.css' import { FresnelParameters } from '@babylonjs/core' diff --git a/stories/babylonjs/Textures/image-texture.stories.js b/storybook/stories/babylonjs/Textures/image-texture.stories.js similarity index 97% rename from stories/babylonjs/Textures/image-texture.stories.js rename to storybook/stories/babylonjs/Textures/image-texture.stories.js index d27d6798..ce9ff14a 100644 --- a/stories/babylonjs/Textures/image-texture.stories.js +++ b/storybook/stories/babylonjs/Textures/image-texture.stories.js @@ -1,6 +1,6 @@ import React, { Suspense, useState } from 'react' import '@babylonjs/inspector' -import { Engine, Scene, TaskType, useAssetManager } from '../../../dist/react-babylonjs' +import { Engine, Scene, TaskType, useAssetManager } from 'react-babylonjs' import { Color4, Vector3, Color3 } from '@babylonjs/core/Maths/math' import '../../style.css' diff --git a/stories/babylonjs/Textures/pbr-configuration.stories.js b/storybook/stories/babylonjs/Textures/pbr-configuration.stories.js similarity index 98% rename from stories/babylonjs/Textures/pbr-configuration.stories.js rename to storybook/stories/babylonjs/Textures/pbr-configuration.stories.js index 0b4b35c2..e32aee3c 100644 --- a/stories/babylonjs/Textures/pbr-configuration.stories.js +++ b/storybook/stories/babylonjs/Textures/pbr-configuration.stories.js @@ -1,7 +1,7 @@ import React, { useCallback, useState } from 'react'; import { Vector3, Color3, Texture } from '@babylonjs/core'; -import { Engine, Scene, useScene } from 'react-babylonjs'; +import { Engine, Scene } from 'react-babylonjs'; import '../../style.css'; diff --git a/stories/babylonjs/Textures/pbr.stories.js b/storybook/stories/babylonjs/Textures/pbr.stories.js similarity index 96% rename from stories/babylonjs/Textures/pbr.stories.js rename to storybook/stories/babylonjs/Textures/pbr.stories.js index 721119d4..5084ca71 100644 --- a/stories/babylonjs/Textures/pbr.stories.js +++ b/storybook/stories/babylonjs/Textures/pbr.stories.js @@ -1,9 +1,9 @@ import React, { useCallback, useState } from 'react' -import { Engine, Scene} from '../../../dist/react-babylonjs' +import { Engine, Scene} from 'react-babylonjs' import { Vector3, Color3 } from '@babylonjs/core/Maths/math' import '../../style.css' -import { FresnelParameters, Texture, CubeTexture } from '@babylonjs/core' +import { Texture } from '@babylonjs/core' export default { title: 'Textures' }; diff --git a/stories/babylonjs/VR/withVr.stories.js b/storybook/stories/babylonjs/VR/withVr.stories.js similarity index 97% rename from stories/babylonjs/VR/withVr.stories.js rename to storybook/stories/babylonjs/VR/withVr.stories.js index 929b5812..4f0e730f 100644 --- a/stories/babylonjs/VR/withVr.stories.js +++ b/storybook/stories/babylonjs/VR/withVr.stories.js @@ -1,8 +1,8 @@ import React, { useState, useRef } from 'react' -import { Engine, Scene, useClick, useHover, useBeforeRender } from '../../../dist/react-babylonjs' +import { Engine, Scene, useClick, useHover, useBeforeRender } from 'react-babylonjs' import ScaledModelWithProgress from '../ScaledModelWithProgress' -import { Vector3, Color3, Axis } from '@babylonjs/core/Maths/math' +import { Vector3, Color3 } from '@babylonjs/core/Maths/math' import '../../style.css' export default { title: 'VR' }; diff --git a/stories/style.css b/storybook/stories/style.css similarity index 100% rename from stories/style.css rename to storybook/stories/style.css diff --git a/storyboard-site/assets/images/building.jpeg b/storybook/storyboard-site/assets/images/building.jpeg similarity index 100% rename from storyboard-site/assets/images/building.jpeg rename to storybook/storyboard-site/assets/images/building.jpeg diff --git a/storyboard-site/assets/images/ph1.jpg b/storybook/storyboard-site/assets/images/ph1.jpg similarity index 100% rename from storyboard-site/assets/images/ph1.jpg rename to storybook/storyboard-site/assets/images/ph1.jpg diff --git a/storyboard-site/assets/images/ph3.jpg b/storybook/storyboard-site/assets/images/ph3.jpg similarity index 100% rename from storyboard-site/assets/images/ph3.jpg rename to storybook/storyboard-site/assets/images/ph3.jpg diff --git a/storyboard-site/assets/images/photo-1515036551567-bf1198cccc35.jpeg b/storybook/storyboard-site/assets/images/photo-1515036551567-bf1198cccc35.jpeg similarity index 100% rename from storyboard-site/assets/images/photo-1515036551567-bf1198cccc35.jpeg rename to storybook/storyboard-site/assets/images/photo-1515036551567-bf1198cccc35.jpeg diff --git a/storyboard-site/assets/images/photo-1516245266743-983948b98d53.jpeg b/storybook/storyboard-site/assets/images/photo-1516245266743-983948b98d53.jpeg similarity index 100% rename from storyboard-site/assets/images/photo-1516245266743-983948b98d53.jpeg rename to storybook/storyboard-site/assets/images/photo-1516245266743-983948b98d53.jpeg diff --git a/storyboard-site/assets/images/photo-1519608487953-e999c86e7455.jpeg b/storybook/storyboard-site/assets/images/photo-1519608487953-e999c86e7455.jpeg similarity index 100% rename from storyboard-site/assets/images/photo-1519608487953-e999c86e7455.jpeg rename to storybook/storyboard-site/assets/images/photo-1519608487953-e999c86e7455.jpeg diff --git a/storyboard-site/assets/images/photo-1533577116850-9cc66cad8a9b.jpeg b/storybook/storyboard-site/assets/images/photo-1533577116850-9cc66cad8a9b.jpeg similarity index 100% rename from storyboard-site/assets/images/photo-1533577116850-9cc66cad8a9b.jpeg rename to storybook/storyboard-site/assets/images/photo-1533577116850-9cc66cad8a9b.jpeg diff --git a/storyboard-site/assets/images/photo-1548191265-cc70d3d45ba1.jpeg b/storybook/storyboard-site/assets/images/photo-1548191265-cc70d3d45ba1.jpeg similarity index 100% rename from storyboard-site/assets/images/photo-1548191265-cc70d3d45ba1.jpeg rename to storybook/storyboard-site/assets/images/photo-1548191265-cc70d3d45ba1.jpeg diff --git a/storyboard-site/assets/kitti/000000.bin b/storybook/storyboard-site/assets/kitti/000000.bin similarity index 100% rename from storyboard-site/assets/kitti/000000.bin rename to storybook/storyboard-site/assets/kitti/000000.bin diff --git a/storyboard-site/assets/models/atom.glb b/storybook/storyboard-site/assets/models/atom.glb similarity index 100% rename from storyboard-site/assets/models/atom.glb rename to storybook/storyboard-site/assets/models/atom.glb diff --git a/storyboard-site/assets/textures/LateSunset.3dl b/storybook/storyboard-site/assets/textures/LateSunset.3dl similarity index 100% rename from storyboard-site/assets/textures/LateSunset.3dl rename to storybook/storyboard-site/assets/textures/LateSunset.3dl diff --git a/storyboard-site/assets/textures/SpecularHDR.dds b/storybook/storyboard-site/assets/textures/SpecularHDR.dds similarity index 100% rename from storyboard-site/assets/textures/SpecularHDR.dds rename to storybook/storyboard-site/assets/textures/SpecularHDR.dds diff --git a/storyboard-site/assets/textures/TropicalSunnyDay_nx.jpg b/storybook/storyboard-site/assets/textures/TropicalSunnyDay_nx.jpg similarity index 100% rename from storyboard-site/assets/textures/TropicalSunnyDay_nx.jpg rename to storybook/storyboard-site/assets/textures/TropicalSunnyDay_nx.jpg diff --git a/storyboard-site/assets/textures/TropicalSunnyDay_ny.jpg b/storybook/storyboard-site/assets/textures/TropicalSunnyDay_ny.jpg similarity index 100% rename from storyboard-site/assets/textures/TropicalSunnyDay_ny.jpg rename to storybook/storyboard-site/assets/textures/TropicalSunnyDay_ny.jpg diff --git a/storyboard-site/assets/textures/TropicalSunnyDay_nz.jpg b/storybook/storyboard-site/assets/textures/TropicalSunnyDay_nz.jpg similarity index 100% rename from storyboard-site/assets/textures/TropicalSunnyDay_nz.jpg rename to storybook/storyboard-site/assets/textures/TropicalSunnyDay_nz.jpg diff --git a/storyboard-site/assets/textures/TropicalSunnyDay_px.jpg b/storybook/storyboard-site/assets/textures/TropicalSunnyDay_px.jpg similarity index 100% rename from storyboard-site/assets/textures/TropicalSunnyDay_px.jpg rename to storybook/storyboard-site/assets/textures/TropicalSunnyDay_px.jpg diff --git a/storyboard-site/assets/textures/TropicalSunnyDay_py.jpg b/storybook/storyboard-site/assets/textures/TropicalSunnyDay_py.jpg similarity index 100% rename from storyboard-site/assets/textures/TropicalSunnyDay_py.jpg rename to storybook/storyboard-site/assets/textures/TropicalSunnyDay_py.jpg diff --git a/storyboard-site/assets/textures/TropicalSunnyDay_pz.jpg b/storybook/storyboard-site/assets/textures/TropicalSunnyDay_pz.jpg similarity index 100% rename from storyboard-site/assets/textures/TropicalSunnyDay_pz.jpg rename to storybook/storyboard-site/assets/textures/TropicalSunnyDay_pz.jpg diff --git a/storyboard-site/assets/textures/albedo.png b/storybook/storyboard-site/assets/textures/albedo.png similarity index 100% rename from storyboard-site/assets/textures/albedo.png rename to storybook/storyboard-site/assets/textures/albedo.png diff --git a/storyboard-site/assets/textures/environment.dds b/storybook/storyboard-site/assets/textures/environment.dds similarity index 100% rename from storyboard-site/assets/textures/environment.dds rename to storybook/storyboard-site/assets/textures/environment.dds diff --git a/storyboard-site/assets/textures/grass.png b/storybook/storyboard-site/assets/textures/grass.png similarity index 100% rename from storyboard-site/assets/textures/grass.png rename to storybook/storyboard-site/assets/textures/grass.png diff --git a/storyboard-site/assets/textures/reflectivity.png b/storybook/storyboard-site/assets/textures/reflectivity.png similarity index 100% rename from storyboard-site/assets/textures/reflectivity.png rename to storybook/storyboard-site/assets/textures/reflectivity.png diff --git a/storyboard-site/favicon.ico b/storybook/storyboard-site/favicon.ico similarity index 100% rename from storyboard-site/favicon.ico rename to storybook/storyboard-site/favicon.ico diff --git a/storyboard-site/manifest.json b/storybook/storyboard-site/manifest.json similarity index 100% rename from storyboard-site/manifest.json rename to storybook/storyboard-site/manifest.json diff --git a/tsconfig.test.json b/test/tsconfig.json similarity index 100% rename from tsconfig.test.json rename to test/tsconfig.json diff --git a/tsconfig.generate.json b/tools/tsconfig.generate.json similarity index 63% rename from tsconfig.generate.json rename to tools/tsconfig.generate.json index e2544da0..6f4948b1 100644 --- a/tsconfig.generate.json +++ b/tools/tsconfig.generate.json @@ -1,8 +1,8 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.json", "compilerOptions": { "module": "commonjs", // ts-node does not work with esnext - "baseUrl": "./", // needed for tsconfig-paths + "baseUrl": "../", // needed for tsconfig-paths }, "include": [ "src", diff --git a/tslint.json b/tslint.json deleted file mode 100644 index c5286e62..00000000 --- a/tslint.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "max-line-length": [ - true, - { - "limit": 120, - "ignore-pattern": "^import |^export {(.*?)}" - } - ], - "extends": [ - "tslint-config-standard", - "tslint-config-prettier" - ] -} \ No newline at end of file