@lukekaalim/act-three 3.1.0 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/components.js CHANGED
@@ -6,6 +6,7 @@
6
6
  Quaternion,
7
7
  BufferGeometry,
8
8
  Material,
9
+ Texture,
9
10
  } from "three"; */
10
11
  /*:: import * as Three from 'three'; */
11
12
 
@@ -44,6 +45,8 @@ export type ThreeProps = {
44
45
  width: number,
45
46
  height: number,
46
47
  setStyle?: boolean,
48
+ background?: string | null | Texture,
49
+ alpha?: boolean,
47
50
  };
48
51
  */
49
52
 
package/main.js CHANGED
@@ -9,7 +9,7 @@ import { createThreeRenderer } from "./render.js";
9
9
 
10
10
  export const render = (element/*: Element*/, node/*: HTMLElement*/, renderer/*: ThreeRenderer*/ = createThreeRenderer()) => {
11
11
  const { renderRoot } = renderer;
12
- const web = createWebRenderService(new Map([['Three', { render: renderRoot }]]));
12
+ const web = createWebRenderService(new Map([['three', { render: renderRoot }]]));
13
13
 
14
14
  const onDiff = diff => attachNodes(node, web.render(diff));
15
15
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lukekaalim/act-three",
3
- "version": "3.1.0",
3
+ "version": "3.3.0",
4
4
  "description": "Render threejs content using act",
5
5
  "main": "main.js",
6
6
  "type": "module",
@@ -11,10 +11,12 @@
11
11
  },
12
12
  "author": "Luke Kaalim",
13
13
  "license": "ISC",
14
+ "peerDependencies": {
15
+ "three": "^0.130.0"
16
+ },
14
17
  "dependencies": {
15
18
  "@lukekaalim/act": "^2.2.0",
16
19
  "@lukekaalim/act-reconciler": "^2.0.1",
17
- "@lukekaalim/act-web": "^0.4.0",
18
- "three": "^0.130.0"
20
+ "@lukekaalim/act-web": "^0.4.0"
19
21
  }
20
22
  }
package/render.js CHANGED
@@ -1,5 +1,5 @@
1
1
  // @flow strict
2
- /*:: import type { CommitDiff, PropDiff } from '@lukekaalim/act-reconciler'; */
2
+ /*:: import type { CommitDiff, PropDiff, CommitID } from '@lukekaalim/act-reconciler'; */
3
3
  /*:: import type { Object3D } from 'three'; */
4
4
  /*:: import type { NodeDefinition } from './node.js'; */
5
5
  import { PerspectiveCamera, Scene, WebGLRenderer } from 'three';
@@ -15,16 +15,17 @@ export type ThreeRenderer = {
15
15
  export const createThreeRenderer = (nodeDefs/*: NodeDefinition[]*/ = threeNodes)/*: ThreeRenderer*/ => {
16
16
  const nodeDefsByType = new Map(nodeDefs.map(def => [def.type, def]));
17
17
 
18
- const roots = new Map();
18
+ const roots = new Map/*:: <CommitID, [WebGLRenderer, Scene, PerspectiveCamera]>*/();
19
19
  const objects = new Map();
20
20
 
21
21
  const createRoot = (diff) => {
22
- const renderer = new WebGLRenderer();
23
- const { width, height, setStyle = false } = (diff.next.element.props/*: any*/);
22
+ const { width, height, setStyle = false, background = null, alpha = false } = (diff.next.element.props/*: any*/);
24
23
 
24
+ const renderer = new WebGLRenderer({ alpha });
25
25
  renderer.setSize(width, height, setStyle);
26
26
  const scene = new Scene();
27
- const camera = new PerspectiveCamera( 75, window.innerWidth / window.innerHeight, 0.1, 1000 );
27
+ scene.background = background;
28
+ const camera = new PerspectiveCamera( 75, width / height, 0.1, 1000 );
28
29
  camera.position.z = 5;
29
30
 
30
31
  const animate = () => {
@@ -36,6 +37,18 @@ export const createThreeRenderer = (nodeDefs/*: NodeDefinition[]*/ = threeNodes)
36
37
  roots.set(diff.next.id, [renderer, scene, camera]);
37
38
  return [renderer, scene, camera];
38
39
  };
40
+ const setRootProps = (diff, [renderer, scene, camera]) => {
41
+ const props = calculatePropsDiff(diff.prev.element.props, diff.next.element.props);
42
+ const { width, height, setStyle = false, background = null, alpha = false } = (diff.next.element.props/*: any*/);
43
+
44
+ if (props.has('width') || props.has('height') || props.has('setStyle')) {
45
+ renderer.setSize(width, height, setStyle);
46
+ camera.aspect = width / height;
47
+ camera.updateProjectionMatrix();
48
+ }
49
+ if (props.has('background'))
50
+ scene.background = background;
51
+ }
39
52
 
40
53
  const removeRenderer = (diff, [renderer, scene, camera]) => {
41
54
  roots.delete(diff.next.id);
@@ -91,7 +104,7 @@ export const createThreeRenderer = (nodeDefs/*: NodeDefinition[]*/ = threeNodes)
91
104
  };
92
105
 
93
106
  const renderRoot = (diff/*: CommitDiff*/)/*: Node[]*/ => {
94
- if (diff.next.element.type !== 'Three')
107
+ if (diff.next.element.type !== 'three')
95
108
  return [];
96
109
 
97
110
  const root = roots.get(diff.next.id) || createRoot(diff);
@@ -102,6 +115,7 @@ export const createThreeRenderer = (nodeDefs/*: NodeDefinition[]*/ = threeNodes)
102
115
  return removeRenderer(diff, root);
103
116
 
104
117
  const [renderer, scene] = root;
118
+ setRootProps(diff, root);
105
119
  attachObjects(scene, children);
106
120
 
107
121
  return [renderer.domElement];