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

Fix physics component #158

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix physics component #158

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0fd4da1
Rewrite physics component logic for glbs
arya3d Oct 14, 2022
2962b68
Merge branch 'main' of https://github.com/webaverse/totum
arya3d Oct 14, 2022
2991b23
Revert "Rewrite physics component logic for glbs"
Oct 14, 2022
83b2809
Rewrite physics component logic
Oct 14, 2022
0f81996
add physicsId
arya3d Oct 14, 2022
2a27252
fix value setting
arya3d Oct 14, 2022
250bbbb
Cleanup
arya3d Oct 14, 2022
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
50 changes: 19 additions & 31 deletions type_templates/glb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,19 @@ export default e => {
const localPlayer = useLocalPlayer();

const srcUrl = ${this.srcUrl};

for (const {key, value} of components) {
app.setComponent(key, value);
}


// * true by default
let appHasPhysics = true;
const hasPhysicsComponent = app.hasComponent('physics');
if (hasPhysicsComponent) {
const physicsComponent = app.getComponent('physics');
appHasPhysics = physicsComponent;
}

app.glb = null;
const animationMixers = [];
const uvScrolls = [];
Expand Down Expand Up @@ -192,37 +201,16 @@ export default e => {
app.add(o);
o.updateMatrixWorld();

const _addPhysics = async physicsComponent => {
let physicsId;
switch (physicsComponent.type) {
case 'triangleMesh': {
physicsId = physics.addGeometry(o);
break;
}
case 'convexMesh': {
physicsId = physics.addConvexGeometry(o);
break;
}
default: {
physicsId = null;
break;
}
}
if (physicsId !== null) {
physicsIds.push(physicsId);
} else {
console.warn('glb unknown physics component', physicsComponent);
}
// * Physics
const _addPhysics = async () => {
const physicsId = physics.addGeometry(o);
physicsIds.push(physicsId);
};
let physicsComponent = app.getComponent('physics');
if (physicsComponent) {
if (physicsComponent === true) {
physicsComponent = {
type: 'triangleMesh',
};
}
_addPhysics(physicsComponent);

if (appHasPhysics) {
_addPhysics();
}

o.traverse(o => {
if (o.isMesh) {
o.frustumCulled = false;
Expand Down Expand Up @@ -325,4 +313,4 @@ export const contentId = ${this.contentId};
export const name = ${this.name};
export const description = ${this.description};
export const type = 'glb';
export const components = ${this.components};
export const components = ${this.components};