Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-29 19:23:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Group ShapeType and CompoundShapeURL + add it to Zones

Browse source
This commit is contained in:
Atlante45 2015-04-24 16:52:51 +02:00
parent a26d9ef353
commit 32b78f02b4
3 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
examples/html/entityProperties.html
View file

@ -162,6 +162,7 @@
var elModelSections = document.querySelectorAll(".model-section"); var elModelSections = document.querySelectorAll(".model-section");
var elModelURL = document.getElementById("property-model-url"); var elModelURL = document.getElementById("property-model-url");
var elShapeType = document.getElementById("property-shape-type");
var elCompoundShapeURL = document.getElementById("property-compound-shape-url"); var elCompoundShapeURL = document.getElementById("property-compound-shape-url");
var elModelAnimationURL = document.getElementById("property-model-animation-url"); var elModelAnimationURL = document.getElementById("property-model-animation-url");
var elModelAnimationPlaying = document.getElementById("property-model-animation-playing"); var elModelAnimationPlaying = document.getElementById("property-model-animation-playing");
@ -170,7 +171,6 @@
var elModelAnimationSettings = document.getElementById("property-model-animation-settings"); var elModelAnimationSettings = document.getElementById("property-model-animation-settings");
var elModelTextures = document.getElementById("property-model-textures"); var elModelTextures = document.getElementById("property-model-textures");
var elModelOriginalTextures = document.getElementById("property-model-original-textures"); var elModelOriginalTextures = document.getElementById("property-model-original-textures");
var elModelShapeType = document.getElementById("property-model-shape");
var elTextSections = document.querySelectorAll(".text-section"); var elTextSections = document.querySelectorAll(".text-section");
var elTextText = document.getElementById("property-text-text"); var elTextText = document.getElementById("property-text-text");
@ -323,6 +323,7 @@
} }
elModelURL.value = properties.modelURL; elModelURL.value = properties.modelURL;
elShapeType.value = properties.shapeType;
elCompoundShapeURL.value = properties.compoundShapeURL; elCompoundShapeURL.value = properties.compoundShapeURL;
elModelAnimationURL.value = properties.animationURL; elModelAnimationURL.value = properties.animationURL;
elModelAnimationPlaying.checked = properties.animationIsPlaying; elModelAnimationPlaying.checked = properties.animationIsPlaying;
@ -331,7 +332,6 @@
elModelAnimationSettings.value = properties.animationSettings; elModelAnimationSettings.value = properties.animationSettings;
elModelTextures.value = properties.textures; elModelTextures.value = properties.textures;
elModelOriginalTextures.value = properties.originalTextures; elModelOriginalTextures.value = properties.originalTextures;
elModelShapeType.value = properties.shapeType;
} }
if (properties.type != "Text") { if (properties.type != "Text") {
@ -397,6 +397,8 @@
elZoneStageAltitude.value = properties.stageAltitude.toFixed(2); elZoneStageAltitude.value = properties.stageAltitude.toFixed(2);
elZoneStageDay.value = properties.stageDay; elZoneStageDay.value = properties.stageDay;
elZoneStageHour.value = properties.stageHour; elZoneStageHour.value = properties.stageHour;
elShapeType.value = properties.shapeType;
elCompoundShapeURL.value = properties.compoundShapeURL;
} }
if (selected) { if (selected) {
@ -487,6 +489,7 @@
elLightCutoff.addEventListener('change', createEmitNumberPropertyUpdateFunction('cutoff')); elLightCutoff.addEventListener('change', createEmitNumberPropertyUpdateFunction('cutoff'));
elModelURL.addEventListener('change', createEmitTextPropertyUpdateFunction('modelURL')); elModelURL.addEventListener('change', createEmitTextPropertyUpdateFunction('modelURL'));
elShapeType.addEventListener('change', createEmitTextPropertyUpdateFunction('shapeType'));
elCompoundShapeURL.addEventListener('change', createEmitTextPropertyUpdateFunction('compoundShapeURL')); elCompoundShapeURL.addEventListener('change', createEmitTextPropertyUpdateFunction('compoundShapeURL'));
elModelAnimationURL.addEventListener('change', createEmitTextPropertyUpdateFunction('animationURL')); elModelAnimationURL.addEventListener('change', createEmitTextPropertyUpdateFunction('animationURL'));
elModelAnimationPlaying.addEventListener('change', createEmitCheckedPropertyUpdateFunction('animationIsPlaying')); elModelAnimationPlaying.addEventListener('change', createEmitCheckedPropertyUpdateFunction('animationIsPlaying'));
@ -494,7 +497,6 @@
elModelAnimationFrame.addEventListener('change', createEmitNumberPropertyUpdateFunction('animationFrameIndex')); elModelAnimationFrame.addEventListener('change', createEmitNumberPropertyUpdateFunction('animationFrameIndex'));
elModelAnimationSettings.addEventListener('change', createEmitTextPropertyUpdateFunction('animationSettings')); elModelAnimationSettings.addEventListener('change', createEmitTextPropertyUpdateFunction('animationSettings'));
elModelTextures.addEventListener('change', createEmitTextPropertyUpdateFunction('textures')); elModelTextures.addEventListener('change', createEmitTextPropertyUpdateFunction('textures'));
elModelShapeType.addEventListener('change', createEmitTextPropertyUpdateFunction('shapeType'));
elTextText.addEventListener('change', createEmitTextPropertyUpdateFunction('text')); elTextText.addEventListener('change', createEmitTextPropertyUpdateFunction('text'));
elTextLineHeight.addEventListener('change', createEmitNumberPropertyUpdateFunction('lineHeight')); elTextLineHeight.addEventListener('change', createEmitNumberPropertyUpdateFunction('lineHeight'));
@ -774,7 +776,18 @@
<input type="text" id="property-model-url" class="url"></input> <input type="text" id="property-model-url" class="url"></input>
</div> </div>
</div> </div>
<div class="model-section property"> <div class="model-section zone-section property">
<div class="label">Shape Type</div>
<div class="value">
<select name="SelectShapeType" id="property-shape-type" name="SelectShapeType">
<option value='none'>none</option>
<option value='box'>box</option>
<option value='sphere'>sphere</option>
<option value='compound'>compound</option>
</select>
</div>
</div>
<div class="model-section zone-section property">
<div class="label">Compound Shape URL</div> <div class="label">Compound Shape URL</div>
<div class="value"> <div class="value">
<input type="text" id="property-compound-shape-url" class="url"></input> <input type="text" id="property-compound-shape-url" class="url"></input>
@ -823,18 +836,6 @@
</div> </div>
</div> </div>
<div class="model-section property">
<div class="label">Shape Type</div>
<div class="value">
<select name="SelectShapeType" id="property-model-shape" name="SelectShapeType">
<option value='none'>none</option>
<option value='box'>box</option>
<option value='sphere'>sphere</option>
</select>
</div>
</div>
<div class="text-section property"> <div class="text-section property">
<div class="label">Text</div> <div class="label">Text</div>
<div class="value"> <div class="value">

1
examples/libraries/ToolTip.js
View file

@ -53,6 +53,7 @@ function Tooltip() {
text += "ID: " + properties.id + "\n" text += "ID: " + properties.id + "\n"
if (properties.type == "Model") { if (properties.type == "Model") {
text += "Model URL: " + properties.modelURL + "\n" text += "Model URL: " + properties.modelURL + "\n"
text += "Shape Type: " + properties.shapeType + "\n"
text += "Compound Shape URL: " + properties.compoundShapeURL + "\n" text += "Compound Shape URL: " + properties.compoundShapeURL + "\n"
text += "Animation URL: " + properties.animationURL + "\n" text += "Animation URL: " + properties.animationURL + "\n"
text += "Animation is playing: " + properties.animationIsPlaying + "\n" text += "Animation is playing: " + properties.animationIsPlaying + "\n"

3
examples/libraries/entityPropertyDialogBox.js
View file

@ -52,6 +52,8 @@ EntityPropertyDialogBox = (function () {
if (properties.type == "Model") { if (properties.type == "Model") {
array.push({ label: "Model URL:", value: properties.modelURL }); array.push({ label: "Model URL:", value: properties.modelURL });
index++; index++;
array.push({ label: "Shape Type:", value: properties.shapeType });
index++;
array.push({ label: "Compound Shape URL:", value: properties.compoundShapeURL }); array.push({ label: "Compound Shape URL:", value: properties.compoundShapeURL });
index++; index++;
array.push({ label: "Animation URL:", value: properties.animationURL }); array.push({ label: "Animation URL:", value: properties.animationURL });
@ -284,6 +286,7 @@ EntityPropertyDialogBox = (function () {
properties.locked = array[index++].value; properties.locked = array[index++].value;
if (properties.type == "Model") { if (properties.type == "Model") {
properties.modelURL = array[index++].value; properties.modelURL = array[index++].value;
properties.shapeType = array[index++].value;
properties.compoundShapeURL = array[index++].value; properties.compoundShapeURL = array[index++].value;
properties.animationURL = array[index++].value; properties.animationURL = array[index++].value;