From 7c81426b34f0ca43521747ebc269d5d9a939d20f Mon Sep 17 00:00:00 2001 From: sunag Date: Sat, 14 Oct 2023 14:17:31 -0300 Subject: [PATCH 1/7] Rename FatPoints to InstancedPoints --- examples/files.json | 2 +- examples/jsm/nodes/Nodes.js | 2 +- .../nodes/accessors/FatPointsMaterialNode.js | 21 --------------- .../accessors/InstancedPointsMaterialNode.js | 21 +++++++++++++++ ...rial.js => InstancedPointsNodeMaterial.js} | 8 +++--- examples/jsm/nodes/materials/Materials.js | 2 +- examples/jsm/points/FatPoints.js | 21 --------------- examples/jsm/points/InstancedPoints.js | 21 +++++++++++++++ ...Geometry.js => InstancedPointsGeometry.js} | 8 +++--- ...nts_fat.jpg => webgpu_instance_points.jpg} | Bin ...s_fat.html => webgpu_instance_points.html} | 24 +++++++++--------- 11 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 examples/jsm/nodes/accessors/FatPointsMaterialNode.js create mode 100644 examples/jsm/nodes/accessors/InstancedPointsMaterialNode.js rename examples/jsm/nodes/materials/{FatPointsNodeMaterial.js => InstancedPointsNodeMaterial.js} (91%) delete mode 100644 examples/jsm/points/FatPoints.js create mode 100644 examples/jsm/points/InstancedPoints.js rename examples/jsm/points/{FatPointsGeometry.js => InstancedPointsGeometry.js} (93%) rename examples/screenshots/{webgpu_points_fat.jpg => webgpu_instance_points.jpg} (100%) rename examples/{webgpu_points_fat.html => webgpu_instance_points.html} (87%) diff --git a/examples/files.json b/examples/files.json index e8f2a2dad86e0e..05fb7eb6b669db 100644 --- a/examples/files.json +++ b/examples/files.json @@ -323,6 +323,7 @@ "webgpu_depth_texture", "webgpu_equirectangular", "webgpu_instance_mesh", + "webgpu_instance_points", "webgpu_instance_uniform", "webgpu_lights_custom", "webgpu_lights_ies_spotlight", @@ -339,7 +340,6 @@ "webgpu_morphtargets", "webgpu_occlusion", "webgpu_particles", - "webgpu_points_fat", "webgpu_rtt", "webgpu_sandbox", "webgpu_shadowmap", diff --git a/examples/jsm/nodes/Nodes.js b/examples/jsm/nodes/Nodes.js index 57112778a04735..498451b47d4821 100644 --- a/examples/jsm/nodes/Nodes.js +++ b/examples/jsm/nodes/Nodes.js @@ -72,7 +72,7 @@ export { default as BufferNode, buffer } from './accessors/BufferNode.js'; export { default as CameraNode, cameraProjectionMatrix, cameraViewMatrix, cameraNormalMatrix, cameraWorldMatrix, cameraPosition, cameraNear, cameraFar } from './accessors/CameraNode.js'; export { default as CubeTextureNode, cubeTexture } from './accessors/CubeTextureNode.js'; export { default as ExtendedMaterialNode, materialNormal } from './accessors/ExtendedMaterialNode.js'; -export { default as FatPointsMaterialNode, materialPointWidth } from './accessors/FatPointsMaterialNode.js'; +export { default as InstancedPointsMaterialNode, materialPointWidth } from './accessors/InstancedPointsMaterialNode.js'; export { default as InstanceNode, instance } from './accessors/InstanceNode.js'; export { default as LineMaterialNode, materialLineDashSize, materialLineDashOffset, materialLineGapSize, materialLineScale, materialLineWidth } from './accessors/LineMaterialNode.js'; export { default as MaterialNode, materialAlphaTest, materialColor, materialShininess, materialEmissive, materialOpacity, materialSpecularColor, materialReflectivity, materialRoughness, materialMetalness, materialRotation, materialSheen, materialSheenRoughness } from './accessors/MaterialNode.js'; diff --git a/examples/jsm/nodes/accessors/FatPointsMaterialNode.js b/examples/jsm/nodes/accessors/FatPointsMaterialNode.js deleted file mode 100644 index 793a62ba7e49fa..00000000000000 --- a/examples/jsm/nodes/accessors/FatPointsMaterialNode.js +++ /dev/null @@ -1,21 +0,0 @@ -import MaterialNode from './MaterialNode.js'; -import { addNodeClass } from '../core/Node.js'; -import { nodeImmutable } from '../shadernode/ShaderNode.js'; - -class FatPointsMaterialNode extends MaterialNode { - - setup( /*builder*/ ) { - - return this.getFloat( this.scope ); - - } - -} - -FatPointsMaterialNode.POINTWIDTH = 'pointWidth'; - -export default FatPointsMaterialNode; - -export const materialPointWidth = nodeImmutable( FatPointsMaterialNode, FatPointsMaterialNode.POINTWIDTH ); - -addNodeClass( 'FatPointsMaterialNode', FatPointsMaterialNode ); diff --git a/examples/jsm/nodes/accessors/InstancedPointsMaterialNode.js b/examples/jsm/nodes/accessors/InstancedPointsMaterialNode.js new file mode 100644 index 00000000000000..0ca9a4b89d6177 --- /dev/null +++ b/examples/jsm/nodes/accessors/InstancedPointsMaterialNode.js @@ -0,0 +1,21 @@ +import MaterialNode from './MaterialNode.js'; +import { addNodeClass } from '../core/Node.js'; +import { nodeImmutable } from '../shadernode/ShaderNode.js'; + +class InstancedPointsMaterialNode extends MaterialNode { + + setup( /*builder*/ ) { + + return this.getFloat( this.scope ); + + } + +} + +InstancedPointsMaterialNode.POINTWIDTH = 'pointWidth'; + +export default InstancedPointsMaterialNode; + +export const materialPointWidth = nodeImmutable( InstancedPointsMaterialNode, InstancedPointsMaterialNode.POINTWIDTH ); + +addNodeClass( 'FatPointsMaterialNode', InstancedPointsMaterialNode ); diff --git a/examples/jsm/nodes/materials/FatPointsNodeMaterial.js b/examples/jsm/nodes/materials/InstancedPointsNodeMaterial.js similarity index 91% rename from examples/jsm/nodes/materials/FatPointsNodeMaterial.js rename to examples/jsm/nodes/materials/InstancedPointsNodeMaterial.js index 4c779490f8f92a..b489ec1fba61d3 100644 --- a/examples/jsm/nodes/materials/FatPointsNodeMaterial.js +++ b/examples/jsm/nodes/materials/InstancedPointsNodeMaterial.js @@ -9,7 +9,7 @@ import { positionGeometry } from '../accessors/PositionNode.js'; import { smoothstep } from '../math/MathNode.js'; import { tslFn, vec2, vec4 } from '../shadernode/ShaderNode.js'; import { uv } from '../accessors/UVNode.js'; -import { materialPointWidth } from '../accessors/FatPointsMaterialNode.js'; // or should this be a property, instead? +import { materialPointWidth } from '../accessors/InstancedPointsMaterialNode.js'; // or should this be a property, instead? import { viewport } from '../display/ViewportNode.js'; import { color } from 'three/nodes'; @@ -17,7 +17,7 @@ import { PointsMaterial } from 'three'; const defaultValues = new PointsMaterial(); -class FatPointsNodeMaterial extends NodeMaterial { +class InstancedPointsNodeMaterial extends NodeMaterial { constructor( params = {} ) { @@ -159,6 +159,6 @@ class FatPointsNodeMaterial extends NodeMaterial { } -export default FatPointsNodeMaterial; +export default InstancedPointsNodeMaterial; -addNodeMaterial( 'FatPointsNodeMaterial', FatPointsNodeMaterial ); +addNodeMaterial( 'InstancedPointsNodeMaterial', InstancedPointsNodeMaterial ); diff --git a/examples/jsm/nodes/materials/Materials.js b/examples/jsm/nodes/materials/Materials.js index 5dcd6672ecc987..ec34d90940a61b 100644 --- a/examples/jsm/nodes/materials/Materials.js +++ b/examples/jsm/nodes/materials/Materials.js @@ -1,7 +1,7 @@ // @TODO: We can simplify "export { default as SomeNode, other, exports } from '...'" to just "export * from '...'" if we will use only named exports export { default as NodeMaterial, addNodeMaterial, createNodeMaterialFromType } from './NodeMaterial.js'; -export { default as FatPointsNodeMaterial } from './FatPointsNodeMaterial.js'; +export { default as InstancedPointsNodeMaterial } from './InstancedPointsNodeMaterial.js'; export { default as LineBasicNodeMaterial } from './LineBasicNodeMaterial.js'; export { default as LineDashedNodeMaterial } from './LineDashedNodeMaterial.js'; export { default as Line2NodeMaterial } from './Line2NodeMaterial.js'; diff --git a/examples/jsm/points/FatPoints.js b/examples/jsm/points/FatPoints.js deleted file mode 100644 index 784e87d72ac42a..00000000000000 --- a/examples/jsm/points/FatPoints.js +++ /dev/null @@ -1,21 +0,0 @@ -import { - Mesh -} from 'three'; -import { FatPointsGeometry } from '../points/FatPointsGeometry.js'; -import { FatPointsNodeMaterial } from 'three/nodes'; - -class FatPoints extends Mesh { - - constructor( geometry = new FatPointsGeometry(), material = new FatPointsNodeMaterial() ) { - - super( geometry, material ); - - this.isFatPoints = true; - - this.type = 'FatPoints'; - - } - -} - -export { FatPoints }; diff --git a/examples/jsm/points/InstancedPoints.js b/examples/jsm/points/InstancedPoints.js new file mode 100644 index 00000000000000..f793e8c797a10e --- /dev/null +++ b/examples/jsm/points/InstancedPoints.js @@ -0,0 +1,21 @@ +import { + Mesh +} from 'three'; +import { InstancedPointsGeometry } from '../points/InstancedPointsGeometry.js'; +import { InstancedPointsNodeMaterial } from 'three/nodes'; + +class InstancedPoints extends Mesh { + + constructor( geometry = new InstancedPointsGeometry(), material = new InstancedPointsNodeMaterial() ) { + + super( geometry, material ); + + this.isInstancedPoints = true; + + this.type = 'InstancedPoints'; + + } + +} + +export { InstancedPoints }; diff --git a/examples/jsm/points/FatPointsGeometry.js b/examples/jsm/points/InstancedPointsGeometry.js similarity index 93% rename from examples/jsm/points/FatPointsGeometry.js rename to examples/jsm/points/InstancedPointsGeometry.js index 1dcffd096f33ef..257877c3dcb410 100644 --- a/examples/jsm/points/FatPointsGeometry.js +++ b/examples/jsm/points/InstancedPointsGeometry.js @@ -9,15 +9,15 @@ import { const _vector = new Vector3(); -class FatPointsGeometry extends InstancedBufferGeometry { +class InstancedPointsGeometry extends InstancedBufferGeometry { constructor() { super(); - this.isFatPointsGeometry = true; + this.isInstancedPointsGeometry = true; - this.type = 'FatPointsGeometry'; + this.type = 'InstancedPointsGeometry'; const positions = [ - 1, 1, 0, 1, 1, 0, - 1, - 1, 0, 1, - 1, 0 ]; const uvs = [ - 1, 1, 1, 1, - 1, - 1, 1, - 1 ]; @@ -171,4 +171,4 @@ class FatPointsGeometry extends InstancedBufferGeometry { } -export { FatPointsGeometry }; +export { InstancedPointsGeometry }; diff --git a/examples/screenshots/webgpu_points_fat.jpg b/examples/screenshots/webgpu_instance_points.jpg similarity index 100% rename from examples/screenshots/webgpu_points_fat.jpg rename to examples/screenshots/webgpu_instance_points.jpg diff --git a/examples/webgpu_points_fat.html b/examples/webgpu_instance_points.html similarity index 87% rename from examples/webgpu_points_fat.html rename to examples/webgpu_instance_points.html index 802a274124053e..1cfb8a64e90507 100644 --- a/examples/webgpu_points_fat.html +++ b/examples/webgpu_instance_points.html @@ -1,7 +1,7 @@ - three.js webgpu - points - fat + three.js webgpu - points - instanced @@ -11,7 +11,7 @@
-
three.js - fat points
+
three.js - instanced points