add generated components

3DStreet · Feb 4, 2025 · 17f990c · 17f990c
1 parent 5e09443
commit 17f990c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/src/components/street-generated-clones.js b/src/components/street-generated-clones.js
@@ -78,6 +78,11 @@ AFRAME.registerComponent('street-generated-clones', {
   },
 
   update: function (oldData) {
+    // if length is not set, then derive length from the segment
+    if (!this.data.length) {
+      this.data.length = this.el.getAttribute('street-segment').length;
+    }
+
     // If mode is random or randomFacing and seed is 0, generate a random seed and return,
     // the update will be called again because of the setAttribute.
     if (this.data.mode === 'random' || this.data.randomFacing) {

diff --git a/src/components/street-generated-pedestrians.js b/src/components/street-generated-pedestrians.js
@@ -81,6 +81,11 @@ AFRAME.registerComponent('street-generated-pedestrians', {
   update: function (oldData) {
     const data = this.data;
 
+    // if length is not set, then derive length from the segment
+    if (!data.length) {
+      data.length = this.el.getAttribute('street-segment').length;
+    }
+
     // Handle seed initialization
     if (this.data.seed === 0) {
       const newSeed = Math.floor(Math.random() * 1000000) + 1;

diff --git a/src/components/street-generated-rail.js b/src/components/street-generated-rail.js
@@ -22,6 +22,11 @@ AFRAME.registerComponent('street-generated-rail', {
     this.createdEntities.length = 0; // Clear the array
   },
   update: function (oldData) {
+    // if length is not set, then derive length from the segment
+    if (!this.data.length) {
+      this.data.length = this.el.getAttribute('street-segment').length;
+    }
+
     // Clean up old entities
     this.remove();
 

diff --git a/src/components/street-generated-stencil.js b/src/components/street-generated-stencil.js
@@ -45,7 +45,7 @@ AFRAME.registerComponent('street-generated-stencil', {
     },
     spacing: {
       // spacing in meters between clones
-      default: 15,
+      default: 10,
       type: 'number'
     },
     positionX: {
@@ -119,6 +119,11 @@ AFRAME.registerComponent('street-generated-stencil', {
   update: function (oldData) {
     const data = this.data;
 
+    // if length is not set, then derive length from the segment
+    if (!data.length) {
+      data.length = this.el.getAttribute('street-segment').length;
+    }
+
     // Clean up old entities
     this.remove();
 

diff --git a/src/editor/components/components/Sidebar.js b/src/editor/components/components/Sidebar.js
@@ -11,6 +11,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import capitalize from 'lodash-es/capitalize';
 import classnames from 'classnames';
+import AddComponent from './AddComponent';
 import {
   ArrowRightIcon,
   Object24Icon,
@@ -244,6 +245,7 @@ export default class Sidebar extends React.Component {
                     {entity.getAttribute('street-segment') && (
                       <>
                         <StreetSegmentSidebar entity={entity} />
+                        <AddComponent entity={entity} />
                         <div className="advancedComponentsContainer">
                           <AdvancedComponents entity={entity} />
                         </div>

diff --git a/src/editor/components/components/StreetSegmentComponent.js b/src/editor/components/components/StreetSegmentComponent.js
@@ -239,9 +239,15 @@ export default class Component extends React.Component {
     } else if (componentName.startsWith('street-generated-stencil')) {
       return (
         <>
-          <ModelsArrayWidget
-            entity={this.props.entity}
+          <PropertyRow
+            key="modelsArray"
+            name="modelsArray"
+            label="Stencils"
+            schema={schema['modelsArray']}
+            data={componentData.data['modelsArray']}
             componentname={componentName}
+            entity={this.props.entity}
+            isSingle={false}
           />
           <PropertyRow
             key="spacing"