Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 22:17:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

making collidesWith a checkbox

Browse source
This commit is contained in:
ericrius1 2016-02-16 18:19:12 -08:00
parent 7a3443968d
commit 168fb67d67
1 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
examples/html/entityProperties.html
View file

@ -264,7 +264,6 @@
var elCollisionless = document.getElementById("property-collisionless"); var elCollisionless = document.getElementById("property-collisionless");
var elDynamic = document.getElementById("property-dynamic" ); var elDynamic = document.getElementById("property-dynamic" );
var elCollisionSoundURL = document.getElementById("property-collision-sound-url"); var elCollisionSoundURL = document.getElementById("property-collision-sound-url");
var elCollidesWith = document.getElementById("property-collides-with");
var elLifetime = document.getElementById("property-lifetime"); var elLifetime = document.getElementById("property-lifetime");
var elScriptURL = document.getElementById("property-script-url"); var elScriptURL = document.getElementById("property-script-url");
var elScriptTimestamp = document.getElementById("property-script-timestamp"); var elScriptTimestamp = document.getElementById("property-script-timestamp");
@ -483,7 +482,6 @@
elCollisionless.checked = properties.collisionless; elCollisionless.checked = properties.collisionless;
elDynamic.checked = properties.dynamic; elDynamic.checked = properties.dynamic;
elCollisionSoundURL.value = properties.collisionSoundURL; elCollisionSoundURL.value = properties.collisionSoundURL;
elCollidesWith.value = properties.collidesWith;
elLifetime.value = properties.lifetime; elLifetime.value = properties.lifetime;
elScriptURL.value = properties.script; elScriptURL.value = properties.script;
elScriptTimestamp.value = properties.scriptTimestamp; elScriptTimestamp.value = properties.scriptTimestamp;
@ -705,7 +703,6 @@
elCollisionless.addEventListener('change', createEmitCheckedPropertyUpdateFunction('collisionless')); elCollisionless.addEventListener('change', createEmitCheckedPropertyUpdateFunction('collisionless'));
elDynamic.addEventListener('change', createEmitCheckedPropertyUpdateFunction('dynamic')); elDynamic.addEventListener('change', createEmitCheckedPropertyUpdateFunction('dynamic'));
elCollisionSoundURL.addEventListener('change', createEmitTextPropertyUpdateFunction('collisionSoundURL')); elCollisionSoundURL.addEventListener('change', createEmitTextPropertyUpdateFunction('collisionSoundURL'));
elCollidesWith.addEventListener('change', createEmitTextPropertyUpdateFunction('collidesWith'));
elLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifetime')); elLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifetime'));
elScriptURL.addEventListener('change', createEmitTextPropertyUpdateFunction('script')); elScriptURL.addEventListener('change', createEmitTextPropertyUpdateFunction('script'));
@ -1389,12 +1386,48 @@
</span> </span>
</div> </div>
<div class="property"> <div>
<div class="label">collidesWith</div> <div> collidesWith </div>
<div class="value">
<input id="property-collides-with"> <div class="property">
<span class="label">Static</span>
<span class="value">
<input type='checkbox' id="property-collide-static">
</span>
</div> </div>
</div>
<div class="property">
<span class="label">dynamic</span>
<span class="value">
<input type='checkbox' id="property-collide-dynamic">
</span>
</div>
<div class="property">
<span class="label">kinematic</span>
<span class="value">
<input type='checkbox' id="property-collide-kinematic">
</span>
</div>
<div class="property">
<span class="label">myAvatar</span>
<span class="value">
<input type='checkbox' id="property-collide-myAvatar">
</span>
</div>
<div class="property">
<span class="label">otherAvatar</span>
<span class="value">
<input type='checkbox' id="property-collide-otherAvatar">
</span>
</div>
</div>
<div class="property"> <div class="property">
<div class="label">Collision Sound URL</div> <div class="label">Collision Sound URL</div>