forked from n5ro/aframe-physics-system
-
Notifications
You must be signed in to change notification settings - Fork 12
Avoids HTTPS/HTTP conflicts, and linking to out-of-date documentation. #35
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
<meta http-equiv="content-type" content="text/html; charset=utf-8"> | ||
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1"> | ||
<title>Examples • Compound AMMO</title> | ||
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> | ||
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script> | ||
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script> | ||
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script> | ||
<script src="../../dist/aframe-physics-system.js"></script> | ||
|
@@ -31,10 +31,10 @@ | |
geometry="primitive: circle; radius: 0.01; segments: 4;" | ||
material="color: #FF4444; shader: flat"></a-entity> | ||
</a-entity> | ||
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
hand-controls="hand: left" grab></a-entity> | ||
<a-entity id="right-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
hand-controls="hand: right" grab></a-entity> | ||
hand-controls="hand: right" grab></a-entity> | ||
|
||
<!-- Terrain --> | ||
<a-box width="75" height="0.1" depth="75" ammo-body="type: static" ammo-shape visible="false"></a-box> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
|
||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
<meta http-equiv="content-type" content="text/html; charset=utf-8"> | ||
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1"> | ||
<title>Examples • Constraints • AMMO</title> | ||
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> | ||
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script> | ||
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script> | ||
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script> | ||
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/aframe-blink-controls.min.js"></script> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
<meta http-equiv="content-type" content="text/html; charset=utf-8"> | ||
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1"> | ||
<title>Examples • Materials AMMO</title> | ||
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> | ||
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script> | ||
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script> | ||
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script> | ||
<script src="../../dist/aframe-physics-system.js"></script> | ||
|
@@ -32,10 +32,10 @@ | |
geometry="primitive: circle; radius: 0.01; segments: 4;" | ||
material="color: #FF4444; shader: flat"></a-entity> | ||
</a-entity> | ||
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
hand-controls="hand: left" grab></a-entity> | ||
<a-entity id="right-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
hand-controls="hand: right" grab></a-entity> | ||
hand-controls="hand: right" grab></a-entity> | ||
|
||
<!-- Terrain --> | ||
<a-box width="75" height="0.1" depth="75" ammo-body="type: static; restitution:1" ammo-shape visible="false"></a-box> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
<meta http-equiv="content-type" content="text/html; charset=utf-8"> | ||
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1"> | ||
<title>Examples • Stress Test AMMO</title> | ||
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> | ||
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script> | ||
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script> | ||
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script> | ||
<script src="../../dist/aframe-physics-system.js"></script> | ||
|
@@ -34,10 +34,10 @@ | |
material="color: #FF4444; shader: flat"></a-entity> | ||
</a-entity> | ||
|
||
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
hand-controls="hand: left" grab></a-entity> | ||
<a-entity id="right-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
hand-controls="hand: right" grab></a-entity> | ||
hand-controls="hand: right" grab></a-entity> | ||
|
||
<!-- Terrain --> | ||
<a-box width="75" height="0.1" depth="75" ammo-body="type: static" ammo-shape visible="false"></a-box> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
<meta http-equiv="content-type" content="text/html; charset=utf-8"> | ||
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1"> | ||
<title>Examples • Sweeper AMMO</title> | ||
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> | ||
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script> | ||
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script> | ||
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script> | ||
<script src="../../dist/aframe-physics-system.js"></script> | ||
|
@@ -25,7 +25,7 @@ | |
<a-scene environment | ||
rain-of-entities="components: height|0.2, width|0.2, depth|0.2, ammo-body, ammo-shape, force-pushable, color|#39BB82; spread: 3" | ||
physics="driver:ammo; stats: panel"> | ||
<!-- worker version (sweeper not working): | ||
<!-- worker version (sweeper not working): | ||
physics="driver: worker; workerFps: 60; workerInterpolate: true; workerInterpBufferSize: 2;"--> | ||
<!-- Player --> | ||
<a-entity camera wasd-controls look-controls position="0 0.6 0"> | ||
|
@@ -34,10 +34,10 @@ | |
geometry="primitive: circle; radius: 0.01; segments: 4;" | ||
material="color: #FF4444; shader: flat"></a-entity> | ||
</a-entity> | ||
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
hand-controls="hand: left" grab></a-entity> | ||
<a-entity id="right-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;" | ||
hand-controls="hand: right" grab></a-entity> | ||
hand-controls="hand: right" grab></a-entity> | ||
|
||
<!-- Terrain --> | ||
<a-box width="75" height="0.1" depth="75" ammo-body="type: static" ammo-shape visible="false"></a-box> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
<meta http-equiv="content-type" content="text/html; charset=utf-8"> | ||
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1"> | ||
<title>Examples • Compound CANNON Worker</title> | ||
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> | ||
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script> | ||
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script> | ||
<script src="../../dist/aframe-physics-system.js"></script> | ||
<script src="../components/force-pushable.js"></script> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
<meta http-equiv="content-type" content="text/html; charset=utf-8"> | ||
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1"> | ||
<title>Examples • Constraints CANNON Worker</title> | ||
<script type="text/javascript" src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> | ||
<script type="text/javascript" src="https://aframe.io/releases/1.4.1/aframe.min.js"></script> | ||
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script> | ||
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/aframe-blink-controls.min.js"></script> | ||
<script src="../../dist/aframe-physics-system.js"></script> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
<meta http-equiv="content-type" content="text/html; charset=utf-8"> | ||
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1"> | ||
<title>Examples • Materials CANNON Worker</title> | ||
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> | ||
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script> | ||
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script> | ||
<script src="../../dist/aframe-physics-system.js"></script> | ||
<script src="../components/force-pushable.js"></script> | ||
|
@@ -23,7 +23,7 @@ | |
<a-scene stats="true" | ||
environment | ||
physics="driver: worker; restitution: 1"> | ||
<!-- worker version (force-pushable not working): | ||
<!-- worker version (force-pushable not working): | ||
physics="driver: worker; restitution: 1;">--> | ||
<!-- Player --> | ||
<a-entity camera look-controls wasd-controls position="0 1.6 0"> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.