From 20d3814c1b1e3fda623dbe9dc13011f3c7d41b7e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 2 Jun 2015 10:00:07 -0700 Subject: [PATCH] code review --- examples/edit.js | 17 +++--- examples/html/entityProperties.html | 58 +++++++++---------- examples/voxels.js | 5 +- .../src/RenderablePolyVoxEntityItem.cpp | 10 +--- .../entities/src/EntityItemProperties.cpp | 24 ++++---- libraries/entities/src/EntityItemProperties.h | 2 +- libraries/shared/src/SettingInterface.cpp | 12 ++-- 7 files changed, 60 insertions(+), 68 deletions(-) diff --git a/examples/edit.js b/examples/edit.js index 455b843868..8a8dcb9779 100644 --- a/examples/edit.js +++ b/examples/edit.js @@ -1,4 +1,3 @@ - // newEditEntities.js // examples // @@ -139,7 +138,7 @@ var toolBar = (function () { newTextButton, newWebButton, newZoneButton, - newPolyVoxButton, + newPolyVoxButton, browseMarketplaceButton; function initialize() { @@ -225,7 +224,7 @@ var toolBar = (function () { visible: false }); - newPolyVoxButton = toolBar.addTool({ + newPolyVoxButton = toolBar.addTool({ imageURL: toolIconUrl + "upload.svg", // XXX need a new icon subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, width: toolWidth, @@ -276,7 +275,7 @@ var toolBar = (function () { toolBar.showTool(newTextButton, doShow); toolBar.showTool(newWebButton, doShow); toolBar.showTool(newZoneButton, doShow); - toolBar.showTool(newPolyVoxButton, doShow); + toolBar.showTool(newPolyVoxButton, doShow); }; var RESIZE_INTERVAL = 50; @@ -486,10 +485,10 @@ var toolBar = (function () { placingEntityID = Entities.addEntity({ type: "PolyVox", position: grid.snapToSurface(grid.snapToGrid(position, false, DEFAULT_DIMENSIONS), - DEFAULT_DIMENSIONS), + DEFAULT_DIMENSIONS), dimensions: { x: 10, y: 10, z: 10 }, - voxelVolumeSize: {x:16, y:16, z:16}, - voxelSurfaceStyle: 1 + voxelVolumeSize: {x:16, y:16, z:16}, + voxelSurfaceStyle: 1 }); } else { print("Can't create PolyVox: would be out of bounds."); @@ -949,7 +948,7 @@ function selectAllEtitiesInCurrentSelectionBox(keepIfTouching) { var boundingBoxCorner = Vec3.subtract(selectionManager.worldPosition, Vec3.multiply(selectionManager.worldDimensions, 0.5)); var entities = Entities.findEntitiesInBox(boundingBoxCorner, selectionManager.worldDimensions); - + if (!keepIfTouching) { var isValid; if (selectionManager.localPosition === null) { @@ -1021,7 +1020,7 @@ function handeMenuEvent(menuItem) { } } } else if (menuItem == "Import Entities" || menuItem == "Import Entities from URL") { - + var importURL; if (menuItem == "Import Entities") { importURL = Window.browse("Select models to import", "", "*.json"); diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html index 21e2e83136..d9cad0feff 100644 --- a/examples/html/entityProperties.html +++ b/examples/html/entityProperties.html @@ -21,11 +21,11 @@ els[i].setAttribute('disabled', 'disabled'); } } - + function showElements(els, show) { for (var i = 0; i < els.length; i++) { els[i].style.display = (show) ? 'block' : 'none'; - } + } } function createEmitCheckedPropertyUpdateFunction(propertyName) { @@ -344,7 +344,7 @@ var elZoneAtmosphereCenterY = document.getElementById("property-zone-atmosphere-center-y"); var elZoneAtmosphereCenterZ = document.getElementById("property-zone-atmosphere-center-z"); var elCenterAtmosphereToZone = document.getElementById("center-atmosphere-in-zone"); - + var elZoneAtmosphereInnerRadius = document.getElementById("property-zone-atmosphere-inner-radius"); var elZoneAtmosphereOuterRadius = document.getElementById("property-zone-atmosphere-outer-radius"); var elZoneAtmosphereMieScattering = document.getElementById("property-zone-atmosphere-mie-scattering"); @@ -354,12 +354,12 @@ var elZoneAtmosphereScatteringWavelengthsZ = document.getElementById("property-zone-atmosphere-scattering-wavelengths-z"); var elZoneAtmosphereHasStars = document.getElementById("property-zone-atmosphere-has-stars"); - var elPolyVoxSelections = document.querySelectorAll(".poly-vox-section"); - var elVoxelVolumeSizeX = document.getElementById("property-voxel-volume-size-x"); + var elPolyVoxSelections = document.querySelectorAll(".poly-vox-section"); + var elVoxelVolumeSizeX = document.getElementById("property-voxel-volume-size-x"); var elVoxelVolumeSizeY = document.getElementById("property-voxel-volume-size-y"); var elVoxelVolumeSizeZ = document.getElementById("property-voxel-volume-size-z"); - var elVoxelSurfaceStyle = document.getElementById("property-voxel-surface-style"); - + var elVoxelSurfaceStyle = document.getElementById("property-voxel-surface-style"); + if (window.EventBridge !== undefined) { EventBridge.scriptEventReceived.connect(function(data) { @@ -577,7 +577,7 @@ elZoneAtmosphereScatteringWavelengthsY.value = properties.atmosphere.scatteringWavelengths.y; elZoneAtmosphereScatteringWavelengthsZ.value = properties.atmosphere.scatteringWavelengths.z; elZoneAtmosphereHasStars.checked = properties.atmosphere.hasStars; - + showElements(document.getElementsByClassName('skybox-section'), elZoneBackgroundMode.value == 'skybox'); showElements(document.getElementsByClassName('atmosphere-section'), elZoneBackgroundMode.value == 'atmosphere'); } else if (properties.type == "ParticleEffect") { @@ -595,11 +595,11 @@ elParticleLocalGravity.value = properties.localGravity.toFixed(2); elParticleRadius.value = properties.particleRadius.toFixed(3); } else if (properties.type == "PolyVox") { - elVoxelVolumeSizeX.value = properties.voxelVolumeSize.x.toFixed(2); - elVoxelVolumeSizeY.value = properties.voxelVolumeSize.y.toFixed(2); - elVoxelVolumeSizeZ.value = properties.voxelVolumeSize.z.toFixed(2); - elVoxelSurfaceStyle.value = properties.voxelSurfaceStyle; - } + elVoxelVolumeSizeX.value = properties.voxelVolumeSize.x.toFixed(2); + elVoxelVolumeSizeY.value = properties.voxelVolumeSize.y.toFixed(2); + elVoxelVolumeSizeZ.value = properties.voxelVolumeSize.z.toFixed(2); + elVoxelSurfaceStyle.value = properties.voxelSurfaceStyle; + } if (selected) { activeElement.focus(); @@ -715,7 +715,7 @@ elLightCutoff.addEventListener('change', createEmitNumberPropertyUpdateFunction('cutoff')); elWebSourceURL.addEventListener('change', createEmitTextPropertyUpdateFunction('sourceUrl')); - + elParticleMaxParticles.addEventListener('change', createEmitNumberPropertyUpdateFunction('maxParticles')); elParticleLifeSpan.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifespan')); elParticleEmitRate.addEventListener('change', createEmitNumberPropertyUpdateFunction('emitRate')); @@ -821,7 +821,7 @@ emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'skybox'); } }); - + elZoneSkyboxURL.addEventListener('change', createEmitGroupTextPropertyUpdateFunction('skybox','url')); var zoneAtmosphereCenterChangeFunction = createEmitGroupVec3PropertyUpdateFunction( @@ -829,8 +829,8 @@ elZoneAtmosphereCenterX.addEventListener('change', zoneAtmosphereCenterChangeFunction); elZoneAtmosphereCenterY.addEventListener('change', zoneAtmosphereCenterChangeFunction); elZoneAtmosphereCenterZ.addEventListener('change', zoneAtmosphereCenterChangeFunction); - - + + elZoneAtmosphereInnerRadius.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('atmosphere','innerRadius')); elZoneAtmosphereOuterRadius.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('atmosphere','outerRadius')); elZoneAtmosphereMieScattering.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('atmosphere','mieScattering')); @@ -848,8 +848,8 @@ elVoxelVolumeSizeX.addEventListener('change', voxelVolumeSizeChangeFunction); elVoxelVolumeSizeY.addEventListener('change', voxelVolumeSizeChangeFunction); elVoxelVolumeSizeZ.addEventListener('change', voxelVolumeSizeChangeFunction); - elVoxelSurfaceStyle.addEventListener('change', createEmitTextPropertyUpdateFunction('voxelSurfaceStyle')); - + elVoxelSurfaceStyle.addEventListener('change', createEmitTextPropertyUpdateFunction('voxelSurfaceStyle')); + elMoveSelectionToGrid.addEventListener("click", function() { EventBridge.emitWebEvent(JSON.stringify({ @@ -997,14 +997,14 @@
X
Y
Z
- +
Surface Extractor
-
+
@@ -1143,19 +1143,19 @@ - +
Max Particles
-
+
Particle Life Span
-
+
Particle Emission Rate
@@ -1188,7 +1188,7 @@
- +
Model URL
@@ -1203,7 +1203,7 @@ - +
@@ -1382,7 +1382,7 @@
- +
Stage Day
diff --git a/examples/voxels.js b/examples/voxels.js index fc9f6550f5..799af04bef 100644 --- a/examples/voxels.js +++ b/examples/voxels.js @@ -1,4 +1,3 @@ - var controlHeld = false; var shiftHeld = false; @@ -17,8 +16,8 @@ function mousePressEvent(event) { var id = ids[i]; if (controlHeld) { Entities.setVoxelSphere(id, intersection.intersection, 1.0, 0); - } else if (shiftHeld) { - Entities.setAllVoxels(id, 255); + } else if (shiftHeld) { + Entities.setAllVoxels(id, 255); } else { Entities.setVoxelSphere(id, intersection.intersection, 1.0, 255); } diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp index 6f2fe42502..83612f3fce 100644 --- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp @@ -78,11 +78,7 @@ bool inUserBounds(const PolyVox::SimpleVolume* vol, PolyVoxEntityItem:: bool inBounds(const PolyVox::SimpleVolume* vol, int x, int y, int z) { // x, y, z are in polyvox volume coords - if (x < 0 || y < 0 || z < 0 || - x >= vol->getWidth() || y >= vol->getHeight() || z >= vol->getDepth()) { - return false; - } - return true; + return !(x < 0 || y < 0 || z < 0 || x >= vol->getWidth() || y >= vol->getHeight() || z >= vol->getDepth()); } @@ -183,7 +179,7 @@ glm::vec3 RenderablePolyVoxEntityItem::getSurfacePositionAdjustment() const { case PolyVoxEntityItem::SURFACE_CUBIC: return scale / 2.0f; } - return glm::vec3(0, 0, 0); + return glm::vec3(0.0f, 0.0f, 0.0f); } glm::mat4 RenderablePolyVoxEntityItem::voxelToLocalMatrix() const { @@ -191,7 +187,7 @@ glm::mat4 RenderablePolyVoxEntityItem::voxelToLocalMatrix() const { glm::vec3 center = getCenter(); glm::vec3 position = getPosition(); glm::vec3 positionToCenter = center - position; - positionToCenter -= _dimensions * glm::vec3(0.5f,0.5f,0.5f) - getSurfacePositionAdjustment(); + positionToCenter -= _dimensions * glm::vec3(0.5f, 0.5f, 0.5f) - getSurfacePositionAdjustment(); glm::mat4 centerToCorner = glm::translate(glm::mat4(), positionToCenter); glm::mat4 scaled = glm::scale(centerToCorner, scale); return scaled; diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index eeb3bb3474..698530ef86 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -176,10 +176,8 @@ QString EntityItemProperties::getAnimationSettings() const { return jsonByteString; } - -void EntityItemProperties::setCreated(QDateTime v) { - QDateTime utcV = v; - _created = utcV.toMSecsSinceEpoch() * 1000; // usec per msec +void EntityItemProperties::setCreated(QDateTime &v) { + _created = v.toMSecsSinceEpoch() * 1000; // usec per msec qDebug() << "EntityItemProperties::setCreated QDateTime" << v << _created; } @@ -494,12 +492,6 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool COPY_PROPERTY_FROM_QSCRIPTVALUE(restitution, float, setRestitution); COPY_PROPERTY_FROM_QSCRIPTVALUE(friction, float, setFriction); COPY_PROPERTY_FROM_QSCRIPTVALUE(lifetime, float, setLifetime); - if (!honorReadOnly) { - COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(created, QDateTime, setCreated, [this]() { - auto result = QDateTime::fromMSecsSinceEpoch(_created / 1000, Qt::UTC); // usec per msec - return result; - }); - } COPY_PROPERTY_FROM_QSCRIPTVALUE(script, QString, setScript); COPY_PROPERTY_FROM_QSCRIPTVALUE(registrationPoint, glmVec3, setRegistrationPoint); COPY_PROPERTY_FROM_QSCRIPTVALUE(angularVelocity, glmVec3, setAngularVelocity); @@ -524,9 +516,6 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool COPY_PROPERTY_FROM_QSCRIPTVALUE(locked, bool, setLocked); COPY_PROPERTY_FROM_QSCRIPTVALUE(textures, QString, setTextures); COPY_PROPERTY_FROM_QSCRIPTVALUE(userData, QString, setUserData); - if (!honorReadOnly) { - COPY_PROPERTY_FROM_QSCRIPTVALUE(simulatorID, QUuid, setSimulatorID); - } COPY_PROPERTY_FROM_QSCRIPTVALUE(text, QString, setText); COPY_PROPERTY_FROM_QSCRIPTVALUE(lineHeight, float, setLineHeight); COPY_PROPERTY_FROM_QSCRIPTVALUE(textColor, xColor, setTextColor); @@ -554,6 +543,15 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool COPY_PROPERTY_FROM_QSCRIPTVALUE(voxelData, QByteArray, setVoxelData); COPY_PROPERTY_FROM_QSCRIPTVALUE(voxelSurfaceStyle, uint16_t, setVoxelSurfaceStyle); + if (!honorReadOnly) { + // this is used by the json reader to set things that we don't want javascript to able to affect. + COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(created, QDateTime, setCreated, [this]() { + auto result = QDateTime::fromMSecsSinceEpoch(_created / 1000, Qt::UTC); // usec per msec + return result; + }); + COPY_PROPERTY_FROM_QSCRIPTVALUE(simulatorID, QUuid, setSimulatorID); + } + _stage.copyFromScriptValue(object, _defaultSettings); _atmosphere.copyFromScriptValue(object, _defaultSettings); _skybox.copyFromScriptValue(object, _defaultSettings); diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index c6a0b21313..07879b5a6c 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -194,7 +194,7 @@ public: void setVoxelDataDirty() { _voxelDataChanged = true; } - void setCreated(QDateTime v); + void setCreated(QDateTime& v); bool hasTerseUpdateChanges() const; diff --git a/libraries/shared/src/SettingInterface.cpp b/libraries/shared/src/SettingInterface.cpp index 26cbe3ca13..ee72a4ab45 100644 --- a/libraries/shared/src/SettingInterface.cpp +++ b/libraries/shared/src/SettingInterface.cpp @@ -39,12 +39,12 @@ namespace Setting { void init() { // read the ApplicationInfo.ini file for Name/Version/Domain information QSettings::setDefaultFormat(QSettings::IniFormat); - QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat); - // set the associated application properties - applicationInfo.beginGroup("INFO"); - QCoreApplication::setApplicationName(applicationInfo.value("name").toString()); - QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString()); - QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString()); + // QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat); + // // set the associated application properties + // applicationInfo.beginGroup("INFO"); + // QCoreApplication::setApplicationName(applicationInfo.value("name").toString()); + // QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString()); + // QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString()); // Let's set up the settings Private instance on it's own thread QThread* thread = new QThread();