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.

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

Issue 666 - add support for RepoBundles #677

Merged
merged 46 commits into from
Mar 15, 2024
Merged

Issue 666 - add support for RepoBundles #677

merged 46 commits into from
Mar 15, 2024

Conversation

sebjf
Copy link
Contributor

@sebjf sebjf commented Feb 16, 2024

This fixes #666 - Add support for RepoBundles

Description

This PR contains mainly minor changes required to integrate AssetGenerator.

AssetGenerator is an optional dependency that can be turned off (turned on by default) with the REPO_ASSETGENERATOR_SUPPORT CMake flag. AssetGenerator will create RepoBundles, which are documented its own repository, after the stash scene is created.

The changes made to bouncer to support this are:

  1. The cmake project and build scripts have been updated to include AssetGenerator as a git submodule
  2. A new attribute array, ids, has been added to MeshNode
  3. The unityAssets.json schema has been extended, and it now updates instead of replacing the document in the database.
  4. The _RepoVector3D constructor has been adjusted so it can be initialised by value (it makes a copy of the reference immediately anyway), and the type has been given two new members.
  5. repo_color4d_t has been given new members.
  6. PropertyTree::addToTree has support for repo_color4d_t added.
  7. Assimp no longer initialises unknowns to nans, as these are used in calculations which can result in invalid json.

@sebjf sebjf added the invalid label Feb 16, 2024
@sebjf sebjf removed the invalid label Feb 22, 2024
@sebjf sebjf requested a review from carmenfan February 22, 2024 18:40
@sebjf sebjf changed the title Issue 666 Issue 666 - add support for RepoBundles Feb 22, 2024
@carmenfan carmenfan self-assigned this Feb 26, 2024
CMakeLists.txt Outdated Show resolved Hide resolved
bouncer/src/repo/lib/datastructure/repo_vector3d.h Outdated Show resolved Hide resolved
bouncer/src/repo/lib/datastructure/repo_vector3d.h Outdated Show resolved Hide resolved
bouncer/src/repo/core/model/bson/repo_node_mesh.cpp Outdated Show resolved Hide resolved
bouncer/src/repo/core/model/bson/repo_node_mesh.h Outdated Show resolved Hide resolved
@@ -157,7 +157,14 @@ repo::core::model::MeshNode MeshMapReorganiser::getRemappedMesh() const
bboxArr.push_back({ bbox[1].x, bbox[1].y, bbox[1].z });
}

auto newMesh = repo::core::model::RepoBSONFactory::makeMeshNode(newVertices, newFaces, newNormals, bboxArr, newUVs, newColors);
auto submeshIds = getIDMapArrays();
Copy link
Member

Choose a reason for hiding this comment

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

Not something to address here, just noting down my thoughts.

Stash graph and this should probably merge into 1 in the future? We're effectively batching the meshes twice 😆

@carmenfan carmenfan self-requested a review March 14, 2024 13:33
@carmenfan carmenfan merged commit a7b24ca into staging Mar 15, 2024
5 of 6 checks passed
@carmenfan carmenfan deleted the ISSUE_666 branch March 15, 2024 18:03
@carmenfan carmenfan removed their assignment Mar 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants