Skip to content

Commit

Permalink
Bug batch (#410)
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelthatsit committed Feb 14, 2024
1 parent fd043ae commit 293ce8c
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/core/componentSystems/LayoutSystem.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class LayoutSystem extends MRSystem {
entity.object3D.position.z += 0.0001;
}
} else {
entity.object3D.position.z = 0;
entity.object3D.position.z = entity.parentElement.object3D.position.z + 0.001;
}
}
}
3 changes: 2 additions & 1 deletion src/core/componentSystems/PhysicsSystem.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ export class PhysicsSystem extends MRSystem {
mrjsUtils.physics.COLLIDER_ENTITY_MAP[entity.physics.collider.handle] = entity;
entity.physics.collider.setActiveCollisionTypes(mrjsUtils.physics.RAPIER.ActiveCollisionTypes.DEFAULT | mrjsUtils.physics.RAPIER.ActiveCollisionTypes.KINEMATIC_FIXED);
entity.physics.collider.setActiveEvents(mrjsUtils.physics.RAPIER.ActiveEvents.COLLISION_EVENTS);

}

/**
Expand Down Expand Up @@ -214,7 +215,7 @@ export class PhysicsSystem extends MRSystem {
if (entity.compStyle.visibility == 'hidden' && entity.physics.body.isEnabled()) {
entity.physics.body.setEnabled(false);
} else if (!entity.physics.body.isEnabled()) {
entity.physics.body.setEnabled(false);
entity.physics.body.setEnabled(true);
}

if (entity instanceof MRPanel) {
Expand Down
1 change: 0 additions & 1 deletion src/core/entities/MRTextField.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export class MRTextField extends MRTextEntity {

document.addEventListener('DOMContentLoaded', (event) => {
this.input.setAttribute('value', this.textContent.replace(/(\n)\s+/g, '$1').trim());
console.log('textfield', this.textContent.replace(/(\n)\s+/g, '$1').trim());
});

this.input.style.opacity = 0; // Make it invisible
Expand Down
1 change: 0 additions & 1 deletion src/defaultStyle.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ mr-button {
vertical-align: middle;
background-color: #8a8a8a;
border-radius: 0.5%;
z-index: 1;
/* animation: back 0.25s ease-out forwards; */
}

Expand Down

0 comments on commit 293ce8c

Please sign in to comment.