Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Model card previews #873

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Model card previews #873

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
982b637
work in progress
kfarr Sep 17, 2024
22c9801
reorganize things
Sep 19, 2024
200e64e
remove images
Sep 19, 2024
ec8da58
respond to comments
Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/assets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* global AFRAME, customElements */
const catalog = require('./catalog.json');

function buildAssetHTML(assetUrl, categories) {
// if (!assetUrl) assetUrl = 'https://assets.3dstreet.app/';
Expand Down Expand Up @@ -86,21 +87,6 @@ function buildAssetHTML(assetUrl, categories) {
<a-mixin shadow id="Character_1_M" gltf-part="src: #magic-carpet-glb; part: Character_1_M"></a-mixin>
<a-mixin shadow id="magic-carpet" gltf-part="src: #magic-carpet-glb; part: magic-carpet"></a-mixin>
`,
'vehicles-rigged': `
<!-- vehicles rigged -->
<a-mixin shadow id="sedan-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/toyota-prius-rig.glb)" ></a-mixin>
<a-mixin shadow id="sedan-taxi-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/sedan-taxi-rig.glb)"></a-mixin>
<a-mixin shadow id="suv-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/suv-rig.glb)"></a-mixin>
<a-mixin shadow id="box-truck-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/isuzu-truck-rig.glb)"></a-mixin>
<a-mixin shadow id="food-trailer-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/food-trailer-rig.glb)"></a-mixin>
<a-mixin shadow id="fire-truck-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/fire-truck-pumper-rig.glb)"></a-mixin>
<a-mixin shadow id="fire-ladder-rig" gltf-model="url(${assetUrl}sets/vehicles/gltf-exports/draco/fire_truck_ladder.glb)"></a-mixin>
<a-mixin shadow id="trash-truck-side-loading" gltf-model="url(${assetUrl}sets/vehicles/gltf-exports/draco/trash-truck-side-loading.glb)"></a-mixin>
<a-mixin shadow id="self-driving-cruise-car-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/self-driving-cruise-car-rig.glb)"></a-mixin>
<a-mixin shadow id="self-driving-waymo-car" gltf-model="url(${assetUrl}sets/vehicles/gltf-exports/draco/waymo-self-driving-car.glb)"></a-mixin>
<a-mixin shadow id="tuk-tuk" gltf-model="url(${assetUrl}sets/vehicles/gltf-exports/draco/tuk-tuk.glb)"></a-mixin>
<a-mixin shadow id="motorbike" gltf-model="url(${assetUrl}sets/vehicles/gltf-exports/draco/two-wheeler-with-person.glb)"></a-mixin>
`,
buildings: `
<!-- blocks -->
<a-asset-item id="blockmodel" src="${assetUrl}sets/buildings/gltf-exports/draco/buildings.glb"></a-asset-item>
Expand Down Expand Up @@ -307,6 +293,20 @@ function buildAssetHTML(assetUrl, categories) {
assetsHTML += addCategoryNamesToMixins(assetsCategoryHTML, categoryName);
}
}

// Iterate through catalog.json and add mixins to assetsHTML
catalog.forEach((item) => {
if (item.id && item.src) {
const mixinHTML = `
<a-mixin
id="${item.id}"
shadow
gltf-model="url(${item.src}/${item.id}.glb)"
category="${item.category || ''}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should use data-category here unless you're creating a category component.

Copy link
Collaborator Author

@rahulkgupta rahulkgupta Sep 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i was trying to maintain existing functionality

  function addCategoryNamesToMixins(html, categoryName) {
    const parser = new DOMParser();
    const doc = parser.parseFromString(html, 'text/html');
    const mixinNodes = doc.querySelectorAll('a-mixin');
    mixinNodes.forEach((mixinNode) => {
      mixinNode.setAttribute('category', categoryName);
    });
    return doc.documentElement.innerHTML;
  }

></a-mixin>`;
assetsHTML += mixinHTML;
}
});
return assetsHTML;
}

Expand Down
72 changes: 72 additions & 0 deletions src/catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,77 @@
"id": "bus",
"name": "Bus New Flyer XD40",
"description": "The New Flyer XD40 is a modern, stylish, and comfortable bus that is perfect for people in urban settings."
},
{
"id": "sedan-rig",
"name": "Sedan",
"src": "https://assets.3dstreet.app/sets/vehicles-rig/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "sedan-taxi-rig",
"name": "Sedan Taxi",
"src": "https://assets.3dstreet.app/sets/vehicles-rig/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "suv-rig",
"name": "SUV",
"src": "https://assets.3dstreet.app/sets/vehicles-rig/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "box-truck-rig",
"name": "Box Truck",
"src": "https://assets.3dstreet.app/sets/vehicles-rig/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "food-trailer-rig",
"name": "Food Trailer",
"src": "https://assets.3dstreet.app/sets/vehicles-rig/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "fire-truck-rig",
"name": "Fire Truck",
"src": "https://assets.3dstreet.app/sets/vehicles-rig/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "fire-ladder-rig",
"name": "Fire Ladder Truck",
"src": "https://assets.3dstreet.app/sets/vehicles/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "trash-truck-side-loading",
"name": "Side-Loading Trash Truck",
"src": "https://assets.3dstreet.app/sets/vehicles/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "self-driving-cruise-car-rig",
"name": "Self-Driving Cruise Car",
"src": "https://assets.3dstreet.app/sets/vehicles-rig/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "self-driving-waymo-car",
"name": "Self-Driving Waymo Car",
"src": "https://assets.3dstreet.app/sets/vehicles/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "tuk-tuk",
"name": "Tuk-Tuk",
"src": "https://assets.3dstreet.app/sets/vehicles/gltf-exports/draco",
"category": "vehicles-rigged"
},
{
"id": "motorbike",
"name": "Motorbike",
"src": "https://assets.3dstreet.app/sets/vehicles/gltf-exports/draco",
"category": "vehicles-rigged"
}
]
3 changes: 3 additions & 0 deletions src/editor/components/components/AddLayerPanel/AddLayerPanel.component.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ const getGroupedMixinOptions = () => {
let mixinDescr = '';

if (mixinDataFromCatalog) {
if (mixinDataFromCatalog.src) {
mixinImg = `${mixinDataFromCatalog.src}/${mixinId}.jpg`;
}
rahulkgupta marked this conversation as resolved.
Show resolved Hide resolved
mixinImg = mixinDataFromCatalog.img;
mixinName = mixinDataFromCatalog.name;
mixinDescr = mixinDataFromCatalog.description;
Expand Down
28 changes: 0 additions & 28 deletions src/editor/components/components/AddLayerPanel/cardsData.js
View file
Open in desktop

This file was deleted.