From 75f6ad3b9927db9688ec5bcbfa9f0af551c6df88 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Wed, 29 Apr 2015 00:43:18 -0700 Subject: [PATCH 01/27] Working on menus look --- interface/resources/qml/VrMenu.qml | 21 ++++++++++++--------- tests/ui/src/main.cpp | 17 ++++++----------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/interface/resources/qml/VrMenu.qml b/interface/resources/qml/VrMenu.qml index d81d79aa0b..87629e06aa 100644 --- a/interface/resources/qml/VrMenu.qml +++ b/interface/resources/qml/VrMenu.qml @@ -121,6 +121,9 @@ Hifi.VrMenu { property var root property var listView property var border + + + implicitHeight: row.implicitHeight + 4 implicitWidth: row.implicitWidth + label.height // FIXME uncommenting this line results in menus that have blank spots @@ -137,8 +140,7 @@ Hifi.VrMenu { FontAwesome { id: check verticalAlignment: Text.AlignVCenter - y: 2 - size: label.height + size: row.height text: checkText() color: label.color function checkText() { @@ -156,7 +158,10 @@ Hifi.VrMenu { } Text { id: label +// anchors.top: parent.top +// anchors.bottom: parent.bottom text: typedText() + verticalAlignment: Text.AlignVCenter color: source.enabled ? hifi.colors.text : hifi.colors.disabledText enabled: source.enabled && source.visible function typedText() { @@ -189,13 +194,11 @@ Hifi.VrMenu { } MouseArea { - anchors { - top: parent.top - bottom: parent.bottom - left: parent.left - right: tag.right - rightMargin: -4 - } + anchors.top: parent.top + anchors.bottom: parent.bottom + anchors.right: tag.right + anchors.left: parent.left + anchors.rightMargin: -4 acceptedButtons: Qt.LeftButton hoverEnabled: true Rectangle { diff --git a/tests/ui/src/main.cpp b/tests/ui/src/main.cpp index a5bc50b288..7c4d998e47 100644 --- a/tests/ui/src/main.cpp +++ b/tests/ui/src/main.cpp @@ -36,6 +36,7 @@ #include "MessageDialog.h" #include "VrMenu.h" +#include class RateCounter { std::vector times; @@ -339,8 +340,10 @@ public: makeCurrent(); offscreenUi->setProxyWindow(this); - setFramePosition(QPoint(-1000, 0)); - resize(QSize(800, 600)); + QDesktopWidget* desktop = QApplication::desktop(); + setGeometry(desktop->availableGeometry(desktop->screenCount()-1)); +// setFramePosition(QPoint(-1000, 0)); +// resize(QSize(800, 600)); #ifdef QML_CONTROL_GALLERY offscreenUi->setBaseUrl(QUrl::fromLocalFile(getTestQmlDir())); @@ -474,16 +477,8 @@ hifi.offscreen.focus.debug=false qt.quick.mouse.debug=false )V0G0N"; -//int main(int argc, char *argv[]) { -// QGuiApplication app(argc, argv); -// QQmlApplicationEngine engine; -// engine.setBaseUrl(QUrl::fromLocalFile(getQmlDir())); -// engine.load(QUrl("Main.qml")); -// return app.exec(); -//} - int main(int argc, char** argv) { - QGuiApplication app(argc, argv); + QApplication app(argc, argv); QLoggingCategory::setFilterRules(LOG_FILTER_RULES); QTestWindow window; app.exec(); From 87ef98005d7f5297049225bc377eb2505b58a897 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 29 Apr 2015 02:42:57 -0700 Subject: [PATCH 02/27] menu polish --- interface/resources/qml/TestMenu.qml | 4 + interface/resources/qml/VrMenu.qml | 167 ++----------------------- interface/resources/qml/VrMenuItem.qml | 130 +++++++++++++++++++ tests/ui/src/main.cpp | 6 +- 4 files changed, 152 insertions(+), 155 deletions(-) create mode 100644 interface/resources/qml/VrMenuItem.qml diff --git a/interface/resources/qml/TestMenu.qml b/interface/resources/qml/TestMenu.qml index 5aff18b421..4d109e6298 100644 --- a/interface/resources/qml/TestMenu.qml +++ b/interface/resources/qml/TestMenu.qml @@ -107,6 +107,10 @@ Item { } MenuItem { action: animations } } + Menu { + title: "Long menu name top menu" + MenuItem { action: aboutApp } + } Menu { title: "Help" MenuItem { action: aboutApp } diff --git a/interface/resources/qml/VrMenu.qml b/interface/resources/qml/VrMenu.qml index 87629e06aa..f0b7bf9fd3 100644 --- a/interface/resources/qml/VrMenu.qml +++ b/interface/resources/qml/VrMenu.qml @@ -5,6 +5,7 @@ import QtQuick.Controls.Styles 1.3 import "controls" import "styles" + Hifi.VrMenu { id: root HifiConstants { id: hifi } @@ -12,15 +13,14 @@ Hifi.VrMenu { anchors.fill: parent objectName: "VrMenu" - enabled: false opacity: 0.0 + z: 10000 property int animationDuration: 200 property var models: [] property var columns: [] - z: 10000 onEnabledChanged: { if (enabled && columns.length == 0) { @@ -51,20 +51,22 @@ Hifi.VrMenu { property var menuBuilder: Component { Border { HifiConstants { id: hifi } + property int menuDepth + Component.onCompleted: { menuDepth = root.models.length - 1 if (menuDepth == 0) { x = lastMousePosition.x - 20 y = lastMousePosition.y - 20 } else { - var lastColumn = root.columns[menuDepth - 1] + var lastColumn = root.columns[menuDepth - 1] x = lastColumn.x + 64; y = lastMousePosition.y - height / 2; } } + border.color: hifi.colors.hifiBlue color: hifi.colors.window - property int menuDepth implicitHeight: listView.implicitHeight + 16 implicitWidth: listView.implicitWidth + 16 @@ -84,170 +86,27 @@ Hifi.VrMenu { model: root.models[menuDepth] delegate: Loader { id: loader - sourceComponent: root.itemBuilder + source: "VrMenuItem.qml" Binding { target: loader.item - property: "root" + property: "menuContainer" value: root when: loader.status == Loader.Ready - } + } Binding { target: loader.item property: "source" value: modelData when: loader.status == Loader.Ready - } - Binding { - target: loader.item - property: "border" - value: listView.parent - when: loader.status == Loader.Ready - } + } Binding { target: loader.item property: "listView" value: listView when: loader.status == Loader.Ready - } - } - } - } - } - } - - property var itemBuilder: Component { - Item { - property var source - property var root - property var listView - property var border - - - - implicitHeight: row.implicitHeight + 4 - implicitWidth: row.implicitWidth + label.height - // FIXME uncommenting this line results in menus that have blank spots - // rather than having the correct size - // visible: source.visible - Row { - id: row - spacing: 2 - anchors { - top: parent.top - topMargin: 2 - } - Spacer { size: 4 } - FontAwesome { - id: check - verticalAlignment: Text.AlignVCenter - size: row.height - text: checkText() - color: label.color - function checkText() { - if (!source || source.type != 1 || !source.checkable) { - return ""; } - - // FIXME this works for native QML menus but I don't think it will - // for proxied QML menus - if (source.exclusiveGroup) { - return source.checked ? "\uF05D" : "\uF10C" - } - return source.checked ? "\uF046" : "\uF096" } } - Text { - id: label -// anchors.top: parent.top -// anchors.bottom: parent.bottom - text: typedText() - verticalAlignment: Text.AlignVCenter - color: source.enabled ? hifi.colors.text : hifi.colors.disabledText - enabled: source.enabled && source.visible - function typedText() { - if (source) { - switch(source.type) { - case 2: - return source.title; - case 1: - return source.text; - case 0: - return "-----" - } - } - return "" - } - } - } // row - - FontAwesome { - anchors { - top: row.top - } - id: tag - size: label.height - width: implicitWidth - visible: source.type == 2 - x: listView.width - width - 4 - text: "\uF0DA" - color: label.color - } - - MouseArea { - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.right: tag.right - anchors.left: parent.left - anchors.rightMargin: -4 - acceptedButtons: Qt.LeftButton - hoverEnabled: true - Rectangle { - id: highlight - visible: false - anchors.fill: parent - color: "#7f0e7077" - } - Timer { - id: timer - interval: 1000 - onTriggered: parent.select(); - } - onEntered: { - /* - * Uncomment below to have menus auto-popup - * - * FIXME if we enabled timer based menu popup, either the timer has - * to be very very short or after auto popup there has to be a small - * amount of time, or a test if the mouse has moved before a click - * will be accepted, otherwise it's too easy to accidently click on - * something immediately after the auto-popup appears underneath your - * cursor - * - */ - //if (source.type == 2 && enabled) { - // timer.start() - //} - highlight.visible = source.enabled - } - onExited: { - timer.stop() - highlight.visible = false - } - onClicked: { - select(); - } - function select() { - //timer.stop(); - var popped = false; - while (columns.length - 1 > listView.parent.menuDepth) { - popColumn(); - popped = true; - } - - if (!popped || source.type != 1) { - parent.root.selectItem(parent.source); - } - } } } } @@ -262,7 +121,7 @@ Hifi.VrMenu { var oldColumn = lastColumn(); //oldColumn.enabled = false } - var newColumn = menuBuilder.createObject(root); + var newColumn = menuBuilder.createObject(root); columns.push(newColumn); newColumn.forceActiveFocus(); } @@ -295,11 +154,11 @@ Hifi.VrMenu { source.trigger() enabled = false break; - case 0: + case 0: break; } } - + function reset() { while (columns.length > 0) { popColumn(); diff --git a/interface/resources/qml/VrMenuItem.qml b/interface/resources/qml/VrMenuItem.qml new file mode 100644 index 0000000000..a7c5674de8 --- /dev/null +++ b/interface/resources/qml/VrMenuItem.qml @@ -0,0 +1,130 @@ +import QtQuick 2.4 +import QtQuick.Controls 1.3 +import QtQuick.Controls.Styles 1.3 +import "controls" +import "styles" + +Item { + id: root + HifiConstants { + id: hifi + } + + property var source + property var menuContainer + property var listView + + MouseArea { + anchors.left: parent.left + anchors.right: tag.right + anchors.rightMargin: -4 + anchors.top: parent.top + anchors.bottom: parent.bottom + acceptedButtons: Qt.LeftButton + hoverEnabled: true + + Rectangle { + id: highlight + visible: false + anchors.fill: parent + color: "#7f0e7077" + } + + onEntered: { + //if (source.type == 2 && enabled) { + // timer.start() + //} + highlight.visible = source.enabled + } + + onExited: { + timer.stop() + highlight.visible = false + } + + onClicked: { + select() + } + } + + implicitHeight: label.implicitHeight + 4 + implicitWidth: label.implicitWidth + label.height * 2 + + Timer { + id: timer + interval: 1000 + onTriggered: parent.select() + } + + + FontAwesome { + clip: true + id: check + verticalAlignment: Text.AlignBottom + horizontalAlignment: Text.AlignHCenter + anchors.verticalCenter: parent.verticalCenter + color: label.color + text: checkText() + size: label.height + font.pixelSize: size - 4 + function checkText() { + if (!source || source.type != 1 || !source.checkable) { + return "" + } + // FIXME this works for native QML menus but I don't think it will + // for proxied QML menus + if (source.exclusiveGroup) { + return source.checked ? "\uF05D" : "\uF10C" + } + return source.checked ? "\uF046" : "\uF096" + } + } + + Text { + id: label + text: typedText() + anchors.left: check.right + anchors.leftMargin: 4 + anchors.verticalCenter: parent.verticalCenter + verticalAlignment: Text.AlignVCenter + color: source.enabled ? hifi.colors.text : hifi.colors.disabledText + enabled: source.enabled && source.visible + function typedText() { + if (source) { + switch (source.type) { + case 2: + return source.title + case 1: + return source.text + case 0: + return "-----" + } + } + return "" + } + } + + FontAwesome { + id: tag + x: listView.width - width - 4 + size: label.height + width: implicitWidth + visible: source.type == 2 + text: "\uF0DA" + anchors.verticalCenter: parent.verticalCenter + color: label.color + } + + function select() { + //timer.stop(); + var popped = false + while (columns.length - 1 > listView.parent.menuDepth) { + popColumn() + popped = true + } + + if (!popped || source.type != 1) { + root.menuContainer.selectItem(source) + } + } +} diff --git a/tests/ui/src/main.cpp b/tests/ui/src/main.cpp index 7c4d998e47..5077595831 100644 --- a/tests/ui/src/main.cpp +++ b/tests/ui/src/main.cpp @@ -341,7 +341,11 @@ public: offscreenUi->setProxyWindow(this); QDesktopWidget* desktop = QApplication::desktop(); - setGeometry(desktop->availableGeometry(desktop->screenCount()-1)); + QRect rect = desktop->availableGeometry(desktop->screenCount() - 1); + int height = rect.height(); + //rect.setHeight(height / 2); + rect.setY(rect.y() + height / 2); + setGeometry(rect); // setFramePosition(QPoint(-1000, 0)); // resize(QSize(800, 600)); From 475c399d22b7bb994d9d5675dce62be5818b175f Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Wed, 29 Apr 2015 02:54:47 -0700 Subject: [PATCH 03/27] Menu polish on OSX --- interface/resources/qml/VrMenuItem.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/VrMenuItem.qml b/interface/resources/qml/VrMenuItem.qml index a7c5674de8..7a351cec85 100644 --- a/interface/resources/qml/VrMenuItem.qml +++ b/interface/resources/qml/VrMenuItem.qml @@ -47,8 +47,8 @@ Item { } } - implicitHeight: label.implicitHeight + 4 - implicitWidth: label.implicitWidth + label.height * 2 + implicitHeight: label.implicitHeight * 1.5 + implicitWidth: label.implicitWidth + label.height * 2.5 Timer { id: timer @@ -60,13 +60,13 @@ Item { FontAwesome { clip: true id: check - verticalAlignment: Text.AlignBottom + verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter anchors.verticalCenter: parent.verticalCenter color: label.color text: checkText() size: label.height - font.pixelSize: size - 4 + font.pixelSize: size function checkText() { if (!source || source.type != 1 || !source.checkable) { return "" From 1e2106e8313d7a629817ffff33858113cd8aa4d5 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 1 May 2015 10:36:03 -0700 Subject: [PATCH 04/27] Whitespace removal --- interface/src/devices/OculusManager.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp index 7d719873f4..03369ab0e0 100644 --- a/interface/src/devices/OculusManager.cpp +++ b/interface/src/devices/OculusManager.cpp @@ -795,7 +795,6 @@ void OculusManager::getEulerAngles(float& yaw, float& pitch, float& roll) { glm::vec3 OculusManager::getRelativePosition() { ovrTrackingState trackingState = ovrHmd_GetTrackingState(_ovrHmd, ovr_GetTimeInSeconds()); ovrVector3f headPosition = trackingState.HeadPose.ThePose.Position; - return glm::vec3(headPosition.x, headPosition.y, headPosition.z); } From 2128b7499ecd95bb46fc87f0cf09ee7dd9942524 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 1 May 2015 12:10:12 -0700 Subject: [PATCH 05/27] first cut at adding atmosphere properties to zones --- .../entities/src/AtmospherePropertyGroup.cpp | 97 +++++++++++++++++++ .../entities/src/AtmospherePropertyGroup.h | 94 ++++++++++++++++++ libraries/entities/src/EntityItemProperties.h | 28 ++++-- libraries/entities/src/PropertyGroup.h | 88 +++++++++++++++++ libraries/entities/src/ZoneEntityItem.cpp | 17 ++++ libraries/entities/src/ZoneEntityItem.h | 3 + 6 files changed, 318 insertions(+), 9 deletions(-) create mode 100644 libraries/entities/src/AtmospherePropertyGroup.cpp create mode 100644 libraries/entities/src/AtmospherePropertyGroup.h create mode 100644 libraries/entities/src/PropertyGroup.h diff --git a/libraries/entities/src/AtmospherePropertyGroup.cpp b/libraries/entities/src/AtmospherePropertyGroup.cpp new file mode 100644 index 0000000000..e35d4a6870 --- /dev/null +++ b/libraries/entities/src/AtmospherePropertyGroup.cpp @@ -0,0 +1,97 @@ +// +// AtmospherePropertyGroup.cpp +// libraries/entities/src +// +// Created by Brad Hefta-Gaub on 12/4/13. +// Copyright 2013 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#include "AtmospherePropertyGroup.h" + +QScriptValue AtmospherePropertyGroup::copyToScriptValue(QScriptEngine* engine, bool skipDefaults) const { + QScriptValue result; + return result; +} + +void AtmospherePropertyGroup::copyFromScriptValue(const QScriptValue& object) { +} + +void AtmospherePropertyGroup::debugDump() const { + /* + qCDebug(entities) << " AtmospherePropertyGroup: ---------------------------------------------"; + qCDebug(entities) << " Atmosphere Center:" << getAtmosphereCenter(); + qCDebug(entities) << " Atmosphere Inner Radius:" << getAtmosphereInnerRadius(); + qCDebug(entities) << " Atmosphere Outer Radius:" << getAtmosphereOuterRadius(); + qCDebug(entities) << " ... more ..."; + */ +} + +bool AtmospherePropertyGroup::appentToEditPacket(unsigned char* bufferOut, int sizeIn, int& sizeOut) { + return true; +} + +bool AtmospherePropertyGroup::decodeFromEditPacket(const unsigned char* data, int bytesToRead, int& processedBytes) { + return true; +} + +void AtmospherePropertyGroup::markAllChanged() { +} + +void AtmospherePropertyGroup::getProperties(EntityItemProperties& propertiesOut) const { +} + +bool AtmospherePropertyGroup::setProperties(const EntityItemProperties& properties) { + return true; +} + +EntityPropertyFlags AtmospherePropertyGroup::getEntityProperties(EncodeBitstreamParams& params) const { + EntityPropertyFlags requestedProperties; + + requestedProperties += PROP_ATMOSPHERE_CENTER; + requestedProperties += PROP_ATMOSPHERE_INNER_RADIUS; + requestedProperties += PROP_ATMOSPHERE_OUTER_RADIUS; + requestedProperties += PROP_ATMOSPHERE_MIE_SCATTERING; + requestedProperties += PROP_ATMOSPHERE_RAYLEIGH_SCATTERING; + requestedProperties += PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS; + + return requestedProperties; + +} + +void AtmospherePropertyGroup::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, + EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData, + EntityPropertyFlags& requestedProperties, + EntityPropertyFlags& propertyFlags, + EntityPropertyFlags& propertiesDidntFit, + int& propertyCount, + OctreeElement::AppendState& appendState) const { + + bool successPropertyFits = true; + + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_CENTER, appendValue, getAtmosphereCenter()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, appendValue, getAtmosphereInnerRadius()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, appendValue, getAtmosphereOuterRadius()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, appendValue, getAtmosphereMieScattering()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, appendValue, getAtmosphereRayleighScattering()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, appendValue, getAtmosphereScatteringWavelengths()); +} + +int AtmospherePropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, + ReadBitstreamToTreeParams& args, + EntityPropertyFlags& propertyFlags, bool overwriteLocalData) { + + int bytesRead = 0; + const unsigned char* dataAt = data; + + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_CENTER, glm::vec3, _atmosphereCenter); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, float, _atmosphereInnerRadius); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, float, _atmosphereOuterRadius); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, float, _atmosphereMieScattering); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, float, _atmosphereRayleighScattering); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, glm::vec3, _atmosphereScatteringWavelengths); + + return bytesRead; +} diff --git a/libraries/entities/src/AtmospherePropertyGroup.h b/libraries/entities/src/AtmospherePropertyGroup.h new file mode 100644 index 0000000000..bef73992c3 --- /dev/null +++ b/libraries/entities/src/AtmospherePropertyGroup.h @@ -0,0 +1,94 @@ +// +// AtmospherePropertyGroup.h +// libraries/entities/src +// +// Created by Brad Hefta-Gaub on 12/4/13. +// Copyright 2013 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#ifndef hifi_AtmospherePropertyGroup_h +#define hifi_AtmospherePropertyGroup_h + +#include + +#include "EntityItemProperties.h" + +#include "PropertyGroup.h" + +class EntityItemProperties; +class EncodeBitstreamParams; +class OctreePacketData; +class EntityTreeElementExtraEncodeData; +class ReadBitstreamToTreeParams; + +/* +#include + +#include +#include + +#include +#include +#include + +#include +#include // for SittingPoint +#include +#include +#include + +#include "EntityItemID.h" +#include "AtmospherePropertyGroupMacros.h" +#include "EntityTypes.h" +*/ + + +class AtmospherePropertyGroup : public PropertyGroup { +public: + AtmospherePropertyGroup() {} + virtual ~AtmospherePropertyGroup() {} + + // EntityItemProperty related helpers + virtual QScriptValue copyToScriptValue(QScriptEngine* engine, bool skipDefaults) const; + virtual void copyFromScriptValue(const QScriptValue& object); + virtual void debugDump() const; + + virtual bool appentToEditPacket(unsigned char* bufferOut, int sizeIn, int& sizeOut); + virtual bool decodeFromEditPacket(const unsigned char* data, int bytesToRead, int& processedBytes); + virtual void markAllChanged(); + + // EntityItem related helpers + // methods for getting/setting all properties of an entity + virtual void getProperties(EntityItemProperties& propertiesOut) const; + + /// returns true if something changed + virtual bool setProperties(const EntityItemProperties& properties); + + virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const; + + virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, + EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData, + EntityPropertyFlags& requestedProperties, + EntityPropertyFlags& propertyFlags, + EntityPropertyFlags& propertiesDidntFit, + int& propertyCount, + OctreeElement::AppendState& appendState) const; + + virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, + ReadBitstreamToTreeParams& args, + EntityPropertyFlags& propertyFlags, bool overwriteLocalData); + + + DEFINE_PROPERTY_REF(PROP_ATMOSPHERE_CENTER, AtmosphereCenter, atmosphereCenter, glm::vec3); + DEFINE_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, AtmosphereInnerRadius, atmosphereInnerRadius, float); + DEFINE_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, AtmosphereOuterRadius, atmosphereOuterRadius, float); + DEFINE_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, AtmosphereMieScattering, atmosphereMieScattering, float); + DEFINE_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, AtmosphereRayleighScattering, atmosphereRayleighScattering, float); + DEFINE_PROPERTY_REF(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, AtmosphereScatteringWavelengths, atmosphereScatteringWavelengths, glm::vec3); + +}; + +#endif // hifi_AtmospherePropertyGroup_h diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 9a1c8ad5a6..573642dcfa 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -51,6 +51,8 @@ enum EntityPropertyList { // these properties are supported by some derived classes PROP_COLOR, + + // these are used by models only PROP_MODEL_URL, PROP_ANIMATION_URL, PROP_ANIMATION_FPS, @@ -78,11 +80,10 @@ enum EntityPropertyList { // available to all entities PROP_LOCKED, - // used by Model entities - PROP_TEXTURES, - PROP_ANIMATION_SETTINGS, - PROP_USER_DATA, - PROP_SHAPE_TYPE, + PROP_TEXTURES, // used by Model entities + PROP_ANIMATION_SETTINGS, // used by Model entities + PROP_USER_DATA, // all entities + PROP_SHAPE_TYPE, // used by Model + zones entities // used by ParticleEffect entities PROP_MAX_PARTICLES, @@ -93,10 +94,10 @@ enum EntityPropertyList { PROP_LOCAL_GRAVITY, PROP_PARTICLE_RADIUS, - PROP_COMPOUND_SHAPE_URL, - PROP_MARKETPLACE_ID, - PROP_ACCELERATION, - PROP_SIMULATOR_ID, + PROP_COMPOUND_SHAPE_URL, // used by Model + zones entities + PROP_MARKETPLACE_ID, // all entities + PROP_ACCELERATION, // all entities + PROP_SIMULATOR_ID, // all entities //////////////////////////////////////////////////////////////////////////////////////////////////// // ATTENTION: add new properties ABOVE this line @@ -127,6 +128,15 @@ enum EntityPropertyList { PROP_STAGE_ALTITUDE = PROP_SPECULAR_COLOR_UNUSED, PROP_STAGE_DAY = PROP_LINEAR_ATTENUATION_UNUSED, PROP_STAGE_HOUR = PROP_QUADRATIC_ATTENUATION_UNUSED, + PROP_ATMOSPHERE_CENTER = PROP_MAX_PARTICLES, + PROP_ATMOSPHERE_INNER_RADIUS = PROP_LIFESPAN, + PROP_ATMOSPHERE_OUTER_RADIUS = PROP_EMIT_RATE, + PROP_ATMOSPHERE_MIE_SCATTERING = PROP_EMIT_DIRECTION, + PROP_ATMOSPHERE_RAYLEIGH_SCATTERING = PROP_EMIT_STRENGTH, + PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS = PROP_LOCAL_GRAVITY, + PROP_SKYBOX_MODE = PROP_PARTICLE_RADIUS, + // SunBrightness - same as KeyLight Intensity? + // SunLocation (or direction) - same as KeyLight // WARNING!!! DO NOT ADD PROPS_xxx here unless you really really meant to.... Add them UP above }; diff --git a/libraries/entities/src/PropertyGroup.h b/libraries/entities/src/PropertyGroup.h new file mode 100644 index 0000000000..31504f2c11 --- /dev/null +++ b/libraries/entities/src/PropertyGroup.h @@ -0,0 +1,88 @@ +// +// PropertyGroup.h +// libraries/entities/src +// +// Created by Brad Hefta-Gaub on 12/4/13. +// Copyright 2013 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#ifndef hifi_PropertyGroup_h +#define hifi_PropertyGroup_h + +#include + +#include "EntityItemProperties.h" + +class EntityItemProperties; +class EncodeBitstreamParams; +class OctreePacketData; +class EntityTreeElementExtraEncodeData; +class ReadBitstreamToTreeParams; + +/* +#include + +#include +#include + +#include +#include +#include + +#include +#include // for SittingPoint +#include +#include +#include + +#include "EntityItemID.h" +#include "PropertyGroupMacros.h" +#include "EntityTypes.h" +*/ + + +class PropertyGroup { +public: + PropertyGroup() {} + virtual ~PropertyGroup() {} + + // EntityItemProperty related helpers + virtual QScriptValue copyToScriptValue(QScriptEngine* engine, bool skipDefaults) const = 0; + virtual void copyFromScriptValue(const QScriptValue& object) = 0; + virtual void debugDump() const { } + + virtual bool appentToEditPacket(unsigned char* bufferOut, int sizeIn, int& sizeOut) = 0; + virtual bool decodeFromEditPacket(const unsigned char* data, int bytesToRead, int& processedBytes) = 0; + virtual void markAllChanged() = 0; + + // EntityItem related helpers + // methods for getting/setting all properties of an entity + virtual void getProperties(EntityItemProperties& propertiesOut) const = 0; + + /// returns true if something changed + virtual bool setProperties(const EntityItemProperties& properties) = 0; + + /// Override this in your derived class if you'd like to be informed when something about the state of the entity + /// has changed. This will be called with properties change or when new data is loaded from a stream + virtual void somethingChangedNotification() { } + + + virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const = 0; + + virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, + EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData, + EntityPropertyFlags& requestedProperties, + EntityPropertyFlags& propertyFlags, + EntityPropertyFlags& propertiesDidntFit, + int& propertyCount, + OctreeElement::AppendState& appendState) const = 0; + + virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, + ReadBitstreamToTreeParams& args, + EntityPropertyFlags& propertyFlags, bool overwriteLocalData) = 0; +}; + +#endif // hifi_PropertyGroup_h diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index 9ccb2697a0..be1a8fa3d3 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -80,6 +80,8 @@ EntityItemProperties ZoneEntityItem::getProperties() const { COPY_ENTITY_PROPERTY_TO_PROPERTIES(shapeType, getShapeType); COPY_ENTITY_PROPERTY_TO_PROPERTIES(compoundShapeURL, getCompoundShapeURL); + _atmospherePropeties.getProperties(properties); + return properties; } @@ -100,6 +102,10 @@ bool ZoneEntityItem::setProperties(const EntityItemProperties& properties) { SET_ENTITY_PROPERTY_FROM_PROPERTIES(shapeType, updateShapeType); SET_ENTITY_PROPERTY_FROM_PROPERTIES(compoundShapeURL, setCompoundShapeURL); + bool somethingChangedInAtmosphere = _atmospherePropeties.setProperties(properties); + + somethingChanged = somethingChanged || somethingChangedInAtmosphere; + if (somethingChanged) { bool wantDebug = false; if (wantDebug) { @@ -133,6 +139,9 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, READ_ENTITY_PROPERTY_SETTER(PROP_SHAPE_TYPE, ShapeType, updateShapeType); READ_ENTITY_PROPERTY_STRING(PROP_COMPOUND_SHAPE_URL, setCompoundShapeURL); + bytesRead += _atmospherePropeties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args, + propertyFlags, overwriteLocalData); + return bytesRead; } @@ -153,6 +162,8 @@ EntityPropertyFlags ZoneEntityItem::getEntityProperties(EncodeBitstreamParams& p requestedProperties += PROP_STAGE_HOUR; requestedProperties += PROP_SHAPE_TYPE; requestedProperties += PROP_COMPOUND_SHAPE_URL; + + requestedProperties += _atmospherePropeties.getEntityProperties(params); return requestedProperties; } @@ -179,6 +190,10 @@ void ZoneEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBits APPEND_ENTITY_PROPERTY(PROP_STAGE_HOUR, appendValue, getStageHour()); APPEND_ENTITY_PROPERTY(PROP_SHAPE_TYPE, appendValue, (uint32_t)getShapeType()); APPEND_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, appendValue, getCompoundShapeURL()); + + _atmospherePropeties.appendSubclassData(packetData, params, modelTreeElementExtraEncodeData, requestedProperties, + propertyFlags, propertiesDidntFit, propertyCount, appendState); + } void ZoneEntityItem::debugDump() const { @@ -197,6 +212,8 @@ void ZoneEntityItem::debugDump() const { qCDebug(entities) << " _stageAltitude:" << _stageAltitude; qCDebug(entities) << " _stageDay:" << _stageDay; qCDebug(entities) << " _stageHour:" << _stageHour; + + _atmospherePropeties.debugDump(); } ShapeType ZoneEntityItem::getShapeType() const { diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h index 4f081969ad..1e64b54e93 100644 --- a/libraries/entities/src/ZoneEntityItem.h +++ b/libraries/entities/src/ZoneEntityItem.h @@ -12,6 +12,7 @@ #ifndef hifi_ZoneEntityItem_h #define hifi_ZoneEntityItem_h +#include "AtmospherePropertyGroup.h" #include "EntityItem.h" class ZoneEntityItem : public EntityItem { @@ -135,6 +136,8 @@ protected: ShapeType _shapeType = SHAPE_TYPE_NONE; QString _compoundShapeURL; + + AtmospherePropertyGroup _atmospherePropeties; static bool _zonesArePickable; }; From 475dad6863056985bd539dd68dc80664629a969a Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Sat, 2 May 2015 16:25:48 -0700 Subject: [PATCH 06/27] Add limit to grab range to reduce max energy added by grabbing --- examples/grab.js | 51 ++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/examples/grab.js b/examples/grab.js index cd7d59701e..bd6920744a 100644 --- a/examples/grab.js +++ b/examples/grab.js @@ -1,3 +1,16 @@ + +// grab.js +// examples +// +// Created by Eric Levin on May 1, 2015 +// Copyright 2015 High Fidelity, Inc. +// +// Grab's physically moveable entities with the mouse, by applying a spring force. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + var isGrabbing = false; var grabbedEntity = null; var prevMouse = {}; @@ -8,7 +21,7 @@ var entityProps; var targetPosition; var moveUpDown = false; -var currentPosition, currentVelocity; +var currentPosition, currentVelocity, cameraEntityDistance; var grabSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/eric/sounds/CloseClamp.wav"); var releaseSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/eric/sounds/ReleaseClamp.wav"); @@ -23,16 +36,6 @@ var DROP_WIDTH = 2; var dropLine = Overlays.addOverlay("line3d", { - start: { - x: 0, - y: 0, - z: 0 - }, - end: { - x: 0, - y: 0, - z: 0 - }, color: DROP_COLOR, alpha: 1, visible: false, @@ -64,12 +67,8 @@ function mousePressEvent(event) { function updateDropLine(position) { Overlays.editOverlay(dropLine, { visible: true, - start: position, - end: Vec3.sum(position, { - x: 0, - y: -DROP_DISTANCE, - z: 0 - }) + start: { x: position.x, y: position.y + DROP_DISTANCE, z: position.z }, + end: { x: position.x, y: position.y - DROP_DISTANCE, z: position.z } }) } @@ -103,11 +102,11 @@ function mouseMoveEvent(event) { var camYaw = Quat.safeEulerAngles(Camera.getOrientation()).y; var dPosition = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, camYaw, 0), deltaMouse); // Adjust target position for the object by the mouse move - var avatarEntityDistance = Vec3.distance(Camera.getPosition(), currentPosition); + cameraEntityDistance = Vec3.distance(Camera.getPosition(), currentPosition); // Scale distance we want to move by the distance from the camera to the grabbed object // TODO: Correct SCREEN_TO_METERS to be correct for the actual FOV, resolution var SCREEN_TO_METERS = 0.001; - targetPosition = Vec3.sum(targetPosition, Vec3.multiply(dPosition, avatarEntityDistance * SCREEN_TO_METERS)); + targetPosition = Vec3.sum(targetPosition, Vec3.multiply(dPosition, cameraEntityDistance * SCREEN_TO_METERS)); } prevMouse.x = event.x; prevMouse.y = event.y; @@ -136,15 +135,21 @@ function update(deltaTime) { var dPosition = Vec3.subtract(targetPosition, currentPosition); var CLOSE_ENOUGH = 0.001; - if (Vec3.length(dPosition) > CLOSE_ENOUGH) { + var FULL_STRENGTH = 0.025; + var distanceToTarget = Vec3.length(dPosition); + if (distanceToTarget/cameraEntityDistance > CLOSE_ENOUGH) { // compute current velocity in the direction we want to move var velocityTowardTarget = Vec3.dot(currentVelocity, Vec3.normalize(dPosition)); // compute the speed we would like to be going toward the target position - var SPRING_RATE = 0.35; - var DAMPING_RATE = 0.55; + var SPRING_RATE = 1.5; + var DAMPING_RATE = 0.80; var desiredVelocity = Vec3.multiply(dPosition, (1.0 / deltaTime) * SPRING_RATE); // compute how much we want to add to the existing velocity var addedVelocity = Vec3.subtract(desiredVelocity, velocityTowardTarget); + // If target is too far, roll off the force as inverse square of distance + if (distanceToTarget/cameraEntityDistance > FULL_STRENGTH) { + addedVelocity = Vec3.multiply(addedVelocity, Math.pow(FULL_STRENGTH / distanceToTarget, 2.0)); + } var newVelocity = Vec3.sum(currentVelocity, addedVelocity); // Add Damping newVelocity = Vec3.subtract(newVelocity, Vec3.multiply(newVelocity, DAMPING_RATE)); @@ -153,7 +158,7 @@ function update(deltaTime) { velocity: newVelocity }) } - updateDropLine(currentPosition); + updateDropLine(targetPosition); } } From 78f7870cbb1d83ce50029ead9c6e574d63a4e835 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 11:13:05 -0700 Subject: [PATCH 07/27] more tweaks to atmosphere properties --- .../entities/src/AtmospherePropertyGroup.cpp | 131 +++++++++++------- .../entities/src/AtmospherePropertyGroup.h | 14 +- .../entities/src/EntityItemProperties.cpp | 18 ++- libraries/entities/src/EntityItemProperties.h | 2 +- .../entities/src/EntityItemPropertiesMacros.h | 71 +++++++++- libraries/networking/src/PacketHeaders.cpp | 2 +- libraries/networking/src/PacketHeaders.h | 1 + 7 files changed, 169 insertions(+), 70 deletions(-) diff --git a/libraries/entities/src/AtmospherePropertyGroup.cpp b/libraries/entities/src/AtmospherePropertyGroup.cpp index 556ba19d8b..dc3dbe0bab 100644 --- a/libraries/entities/src/AtmospherePropertyGroup.cpp +++ b/libraries/entities/src/AtmospherePropertyGroup.cpp @@ -15,30 +15,42 @@ #include "EntityItemProperties.h" #include "EntityItemPropertiesMacros.h" +AtmospherePropertyGroup::AtmospherePropertyGroup() { + _center = glm::vec3(0.0f); + _innerRadius = 0.0f; + _outerRadius = 0.0f; + _mieScattering = 0.0f; + _rayleighScattering = 0.0f; + _scatteringWavelengths = glm::vec3(0.0f); + +} + void AtmospherePropertyGroup::copyToScriptValue(QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const { - COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(AtmosphereProperties, AtmosphereCenter, atmosphereCenter); - COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(AtmosphereProperties, AtmosphereInnerRadius, atmosphereInnerRadius); - COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(AtmosphereProperties, AtmosphereOuterRadius, atmosphereOuterRadius); - COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(AtmosphereProperties, AtmosphereMieScattering, atmosphereMieScattering); - COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(AtmosphereProperties, AtmosphereRayleighScattering, atmosphereRayleighScattering); - COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(AtmosphereProperties, AtmosphereScatteringWavelengths, atmosphereScatteringWavelengths); + COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(Atmosphere, Center, center); + COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, InnerRadius, innerRadius); + COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, OuterRadius, outerRadius); + COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, MieScattering, mieScattering); + COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, RayleighScattering, rayleighScattering); + COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(Atmosphere, ScatteringWavelengths, scatteringWavelengths); } void AtmospherePropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) { - COPY_PROPERTY_FROM_QSCRIPTVALUE_VEC3(atmosphereCenter, setAtmosphereCenter); - COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(atmosphereInnerRadius, setAtmosphereInnerRadius); - COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(atmosphereOuterRadius, setAtmosphereOuterRadius); - COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(atmosphereMieScattering, setAtmosphereMieScattering); - COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(atmosphereRayleighScattering, setAtmosphereRayleighScattering); - COPY_PROPERTY_FROM_QSCRIPTVALUE_VEC3(atmosphereScatteringWavelengths, setAtmosphereScatteringWavelengths); + COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_VEC3(atmosphere, center, setCenter); + COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(atmosphere, innerRadius, setInnerRadius); + COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(atmosphere, outerRadius, setOuterRadius); + COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(atmosphere, mieScattering, setMieScattering); + COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(atmosphere, rayleighScattering, setRayleighScattering); + COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_VEC3(atmosphere, scatteringWavelengths, setScatteringWavelengths); } void AtmospherePropertyGroup::debugDump() const { qDebug() << " AtmospherePropertyGroup: ---------------------------------------------"; - qDebug() << " Atmosphere Center:" << getAtmosphereCenter(); - qDebug() << " Atmosphere Inner Radius:" << getAtmosphereInnerRadius(); - qDebug() << " Atmosphere Outer Radius:" << getAtmosphereOuterRadius(); - qDebug() << " ... more ..."; + qDebug() << " Center:" << getCenter(); + qDebug() << " Inner Radius:" << getInnerRadius(); + qDebug() << " Outer Radius:" << getOuterRadius(); + qDebug() << " Mie Scattering:" << getMieScattering(); + qDebug() << " Rayleigh Scattering:" << getRayleighScattering(); + qDebug() << " Scattering Wavelengths:" << getScatteringWavelengths(); } bool AtmospherePropertyGroup::appentToEditPacket(OctreePacketData* packetData, @@ -50,12 +62,12 @@ bool AtmospherePropertyGroup::appentToEditPacket(OctreePacketData* packetData, bool successPropertyFits = true; - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_CENTER, appendValue, getAtmosphereCenter()); - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, appendValue, getAtmosphereInnerRadius()); - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, appendValue, getAtmosphereOuterRadius()); - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, appendValue, getAtmosphereMieScattering()); - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, appendValue, getAtmosphereRayleighScattering()); - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, appendValue, getAtmosphereScatteringWavelengths()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_CENTER, appendValue, getCenter()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, appendValue, getInnerRadius()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, appendValue, getOuterRadius()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, appendValue, getMieScattering()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, appendValue, getRayleighScattering()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, appendValue, getScatteringWavelengths()); return true; } @@ -66,12 +78,12 @@ bool AtmospherePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& property int bytesRead = 0; bool overwriteLocalData = true; - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_CENTER, glm::vec3, _atmosphereCenter); - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, float, _atmosphereInnerRadius); - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, float, _atmosphereOuterRadius); - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, float, _atmosphereMieScattering); - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, float, _atmosphereRayleighScattering); - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, glm::vec3, _atmosphereScatteringWavelengths); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_CENTER, glm::vec3, _center); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, float, _innerRadius); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, float, _outerRadius); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, float, _mieScattering); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, float, _rayleighScattering); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, glm::vec3, _scatteringWavelengths); processedBytes += bytesRead; @@ -79,26 +91,48 @@ bool AtmospherePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& property } void AtmospherePropertyGroup::markAllChanged() { + _centerChanged = true; + _innerRadiusChanged = true; + _outerRadiusChanged = true; + _mieScatteringChanged = true; + _rayleighScatteringChanged = true; + _scatteringWavelengthsChanged = true; } EntityPropertyFlags AtmospherePropertyGroup::getChangedProperties() const { EntityPropertyFlags changedProperties; - CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_CENTER, atmosphereCenter); - CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_INNER_RADIUS, atmosphereInnerRadius); - CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_OUTER_RADIUS, atmosphereOuterRadius); - CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_MIE_SCATTERING, atmosphereMieScattering); - CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, atmosphereRayleighScattering); - CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, atmosphereScatteringWavelengths); + CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_CENTER, center); + CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_INNER_RADIUS, innerRadius); + CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_OUTER_RADIUS, outerRadius); + CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_MIE_SCATTERING, mieScattering); + CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, rayleighScattering); + CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, scatteringWavelengths); return changedProperties; } -void AtmospherePropertyGroup::getProperties(EntityItemProperties& propertiesOut) const { +void AtmospherePropertyGroup::getProperties(EntityItemProperties& properties) const { + COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, Center, getCenter); + COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, InnerRadius, getInnerRadius); + COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, OuterRadius, getOuterRadius); + COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, MieScattering, getMieScattering); + COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, MieScattering, getMieScattering); + COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, RayleighScattering, getRayleighScattering); + COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, ScatteringWavelengths, getScatteringWavelengths); } bool AtmospherePropertyGroup::setProperties(const EntityItemProperties& properties) { - return true; + bool somethingChanged = false; + + SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Atmosphere, Center, center, setCenter); + SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Atmosphere, InnerRadius, innerRadius, setInnerRadius); + SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Atmosphere, OuterRadius, outerRadius, setOuterRadius); + SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Atmosphere, MieScattering, mieScattering, setMieScattering); + SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Atmosphere, RayleighScattering, rayleighScattering, setRayleighScattering); + SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Atmosphere, ScatteringWavelengths, scatteringWavelengths, setScatteringWavelengths); + + return somethingChanged; } EntityPropertyFlags AtmospherePropertyGroup::getEntityProperties(EncodeBitstreamParams& params) const { @@ -112,7 +146,6 @@ EntityPropertyFlags AtmospherePropertyGroup::getEntityProperties(EncodeBitstream requestedProperties += PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS; return requestedProperties; - } void AtmospherePropertyGroup::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, @@ -125,12 +158,12 @@ void AtmospherePropertyGroup::appendSubclassData(OctreePacketData* packetData, E bool successPropertyFits = true; - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_CENTER, appendValue, getAtmosphereCenter()); - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, appendValue, getAtmosphereInnerRadius()); - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, appendValue, getAtmosphereOuterRadius()); - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, appendValue, getAtmosphereMieScattering()); - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, appendValue, getAtmosphereRayleighScattering()); - APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, appendValue, getAtmosphereScatteringWavelengths()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_CENTER, appendValue, getCenter()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, appendValue, getInnerRadius()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, appendValue, getOuterRadius()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, appendValue, getMieScattering()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, appendValue, getRayleighScattering()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, appendValue, getScatteringWavelengths()); } int AtmospherePropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, @@ -140,12 +173,12 @@ int AtmospherePropertyGroup::readEntitySubclassDataFromBuffer(const unsigned cha int bytesRead = 0; const unsigned char* dataAt = data; - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_CENTER, glm::vec3, _atmosphereCenter); - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, float, _atmosphereInnerRadius); - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, float, _atmosphereOuterRadius); - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, float, _atmosphereMieScattering); - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, float, _atmosphereRayleighScattering); - READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, glm::vec3, _atmosphereScatteringWavelengths); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_CENTER, glm::vec3, _center); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, float, _innerRadius); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, float, _outerRadius); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, float, _mieScattering); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, float, _rayleighScattering); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, glm::vec3, _scatteringWavelengths); return bytesRead; } diff --git a/libraries/entities/src/AtmospherePropertyGroup.h b/libraries/entities/src/AtmospherePropertyGroup.h index 76f8dd22a5..3f3f2ff6d2 100644 --- a/libraries/entities/src/AtmospherePropertyGroup.h +++ b/libraries/entities/src/AtmospherePropertyGroup.h @@ -49,7 +49,7 @@ class ReadBitstreamToTreeParams; class AtmospherePropertyGroup : public PropertyGroup { public: - AtmospherePropertyGroup() {} + AtmospherePropertyGroup(); virtual ~AtmospherePropertyGroup() {} // EntityItemProperty related helpers @@ -90,12 +90,12 @@ public: EntityPropertyFlags& propertyFlags, bool overwriteLocalData); - DEFINE_PROPERTY_REF(PROP_ATMOSPHERE_CENTER, AtmosphereCenter, atmosphereCenter, glm::vec3); - DEFINE_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, AtmosphereInnerRadius, atmosphereInnerRadius, float); - DEFINE_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, AtmosphereOuterRadius, atmosphereOuterRadius, float); - DEFINE_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, AtmosphereMieScattering, atmosphereMieScattering, float); - DEFINE_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, AtmosphereRayleighScattering, atmosphereRayleighScattering, float); - DEFINE_PROPERTY_REF(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, AtmosphereScatteringWavelengths, atmosphereScatteringWavelengths, glm::vec3); + DEFINE_PROPERTY_REF(PROP_ATMOSPHERE_CENTER, Center, center, glm::vec3); + DEFINE_PROPERTY(PROP_ATMOSPHERE_INNER_RADIUS, InnerRadius, innerRadius, float); + DEFINE_PROPERTY(PROP_ATMOSPHERE_OUTER_RADIUS, OuterRadius, outerRadius, float); + DEFINE_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, MieScattering, mieScattering, float); + DEFINE_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, RayleighScattering, rayleighScattering, float); + DEFINE_PROPERTY_REF(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, ScatteringWavelengths, scatteringWavelengths, glm::vec3); }; #endif // hifi_AtmospherePropertyGroup_h diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index dab8dc9edc..b7549a5f63 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -27,7 +27,7 @@ #include "TextEntityItem.h" #include "ZoneEntityItem.h" -AtmospherePropertyGroup EntityItemProperties::_staticAtmosphereProperties; +AtmospherePropertyGroup EntityItemProperties::_staticAtmosphere; EntityPropertyList PROP_LAST_ITEM = (EntityPropertyList)(PROP_AFTER_LAST_ITEM - 1); @@ -296,7 +296,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { CHECK_PROPERTY_CHANGE(PROP_STAGE_DAY, stageDay); CHECK_PROPERTY_CHANGE(PROP_STAGE_HOUR, stageHour); - changedProperties += _atmosphereProperties.getChangedProperties(); + changedProperties += _atmosphere.getChangedProperties(); return changedProperties; } @@ -413,7 +413,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER_NO_SKIP(originalTextures, textureNamesList); // gettable, but not settable } - _atmosphereProperties.copyToScriptValue(properties, engine, skipDefaults, defaultEntityProperties); + _atmosphere.copyToScriptValue(properties, engine, skipDefaults, defaultEntityProperties); return properties; } @@ -484,7 +484,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object) { COPY_PROPERTY_FROM_QSCRIPTVALUE_INT(stageDay, setStageDay); COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(stageHour, setStageHour); - _atmosphereProperties.copyFromScriptValue(object, _defaultSettings); + _atmosphere.copyFromScriptValue(object, _defaultSettings); _lastEdited = usecTimestampNow(); } @@ -691,7 +691,8 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem APPEND_ENTITY_PROPERTY(PROP_SHAPE_TYPE, appendValue, (uint32_t)properties.getShapeType()); APPEND_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, appendValue, properties.getCompoundShapeURL()); - _staticAtmosphereProperties.appentToEditPacket(packetData, requestedProperties, propertyFlags, propertiesDidntFit, propertyCount, appendState ); + _staticAtmosphere.setProperties(properties); + _staticAtmosphere.appentToEditPacket(packetData, requestedProperties, propertyFlags, propertiesDidntFit, propertyCount, appendState ); } APPEND_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, appendValue, properties.getMarketplaceID()); @@ -941,7 +942,10 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_STAGE_HOUR, float, setStageHour); READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHAPE_TYPE, ShapeType, setShapeType); READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_COMPOUND_SHAPE_URL, setCompoundShapeURL); - _staticAtmosphereProperties.decodeFromEditPacket(propertyFlags, dataAt , processedBytes); + + qDebug() << "EntityItemProperties::decodeEntityEditPacket()...."; + properties.getAtmosphere().decodeFromEditPacket(propertyFlags, dataAt , processedBytes); + properties.getAtmosphere().debugDump(); } READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_MARKETPLACE_ID, setMarketplaceID); @@ -1044,7 +1048,7 @@ void EntityItemProperties::markAllChanged() { _stageDayChanged = true; _stageHourChanged = true; - _atmosphereProperties.markAllChanged(); + _atmosphere.markAllChanged(); } diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 783fc1902f..377f0a3a1a 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -137,7 +137,7 @@ public: DEFINE_PROPERTY(PROP_STAGE_DAY, StageDay, stageDay, quint16); DEFINE_PROPERTY(PROP_STAGE_HOUR, StageHour, stageHour, float); DEFINE_PROPERTY_REF(PROP_NAME, Name, name, QString); - DEFINE_PROPERTY_GROUP(AtmosphereProperties, atmosphereProperties, AtmospherePropertyGroup); + DEFINE_PROPERTY_GROUP(Atmosphere, atmosphere, AtmospherePropertyGroup); public: diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h index 65ddc12ab4..a3be19b812 100644 --- a/libraries/entities/src/EntityItemPropertiesMacros.h +++ b/libraries/entities/src/EntityItemPropertiesMacros.h @@ -181,15 +181,25 @@ somethingChanged = true; \ } +#define SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(G,P,p,M) \ + if (properties.get##G().p##Changed()) { \ + M(properties.get##G().get##P()); \ + somethingChanged = true; \ + } + #define SET_ENTITY_PROPERTY_FROM_PROPERTIES_GETTER(C,G,S) \ if (properties.C()) { \ S(properties.G()); \ somethingChanged = true; \ } -#define COPY_ENTITY_PROPERTY_TO_PROPERTIES(M,G) \ - properties._##M = G(); \ - properties._##M##Changed = false; +#define COPY_ENTITY_PROPERTY_TO_PROPERTIES(P,M) \ + properties._##P = M(); \ + properties._##P##Changed = false; + +#define COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(G,P,M) \ + properties.get##G().set##P(M()); \ + properties.get##G().set##P##Changed(false); #define CHECK_PROPERTY_CHANGE(P,M) \ if (_##M##Changed) { \ @@ -199,13 +209,23 @@ #define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(G,P,p) \ if (!skipDefaults || defaultEntityProperties.get##G().get##P() != _##p) { \ + QScriptValue groupProperties = properties.property(#G); \ + if (!groupProperties.isValid()) { \ + groupProperties = engine->newObject(); \ + } \ QScriptValue V = vec3toScriptValue(engine, _##p); \ - properties.setProperty(#p, V); \ + groupProperties.setProperty(#p, V); \ + properties.setProperty(#G, groupProperties); \ } #define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(G,P,p) \ if (!skipDefaults || defaultEntityProperties.get##G().get##P() != _##p) { \ - properties.setProperty(#p, _##p); \ + QScriptValue groupProperties = properties.property(#G); \ + if (!groupProperties.isValid()) { \ + groupProperties = engine->newObject(); \ + } \ + groupProperties.setProperty(#p, _##p); \ + properties.setProperty(#G, groupProperties); \ } #define COPY_PROPERTY_TO_QSCRIPTVALUE_VEC3(P) \ @@ -254,6 +274,20 @@ } \ } +#define COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(G, P, S) \ + { \ + QScriptValue G = object.property(#G); \ + if (G.isValid()) { \ + QScriptValue P = G.property(#P); \ + if (P.isValid()) { \ + float newValue = P.toVariant().toFloat(); \ + if (_defaultSettings || newValue != _##P) { \ + S(newValue); \ + } \ + } \ + } \ + } + #define COPY_PROPERTY_FROM_QSCRIPTVALUE_INT(P, S) \ QScriptValue P = object.property(#P); \ if (P.isValid()) { \ @@ -310,6 +344,32 @@ } \ } \ } + +#define COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_VEC3(G, P, S) \ + { \ + QScriptValue G = object.property(#G); \ + if (G.isValid()) { \ + QScriptValue P = G.property(#P); \ + if (P.isValid()) { \ + QScriptValue x = P.property("x"); \ + QScriptValue y = P.property("y"); \ + QScriptValue z = P.property("z"); \ + if (x.isValid() && y.isValid() && z.isValid()) { \ + glm::vec3 newValue; \ + newValue.x = x.toVariant().toFloat(); \ + newValue.y = y.toVariant().toFloat(); \ + newValue.z = z.toVariant().toFloat(); \ + bool isValid = !glm::isnan(newValue.x) && \ + !glm::isnan(newValue.y) && \ + !glm::isnan(newValue.z); \ + if (isValid && \ + (_defaultSettings || newValue != _##P)) { \ + S(newValue); \ + } \ + } \ + } \ + } \ + } #define COPY_PROPERTY_FROM_QSCRIPTVALUE_QUAT(P, S) \ QScriptValue P = object.property(#P); \ @@ -371,6 +431,7 @@ #define DEFINE_PROPERTY_GROUP(N, n, T) \ public: \ const T& get##N() const { return _##n; } \ + T& get##N() { return _##n; } \ private: \ T _##n; \ static T _static##N; diff --git a/libraries/networking/src/PacketHeaders.cpp b/libraries/networking/src/PacketHeaders.cpp index a9ccec34bb..3f1c3fbbfa 100644 --- a/libraries/networking/src/PacketHeaders.cpp +++ b/libraries/networking/src/PacketHeaders.cpp @@ -74,7 +74,7 @@ PacketVersion versionForPacketType(PacketType type) { return 1; case PacketTypeEntityAddOrEdit: case PacketTypeEntityData: - return VERSION_ENTITIES_HAVE_NAMES; + return VERSION_ENTITIES_ZONE_ENTITIES_HAVE_ATMOSPHERE; case PacketTypeEntityErase: return 2; case PacketTypeAudioStreamStats: diff --git a/libraries/networking/src/PacketHeaders.h b/libraries/networking/src/PacketHeaders.h index 7b12b1a089..c43b98d41f 100644 --- a/libraries/networking/src/PacketHeaders.h +++ b/libraries/networking/src/PacketHeaders.h @@ -140,5 +140,6 @@ const PacketVersion VERSION_ENTITIES_HAVE_UUIDS = 16; const PacketVersion VERSION_ENTITIES_ZONE_ENTITIES_EXIST = 17; const PacketVersion VERSION_ENTITIES_ZONE_ENTITIES_HAVE_DYNAMIC_SHAPE = 18; const PacketVersion VERSION_ENTITIES_HAVE_NAMES = 19; +const PacketVersion VERSION_ENTITIES_ZONE_ENTITIES_HAVE_ATMOSPHERE = 20; #endif // hifi_PacketHeaders_h From 8c47736c3b63c6e10bc840ff902d131fede6ae8a Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 11:41:03 -0700 Subject: [PATCH 08/27] add skybox mode property --- .../entities/src/EntityItemProperties.cpp | 43 ++++++++++++++++++- libraries/entities/src/EntityItemProperties.h | 2 + libraries/entities/src/EntityPropertyFlags.h | 8 ++++ libraries/entities/src/ZoneEntityItem.cpp | 21 +++++++++ libraries/entities/src/ZoneEntityItem.h | 5 +++ 5 files changed, 78 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index b7549a5f63..480233e538 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -89,6 +89,7 @@ EntityItemProperties::EntityItemProperties() : CONSTRUCT_PROPERTY(stageDay, ZoneEntityItem::DEFAULT_STAGE_DAY), CONSTRUCT_PROPERTY(stageHour, ZoneEntityItem::DEFAULT_STAGE_HOUR), CONSTRUCT_PROPERTY(name, ENTITY_ITEM_DEFAULT_NAME), + CONSTRUCT_PROPERTY(skyboxMode, SKYBOX_MODE_INHERIT), _id(UNKNOWN_ENTITY_ID), _idSet(false), @@ -236,6 +237,37 @@ void EntityItemProperties::setShapeTypeFromString(const QString& shapeName) { } } +const char* skyboxModeNames[] = {"inherit", "atmosphere", "texture" }; + +QHash stringToSkyboxModeLookup; + +void addSkyboxMode(SkyboxMode type) { + stringToSkyboxModeLookup[skyboxModeNames[type]] = type; +} + +void buildStringToSkyboxModeLookup() { + addSkyboxMode(SKYBOX_MODE_INHERIT); + addSkyboxMode(SKYBOX_MODE_ATMOSPHERE); + addSkyboxMode(SKYBOX_MODE_TEXTURE); +} + +QString EntityItemProperties::getSkyboxModeAsString() const { + if (_skyboxMode < sizeof(skyboxModeNames) / sizeof(char *)) + return QString(skyboxModeNames[_skyboxMode]); + return QString(skyboxModeNames[SKYBOX_MODE_INHERIT]); +} + +void EntityItemProperties::setSkyboxModeFromString(const QString& shapeName) { + if (stringToSkyboxModeLookup.empty()) { + buildStringToSkyboxModeLookup(); + } + auto skyboxModeItr = stringToSkyboxModeLookup.find(shapeName.toLower()); + if (skyboxModeItr != stringToSkyboxModeLookup.end()) { + _skyboxMode = skyboxModeItr.value(); + _skyboxModeChanged = true; + } +} + EntityPropertyFlags EntityItemProperties::getChangedProperties() const { EntityPropertyFlags changedProperties; @@ -295,6 +327,8 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { CHECK_PROPERTY_CHANGE(PROP_STAGE_ALTITUDE, stageAltitude); CHECK_PROPERTY_CHANGE(PROP_STAGE_DAY, stageDay); CHECK_PROPERTY_CHANGE(PROP_STAGE_HOUR, stageHour); + + CHECK_PROPERTY_CHANGE(PROP_SKYBOX_MODE, skyboxMode); changedProperties += _atmosphere.getChangedProperties(); @@ -379,6 +413,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool COPY_PROPERTY_TO_QSCRIPTVALUE(stageAltitude); COPY_PROPERTY_TO_QSCRIPTVALUE(stageDay); COPY_PROPERTY_TO_QSCRIPTVALUE(stageHour); + COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(skyboxMode, getSkyboxModeAsString()); // Sitting properties support if (!skipDefaults) { @@ -484,6 +519,8 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object) { COPY_PROPERTY_FROM_QSCRIPTVALUE_INT(stageDay, setStageDay); COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(stageHour, setStageHour); + COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(skyboxMode, SkyboxMode); + _atmosphere.copyFromScriptValue(object, _defaultSettings); _lastEdited = usecTimestampNow(); @@ -690,6 +727,8 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem APPEND_ENTITY_PROPERTY(PROP_SHAPE_TYPE, appendValue, (uint32_t)properties.getShapeType()); APPEND_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, appendValue, properties.getCompoundShapeURL()); + + APPEND_ENTITY_PROPERTY(PROP_SKYBOX_MODE, appendValue, (uint32_t)properties.getSkyboxMode()); _staticAtmosphere.setProperties(properties); _staticAtmosphere.appentToEditPacket(packetData, requestedProperties, propertyFlags, propertiesDidntFit, propertyCount, appendState ); @@ -942,6 +981,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_STAGE_HOUR, float, setStageHour); READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHAPE_TYPE, ShapeType, setShapeType); READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_COMPOUND_SHAPE_URL, setCompoundShapeURL); + READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SKYBOX_MODE, SkyboxMode, setSkyboxMode); qDebug() << "EntityItemProperties::decodeEntityEditPacket()...."; properties.getAtmosphere().decodeFromEditPacket(propertyFlags, dataAt , processedBytes); @@ -1048,8 +1088,9 @@ void EntityItemProperties::markAllChanged() { _stageDayChanged = true; _stageHourChanged = true; + _skyboxModeChanged = true; _atmosphere.markAllChanged(); - + } /// The maximum bounding cube for the entity, independent of it's rotation. diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 377f0a3a1a..591b89f22d 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -138,6 +138,7 @@ public: DEFINE_PROPERTY(PROP_STAGE_HOUR, StageHour, stageHour, float); DEFINE_PROPERTY_REF(PROP_NAME, Name, name, QString); DEFINE_PROPERTY_GROUP(Atmosphere, atmosphere, AtmospherePropertyGroup); + DEFINE_PROPERTY_REF_ENUM(PROP_SKYBOX_MODE, SkyboxMode, skyboxMode, SkyboxMode); public: @@ -272,6 +273,7 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) { DEBUG_PROPERTY_IF_CHANGED(debug, properties, LocalGravity, localGravity, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, ParticleRadius, particleRadius, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, MarketplaceID, marketplaceID, ""); + DEBUG_PROPERTY_IF_CHANGED(debug, properties, SkyboxMode, skyboxMode, ""); debug << " last edited:" << properties.getLastEdited() << "\n"; debug << " edited ago:" << properties.getEditedAgo() << "\n"; diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h index 3ee46e1f41..969ed309bb 100644 --- a/libraries/entities/src/EntityPropertyFlags.h +++ b/libraries/entities/src/EntityPropertyFlags.h @@ -155,4 +155,12 @@ typedef PropertyFlags EntityPropertyFlags; // one greater than the last item property due to the enum's auto-incrementing. extern EntityPropertyList PROP_LAST_ITEM; + +enum SkyboxMode { + SKYBOX_MODE_INHERIT, + SKYBOX_MODE_ATMOSPHERE, + SKYBOX_MODE_TEXTURE, +}; + + #endif // hifi_EntityPropertyFlags_h diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index be1a8fa3d3..b1c875aae0 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -60,6 +60,8 @@ ZoneEntityItem::ZoneEntityItem(const EntityItemID& entityItemID, const EntityIte _stageHour = DEFAULT_STAGE_HOUR; _shapeType = DEFAULT_SHAPE_TYPE; _compoundShapeURL = DEFAULT_COMPOUND_SHAPE_URL; + + _skyboxMode = SKYBOX_MODE_INHERIT; setProperties(properties); } @@ -80,6 +82,8 @@ EntityItemProperties ZoneEntityItem::getProperties() const { COPY_ENTITY_PROPERTY_TO_PROPERTIES(shapeType, getShapeType); COPY_ENTITY_PROPERTY_TO_PROPERTIES(compoundShapeURL, getCompoundShapeURL); + COPY_ENTITY_PROPERTY_TO_PROPERTIES(skyboxMode, getSkyboxMode); + _atmospherePropeties.getProperties(properties); return properties; @@ -102,6 +106,8 @@ bool ZoneEntityItem::setProperties(const EntityItemProperties& properties) { SET_ENTITY_PROPERTY_FROM_PROPERTIES(shapeType, updateShapeType); SET_ENTITY_PROPERTY_FROM_PROPERTIES(compoundShapeURL, setCompoundShapeURL); + SET_ENTITY_PROPERTY_FROM_PROPERTIES(skyboxMode, setSkyboxMode); + bool somethingChangedInAtmosphere = _atmospherePropeties.setProperties(properties); somethingChanged = somethingChanged || somethingChangedInAtmosphere; @@ -116,6 +122,10 @@ bool ZoneEntityItem::setProperties(const EntityItemProperties& properties) { } setLastEdited(properties._lastEdited); } + + qDebug() << "ZoneEntityItem::setProperties()"; + debugDump(); + return somethingChanged; } @@ -139,9 +149,15 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, READ_ENTITY_PROPERTY_SETTER(PROP_SHAPE_TYPE, ShapeType, updateShapeType); READ_ENTITY_PROPERTY_STRING(PROP_COMPOUND_SHAPE_URL, setCompoundShapeURL); + READ_ENTITY_PROPERTY_SETTER(PROP_SKYBOX_MODE, SkyboxMode, setSkyboxMode); + bytesRead += _atmospherePropeties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args, propertyFlags, overwriteLocalData); + + qDebug() << "ZoneEntityItem::readEntitySubclassDataFromBuffer()"; + debugDump(); + return bytesRead; } @@ -163,6 +179,8 @@ EntityPropertyFlags ZoneEntityItem::getEntityProperties(EncodeBitstreamParams& p requestedProperties += PROP_SHAPE_TYPE; requestedProperties += PROP_COMPOUND_SHAPE_URL; + requestedProperties += PROP_SKYBOX_MODE; + requestedProperties += _atmospherePropeties.getEntityProperties(params); return requestedProperties; @@ -190,6 +208,8 @@ void ZoneEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBits APPEND_ENTITY_PROPERTY(PROP_STAGE_HOUR, appendValue, getStageHour()); APPEND_ENTITY_PROPERTY(PROP_SHAPE_TYPE, appendValue, (uint32_t)getShapeType()); APPEND_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, appendValue, getCompoundShapeURL()); + + APPEND_ENTITY_PROPERTY(PROP_SKYBOX_MODE, appendValue, (uint32_t)getShapeType()); // could this be a uint16?? _atmospherePropeties.appendSubclassData(packetData, params, modelTreeElementExtraEncodeData, requestedProperties, propertyFlags, propertiesDidntFit, propertyCount, appendState); @@ -212,6 +232,7 @@ void ZoneEntityItem::debugDump() const { qCDebug(entities) << " _stageAltitude:" << _stageAltitude; qCDebug(entities) << " _stageDay:" << _stageDay; qCDebug(entities) << " _stageHour:" << _stageHour; + qCDebug(entities) << " _skyboxMode:" << _skyboxMode; _atmospherePropeties.debugDump(); } diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h index 1e64b54e93..6819f6b974 100644 --- a/libraries/entities/src/ZoneEntityItem.h +++ b/libraries/entities/src/ZoneEntityItem.h @@ -101,6 +101,10 @@ public: const QString getCompoundShapeURL() const { return _compoundShapeURL; } virtual void setCompoundShapeURL(const QString& url); + void setSkyboxMode(SkyboxMode value) { _skyboxMode = value; } + SkyboxMode getSkyboxMode() const { return _skyboxMode; } + + virtual bool supportsDetailedRayIntersection() const { return true; } virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction, bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face, @@ -137,6 +141,7 @@ protected: ShapeType _shapeType = SHAPE_TYPE_NONE; QString _compoundShapeURL; + SkyboxMode _skyboxMode = SKYBOX_MODE_INHERIT; AtmospherePropertyGroup _atmospherePropeties; static bool _zonesArePickable; From 4561c5920370ae410539158c60d38ae77ebe7acd Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 13:49:43 -0700 Subject: [PATCH 09/27] wire up zone to environment atmosphere rendering --- interface/src/Application.cpp | 5 +- interface/src/Application.h | 3 + interface/src/Environment.cpp | 64 +++++++++++-------- interface/src/Environment.h | 12 +++- .../src/EntityTreeRenderer.cpp | 3 + libraries/entities/src/ZoneEntityItem.cpp | 24 +++++-- libraries/entities/src/ZoneEntityItem.h | 5 +- .../src/AbstractViewStateInterface.h | 5 ++ tests/octree/CMakeLists.txt | 2 +- 9 files changed, 84 insertions(+), 39 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d0d01f4534..c03da4064f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3113,9 +3113,9 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs // compute starfield alpha based on distance from atmosphere float alpha = 1.0f; if (Menu::getInstance()->isOptionChecked(MenuOption::Atmosphere)) { + // TODO: handle this correctly for zones const EnvironmentData& closestData = _environment.getClosestData(theCamera.getPosition()); - float height = glm::distance(theCamera.getPosition(), - closestData.getAtmosphereCenter(theCamera.getPosition())); + float height = glm::distance(theCamera.getPosition(), closestData.getAtmosphereCenter()); if (height < closestData.getAtmosphereInnerRadius()) { alpha = 0.0f; @@ -3126,6 +3126,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs } // finally render the starfield + //qDebug() << "stars alpha:" << alpha; _stars.render(theCamera.getFieldOfView(), theCamera.getAspectRatio(), theCamera.getNearClip(), alpha); } diff --git a/interface/src/Application.h b/interface/src/Application.h index 9f87d05711..34ef19d5dd 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -280,6 +280,9 @@ public: virtual int getBoundaryLevelAdjust() const; virtual PickRay computePickRay(float x, float y); virtual const glm::vec3& getAvatarPosition() const { return _myAvatar->getPosition(); } + virtual void overrideEnvironmentData(const EnvironmentData& newData) { _environment.override(newData); } + virtual void endOverrideEnvironmentData() { _environment.endOverride(); } + NodeBounds& getNodeBoundsDisplay() { return _nodeBoundsDisplay; } diff --git a/interface/src/Environment.cpp b/interface/src/Environment.cpp index a08abfc920..a2b78c2ff5 100644 --- a/interface/src/Environment.cpp +++ b/interface/src/Environment.cpp @@ -71,15 +71,46 @@ void Environment::resetToDefault() { void Environment::renderAtmospheres(Camera& camera) { // get the lock for the duration of the call QMutexLocker locker(&_mutex); - - foreach (const ServerData& serverData, _data) { - // TODO: do something about EnvironmentData - foreach (const EnvironmentData& environmentData, serverData) { - renderAtmosphere(camera, environmentData); + + if (_environmentIsOverridden) { + renderAtmosphere(camera, _overrideData); + } else { + foreach (const ServerData& serverData, _data) { + // TODO: do something about EnvironmentData + foreach (const EnvironmentData& environmentData, serverData) { + renderAtmosphere(camera, environmentData); + } } } } +EnvironmentData Environment::getClosestData(const glm::vec3& position) { + if (_environmentIsOverridden) { + return _overrideData; + } + + // get the lock for the duration of the call + QMutexLocker locker(&_mutex); + + EnvironmentData closest; + float closestDistance = FLT_MAX; + foreach (const ServerData& serverData, _data) { + foreach (const EnvironmentData& environmentData, serverData) { + float distance = glm::distance(position, environmentData.getAtmosphereCenter(position)) - + environmentData.getAtmosphereOuterRadius(); + if (distance < closestDistance) { + closest = environmentData; + closestDistance = distance; + } + } + } + return closest; +} + + +// NOTE: Deprecated - I'm leaving this in for now, but it's not actually used. I made it private +// so that if anyone wants to start using this in the future they will consider how to make it +// work with new physics systems. glm::vec3 Environment::getGravity (const glm::vec3& position) { // // 'Default' gravity pulls you downward in Y when you are near the X/Z plane @@ -115,25 +146,6 @@ glm::vec3 Environment::getGravity (const glm::vec3& position) { return gravity; } -const EnvironmentData Environment::getClosestData(const glm::vec3& position) { - // get the lock for the duration of the call - QMutexLocker locker(&_mutex); - - EnvironmentData closest; - float closestDistance = FLT_MAX; - foreach (const ServerData& serverData, _data) { - foreach (const EnvironmentData& environmentData, serverData) { - float distance = glm::distance(position, environmentData.getAtmosphereCenter(position)) - - environmentData.getAtmosphereOuterRadius(); - if (distance < closestDistance) { - closest = environmentData; - closestDistance = distance; - } - } - } - return closest; -} - bool Environment::findCapsulePenetration(const glm::vec3& start, const glm::vec3& end, float radius, glm::vec3& penetration) { // collide with the "floor" @@ -217,14 +229,14 @@ ProgramObject* Environment::createSkyProgram(const char* from, int* locations) { } void Environment::renderAtmosphere(Camera& camera, const EnvironmentData& data) { - glm::vec3 center = data.getAtmosphereCenter(camera.getPosition()); + glm::vec3 center = data.getAtmosphereCenter(); glPushMatrix(); glTranslatef(center.x, center.y, center.z); glm::vec3 relativeCameraPos = camera.getPosition() - center; float height = glm::length(relativeCameraPos); - + // use the appropriate shader depending on whether we're inside or outside ProgramObject* program; int* locations; diff --git a/interface/src/Environment.h b/interface/src/Environment.h index 525f3b7eb4..1a46a10175 100644 --- a/interface/src/Environment.h +++ b/interface/src/Environment.h @@ -30,15 +30,19 @@ public: void init(); void resetToDefault(); void renderAtmospheres(Camera& camera); + + void override(const EnvironmentData& overrideData) { _overrideData = overrideData; _environmentIsOverridden = true; } + void endOverride() { _environmentIsOverridden = false; } - glm::vec3 getGravity (const glm::vec3& position); - const EnvironmentData getClosestData(const glm::vec3& position); + EnvironmentData getClosestData(const glm::vec3& position); - bool findCapsulePenetration(const glm::vec3& start, const glm::vec3& end, float radius, glm::vec3& penetration); int parseData(const HifiSockAddr& senderSockAddr, const QByteArray& packet); private: + glm::vec3 getGravity (const glm::vec3& position); // NOTE: Deprecated + bool findCapsulePenetration(const glm::vec3& start, + const glm::vec3& end, float radius, glm::vec3& penetration); // NOTE: Deprecated ProgramObject* createSkyProgram(const char* from, int* locations); @@ -74,6 +78,8 @@ private: typedef QHash ServerData; QHash _data; + EnvironmentData _overrideData; + bool _environmentIsOverridden = false; QMutex _mutex; }; diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index c9a968a58e..3071d583fe 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -427,6 +427,8 @@ void EntityTreeRenderer::render(RenderArgs::RenderMode renderMode, _bestZone->getStageAltitude()); scene->setStageDayTime(_bestZone->getStageHour()); scene->setStageYearTime(_bestZone->getStageDay()); + + _viewState->overrideEnvironmentData(_bestZone->getEnvironmentData()); } else { if (_hasPreviousZone) { scene->setKeyLightColor(_previousKeyLightColor); @@ -440,6 +442,7 @@ void EntityTreeRenderer::render(RenderArgs::RenderMode renderMode, scene->setStageYearTime(_previousStageDay); _hasPreviousZone = false; } + _viewState->endOverrideEnvironmentData(); } // we must call endScene while we still have the tree locked so that no one deletes a model diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index b1c875aae0..4f9ae0a30f 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -66,6 +66,24 @@ ZoneEntityItem::ZoneEntityItem(const EntityItemID& entityItemID, const EntityIte setProperties(properties); } + +EnvironmentData ZoneEntityItem::getEnvironmentData() const { + EnvironmentData result; + + result.setAtmosphereCenter(_atmospherePropeties.getCenter()); + result.setAtmosphereInnerRadius(_atmospherePropeties.getInnerRadius()); + result.setAtmosphereOuterRadius(_atmospherePropeties.getOuterRadius()); + result.setRayleighScattering(_atmospherePropeties.getRayleighScattering()); + result.setMieScattering(_atmospherePropeties.getMieScattering()); + result.setScatteringWavelengths(_atmospherePropeties.getScatteringWavelengths()); + + // defaults for now... + result.setSunLocation(glm::vec3(1000, 900, 1000)); + result.setSunBrightness(20.0f); + + return result; +} + EntityItemProperties ZoneEntityItem::getProperties() const { EntityItemProperties properties = EntityItem::getProperties(); // get the properties from our base class @@ -123,9 +141,6 @@ bool ZoneEntityItem::setProperties(const EntityItemProperties& properties) { setLastEdited(properties._lastEdited); } - qDebug() << "ZoneEntityItem::setProperties()"; - debugDump(); - return somethingChanged; } @@ -155,9 +170,6 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, propertyFlags, overwriteLocalData); - qDebug() << "ZoneEntityItem::readEntitySubclassDataFromBuffer()"; - debugDump(); - return bytesRead; } diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h index 6819f6b974..b4c2504790 100644 --- a/libraries/entities/src/ZoneEntityItem.h +++ b/libraries/entities/src/ZoneEntityItem.h @@ -12,6 +12,8 @@ #ifndef hifi_ZoneEntityItem_h #define hifi_ZoneEntityItem_h +#include + #include "AtmospherePropertyGroup.h" #include "EntityItem.h" @@ -103,7 +105,8 @@ public: void setSkyboxMode(SkyboxMode value) { _skyboxMode = value; } SkyboxMode getSkyboxMode() const { return _skyboxMode; } - + + EnvironmentData getEnvironmentData() const; virtual bool supportsDetailedRayIntersection() const { return true; } virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction, diff --git a/libraries/render-utils/src/AbstractViewStateInterface.h b/libraries/render-utils/src/AbstractViewStateInterface.h index 0d73614e7c..45cf634186 100644 --- a/libraries/render-utils/src/AbstractViewStateInterface.h +++ b/libraries/render-utils/src/AbstractViewStateInterface.h @@ -18,6 +18,7 @@ class Transform; class QThread; class ViewFrustum; class PickRay; +class EnvironmentData; /// Interface provided by Application to other objects that need access to the current view state details class AbstractViewStateInterface { @@ -32,6 +33,10 @@ public: /// gets the current view frustum for rendering the view state virtual ViewFrustum* getCurrentViewFrustum() = 0; + + /// overrides environment data + virtual void overrideEnvironmentData(const EnvironmentData& newData) = 0; + virtual void endOverrideEnvironmentData() = 0; /// gets the shadow view frustum for rendering the view state virtual ViewFrustum* getShadowViewFrustum() = 0; diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index ffd908741d..b5fb43c260 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -3,6 +3,6 @@ set(TARGET_NAME octree-tests) setup_hifi_project(Script Network) # link in the shared libraries -link_hifi_libraries(shared octree gpu model fbx networking entities avatars audio animation script-engine physics) +link_hifi_libraries(shared octree gpu model fbx networking environment entities avatars audio animation script-engine physics) copy_dlls_beside_windows_executable() \ No newline at end of file From cfe717fe08368c5cf16b03a1aaf1fa4aa23e6d93 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 13:53:29 -0700 Subject: [PATCH 10/27] only override environment when skyboxMode is atmosphere --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 3071d583fe..04ce52f493 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -428,7 +428,9 @@ void EntityTreeRenderer::render(RenderArgs::RenderMode renderMode, scene->setStageDayTime(_bestZone->getStageHour()); scene->setStageYearTime(_bestZone->getStageDay()); - _viewState->overrideEnvironmentData(_bestZone->getEnvironmentData()); + if (_bestZone->getSkyboxMode() == SKYBOX_MODE_ATMOSPHERE) { + _viewState->overrideEnvironmentData(_bestZone->getEnvironmentData()); + } } else { if (_hasPreviousZone) { scene->setKeyLightColor(_previousKeyLightColor); From 741323e6c1dc1ba48d12b8adbc4b1fcd1f398886 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 14:19:13 -0700 Subject: [PATCH 11/27] wire up atmosphere.hasStars property --- interface/src/Application.cpp | 22 +++++++++++++------ .../entities/src/AtmospherePropertyGroup.cpp | 14 +++++++++++- .../entities/src/AtmospherePropertyGroup.h | 1 + .../entities/src/EntityItemPropertiesMacros.h | 14 ++++++++++++ libraries/entities/src/EntityPropertyFlags.h | 3 ++- libraries/entities/src/ZoneEntityItem.cpp | 1 + libraries/environment/src/EnvironmentData.cpp | 3 ++- libraries/environment/src/EnvironmentData.h | 5 +++++ 8 files changed, 53 insertions(+), 10 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c03da4064f..88496d0510 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3112,22 +3112,30 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs // compute starfield alpha based on distance from atmosphere float alpha = 1.0f; + bool hasStars = true; if (Menu::getInstance()->isOptionChecked(MenuOption::Atmosphere)) { // TODO: handle this correctly for zones const EnvironmentData& closestData = _environment.getClosestData(theCamera.getPosition()); - float height = glm::distance(theCamera.getPosition(), closestData.getAtmosphereCenter()); - if (height < closestData.getAtmosphereInnerRadius()) { - alpha = 0.0f; + + if (closestData.getHasStars()) { + float height = glm::distance(theCamera.getPosition(), closestData.getAtmosphereCenter()); + if (height < closestData.getAtmosphereInnerRadius()) { + alpha = 0.0f; - } else if (height < closestData.getAtmosphereOuterRadius()) { - alpha = (height - closestData.getAtmosphereInnerRadius()) / - (closestData.getAtmosphereOuterRadius() - closestData.getAtmosphereInnerRadius()); + } else if (height < closestData.getAtmosphereOuterRadius()) { + alpha = (height - closestData.getAtmosphereInnerRadius()) / + (closestData.getAtmosphereOuterRadius() - closestData.getAtmosphereInnerRadius()); + } + } else { + hasStars = false; } } // finally render the starfield //qDebug() << "stars alpha:" << alpha; - _stars.render(theCamera.getFieldOfView(), theCamera.getAspectRatio(), theCamera.getNearClip(), alpha); + if (hasStars) { + _stars.render(theCamera.getFieldOfView(), theCamera.getAspectRatio(), theCamera.getNearClip(), alpha); + } } if (Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) { diff --git a/libraries/entities/src/AtmospherePropertyGroup.cpp b/libraries/entities/src/AtmospherePropertyGroup.cpp index dc3dbe0bab..c59882791f 100644 --- a/libraries/entities/src/AtmospherePropertyGroup.cpp +++ b/libraries/entities/src/AtmospherePropertyGroup.cpp @@ -22,7 +22,7 @@ AtmospherePropertyGroup::AtmospherePropertyGroup() { _mieScattering = 0.0f; _rayleighScattering = 0.0f; _scatteringWavelengths = glm::vec3(0.0f); - + _hasStars = true; } void AtmospherePropertyGroup::copyToScriptValue(QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const { @@ -32,6 +32,7 @@ void AtmospherePropertyGroup::copyToScriptValue(QScriptValue& properties, QScrip COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, MieScattering, mieScattering); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, RayleighScattering, rayleighScattering); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(Atmosphere, ScatteringWavelengths, scatteringWavelengths); + COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, HasStars, hasStars); } void AtmospherePropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) { @@ -41,6 +42,7 @@ void AtmospherePropertyGroup::copyFromScriptValue(const QScriptValue& object, bo COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(atmosphere, mieScattering, setMieScattering); COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(atmosphere, rayleighScattering, setRayleighScattering); COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_VEC3(atmosphere, scatteringWavelengths, setScatteringWavelengths); + COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_BOOL(atmosphere, hasStars, setHasStars); } void AtmospherePropertyGroup::debugDump() const { @@ -51,6 +53,7 @@ void AtmospherePropertyGroup::debugDump() const { qDebug() << " Mie Scattering:" << getMieScattering(); qDebug() << " Rayleigh Scattering:" << getRayleighScattering(); qDebug() << " Scattering Wavelengths:" << getScatteringWavelengths(); + qDebug() << " Has Stars:" << getHasStars(); } bool AtmospherePropertyGroup::appentToEditPacket(OctreePacketData* packetData, @@ -68,6 +71,7 @@ bool AtmospherePropertyGroup::appentToEditPacket(OctreePacketData* packetData, APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, appendValue, getMieScattering()); APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, appendValue, getRayleighScattering()); APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, appendValue, getScatteringWavelengths()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_HAS_STARS, appendValue, getHasStars()); return true; } @@ -84,6 +88,7 @@ bool AtmospherePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& property READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, float, _mieScattering); READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, float, _rayleighScattering); READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, glm::vec3, _scatteringWavelengths); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_HAS_STARS, bool, _hasStars); processedBytes += bytesRead; @@ -97,6 +102,7 @@ void AtmospherePropertyGroup::markAllChanged() { _mieScatteringChanged = true; _rayleighScatteringChanged = true; _scatteringWavelengthsChanged = true; + _hasStarsChanged = true; } EntityPropertyFlags AtmospherePropertyGroup::getChangedProperties() const { @@ -108,6 +114,7 @@ EntityPropertyFlags AtmospherePropertyGroup::getChangedProperties() const { CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_MIE_SCATTERING, mieScattering); CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, rayleighScattering); CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, scatteringWavelengths); + CHECK_PROPERTY_CHANGE(PROP_ATMOSPHERE_HAS_STARS, hasStars); return changedProperties; } @@ -120,6 +127,7 @@ void AtmospherePropertyGroup::getProperties(EntityItemProperties& properties) co COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, MieScattering, getMieScattering); COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, RayleighScattering, getRayleighScattering); COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, ScatteringWavelengths, getScatteringWavelengths); + COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Atmosphere, HasStars, getHasStars); } bool AtmospherePropertyGroup::setProperties(const EntityItemProperties& properties) { @@ -131,6 +139,7 @@ bool AtmospherePropertyGroup::setProperties(const EntityItemProperties& properti SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Atmosphere, MieScattering, mieScattering, setMieScattering); SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Atmosphere, RayleighScattering, rayleighScattering, setRayleighScattering); SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Atmosphere, ScatteringWavelengths, scatteringWavelengths, setScatteringWavelengths); + SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Atmosphere, HasStars, hasStars, setHasStars); return somethingChanged; } @@ -144,6 +153,7 @@ EntityPropertyFlags AtmospherePropertyGroup::getEntityProperties(EncodeBitstream requestedProperties += PROP_ATMOSPHERE_MIE_SCATTERING; requestedProperties += PROP_ATMOSPHERE_RAYLEIGH_SCATTERING; requestedProperties += PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS; + requestedProperties += PROP_ATMOSPHERE_HAS_STARS; return requestedProperties; } @@ -164,6 +174,7 @@ void AtmospherePropertyGroup::appendSubclassData(OctreePacketData* packetData, E APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, appendValue, getMieScattering()); APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, appendValue, getRayleighScattering()); APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, appendValue, getScatteringWavelengths()); + APPEND_ENTITY_PROPERTY(PROP_ATMOSPHERE_HAS_STARS, appendValue, getHasStars()); } int AtmospherePropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, @@ -179,6 +190,7 @@ int AtmospherePropertyGroup::readEntitySubclassDataFromBuffer(const unsigned cha READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, float, _mieScattering); READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, float, _rayleighScattering); READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, glm::vec3, _scatteringWavelengths); + READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_HAS_STARS, bool, _hasStars); return bytesRead; } diff --git a/libraries/entities/src/AtmospherePropertyGroup.h b/libraries/entities/src/AtmospherePropertyGroup.h index 3f3f2ff6d2..e081033cd6 100644 --- a/libraries/entities/src/AtmospherePropertyGroup.h +++ b/libraries/entities/src/AtmospherePropertyGroup.h @@ -96,6 +96,7 @@ public: DEFINE_PROPERTY(PROP_ATMOSPHERE_MIE_SCATTERING, MieScattering, mieScattering, float); DEFINE_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, RayleighScattering, rayleighScattering, float); DEFINE_PROPERTY_REF(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, ScatteringWavelengths, scatteringWavelengths, glm::vec3); + DEFINE_PROPERTY(PROP_ATMOSPHERE_HAS_STARS, HasStars, hasStars, bool); }; #endif // hifi_AtmospherePropertyGroup_h diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h index a3be19b812..b8564f650f 100644 --- a/libraries/entities/src/EntityItemPropertiesMacros.h +++ b/libraries/entities/src/EntityItemPropertiesMacros.h @@ -306,6 +306,20 @@ } \ } +#define COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE_BOOL(G, P, S) \ + { \ + QScriptValue G = object.property(#G); \ + if (G.isValid()) { \ + QScriptValue P = G.property(#P); \ + if (P.isValid()) { \ + float newValue = P.toVariant().toBool(); \ + if (_defaultSettings || newValue != _##P) { \ + S(newValue); \ + } \ + } \ + } \ + } + #define COPY_PROPERTY_FROM_QSCRIPTVALUE_STRING(P, S)\ QScriptValue P = object.property(#P); \ if (P.isValid()) { \ diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h index 969ed309bb..0b5d2ce805 100644 --- a/libraries/entities/src/EntityPropertyFlags.h +++ b/libraries/entities/src/EntityPropertyFlags.h @@ -142,7 +142,8 @@ enum EntityPropertyList { PROP_ATMOSPHERE_MIE_SCATTERING = PROP_EMIT_DIRECTION, PROP_ATMOSPHERE_RAYLEIGH_SCATTERING = PROP_EMIT_STRENGTH, PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS = PROP_LOCAL_GRAVITY, - PROP_SKYBOX_MODE = PROP_PARTICLE_RADIUS, + PROP_ATMOSPHERE_HAS_STARS = PROP_PARTICLE_RADIUS, + PROP_SKYBOX_MODE = PROP_MODEL_URL, // SunBrightness - same as KeyLight Intensity? // SunLocation (or direction) - same as KeyLight diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index 4f9ae0a30f..cefc0b0de7 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -76,6 +76,7 @@ EnvironmentData ZoneEntityItem::getEnvironmentData() const { result.setRayleighScattering(_atmospherePropeties.getRayleighScattering()); result.setMieScattering(_atmospherePropeties.getMieScattering()); result.setScatteringWavelengths(_atmospherePropeties.getScatteringWavelengths()); + result.setHasStars(_atmospherePropeties.getHasStars()); // defaults for now... result.setSunLocation(glm::vec3(1000, 900, 1000)); diff --git a/libraries/environment/src/EnvironmentData.cpp b/libraries/environment/src/EnvironmentData.cpp index 913841fe31..f703b667bc 100644 --- a/libraries/environment/src/EnvironmentData.cpp +++ b/libraries/environment/src/EnvironmentData.cpp @@ -27,7 +27,8 @@ EnvironmentData::EnvironmentData(int id) : _mieScattering(0.0010f), _scatteringWavelengths(0.650f, 0.570f, 0.475f), _sunLocation(1000, 900, 1000), - _sunBrightness(20.0f) { + _sunBrightness(20.0f), + _hasStars(true) { } glm::vec3 EnvironmentData::getAtmosphereCenter(const glm::vec3& cameraPosition) const { diff --git a/libraries/environment/src/EnvironmentData.h b/libraries/environment/src/EnvironmentData.h index 52297682fd..ebbb3d1fb0 100644 --- a/libraries/environment/src/EnvironmentData.h +++ b/libraries/environment/src/EnvironmentData.h @@ -28,6 +28,9 @@ public: void setGravity(float gravity) { _gravity = gravity; } float getGravity() const { return _gravity; } + void setHasStars(bool value) { _hasStars = value; } + bool getHasStars() const { return _hasStars; } + void setAtmosphereCenter(const glm::vec3& center) { _atmosphereCenter = center; } void setAtmosphereInnerRadius(float radius) { _atmosphereInnerRadius = radius; } void setAtmosphereOuterRadius(float radius) { _atmosphereOuterRadius = radius; } @@ -73,6 +76,8 @@ private: glm::vec3 _sunLocation; float _sunBrightness; + + bool _hasStars; }; #endif // hifi_EnvironmentData_h From 403ed6d77bb64ce4ce26009794b2dccdbf450085 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 15:20:16 -0700 Subject: [PATCH 12/27] wire up sunlocation from keylight direction --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 7 ++++++- libraries/entities/src/ZoneEntityItem.cpp | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 04ce52f493..84ad41ff7b 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -429,7 +429,12 @@ void EntityTreeRenderer::render(RenderArgs::RenderMode renderMode, scene->setStageYearTime(_bestZone->getStageDay()); if (_bestZone->getSkyboxMode() == SKYBOX_MODE_ATMOSPHERE) { - _viewState->overrideEnvironmentData(_bestZone->getEnvironmentData()); + EnvironmentData data = _bestZone->getEnvironmentData(); + glm::vec3 keyLightDirection = scene->getKeyLightDirection(); + glm::vec3 inverseKeyLightDirection = keyLightDirection * -1.0f; + glm::vec3 keyLightLocation = _viewState->getAvatarPosition() + (inverseKeyLightDirection * data.getAtmosphereOuterRadius()); + data.setSunLocation(keyLightLocation); + _viewState->overrideEnvironmentData(data); } } else { if (_hasPreviousZone) { diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index cefc0b0de7..f10e42ee08 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -78,9 +78,10 @@ EnvironmentData ZoneEntityItem::getEnvironmentData() const { result.setScatteringWavelengths(_atmospherePropeties.getScatteringWavelengths()); result.setHasStars(_atmospherePropeties.getHasStars()); - // defaults for now... - result.setSunLocation(glm::vec3(1000, 900, 1000)); - result.setSunBrightness(20.0f); + // NOTE: The sunLocation and SunBrightness will be overwritten in the EntityTreeRenderer to use the + // keyLight details from the scene interface + //result.setSunLocation(1000, 900, 1000)); + //result.setSunBrightness(20.0f); return result; } From e097950277ce4b2ab13b6b1ba6bbee2f8a587973 Mon Sep 17 00:00:00 2001 From: Eric Levin Date: Mon, 4 May 2015 15:22:10 -0700 Subject: [PATCH 13/27] added axis and angle helper methods to Quat class- script user can now get normalized axis and scalar angle from a quaternion --- libraries/script-engine/src/Quat.cpp | 8 ++++++++ libraries/script-engine/src/Quat.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/libraries/script-engine/src/Quat.cpp b/libraries/script-engine/src/Quat.cpp index a44a623b1e..9299f64c46 100644 --- a/libraries/script-engine/src/Quat.cpp +++ b/libraries/script-engine/src/Quat.cpp @@ -63,6 +63,14 @@ glm::quat Quat::angleAxis(float angle, const glm::vec3& v) { return glm::angleAxis(glm::radians(angle), v); } +glm::vec3 Quat::axis(const glm::quat& orientation) { + return glm::axis(orientation); +} + +float Quat::angle(const glm::quat &orientation) { + return glm::angle(orientation); +} + glm::quat Quat::mix(const glm::quat& q1, const glm::quat& q2, float alpha) { return safeMix(q1, q2, alpha); } diff --git a/libraries/script-engine/src/Quat.h b/libraries/script-engine/src/Quat.h index 55bfa3c061..1f130c57c7 100644 --- a/libraries/script-engine/src/Quat.h +++ b/libraries/script-engine/src/Quat.h @@ -35,6 +35,8 @@ public slots: glm::vec3 getUp(const glm::quat& orientation); glm::vec3 safeEulerAngles(const glm::quat& orientation); // degrees glm::quat angleAxis(float angle, const glm::vec3& v); // degrees + glm::vec3 axis(const glm::quat& orientation); + float angle(const glm::quat& orientation); glm::quat mix(const glm::quat& q1, const glm::quat& q2, float alpha); glm::quat slerp(const glm::quat& q1, const glm::quat& q2, float alpha); glm::quat squad(const glm::quat& q1, const glm::quat& q2, const glm::quat& s1, const glm::quat& s2, float h); From 3827e961a74200ec1158a1213ee9a038d91cd405 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 15:31:50 -0700 Subject: [PATCH 14/27] hook sunBrightness to keyLightIntensity --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 84ad41ff7b..f5c56ad04b 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -434,6 +434,11 @@ void EntityTreeRenderer::render(RenderArgs::RenderMode renderMode, glm::vec3 inverseKeyLightDirection = keyLightDirection * -1.0f; glm::vec3 keyLightLocation = _viewState->getAvatarPosition() + (inverseKeyLightDirection * data.getAtmosphereOuterRadius()); data.setSunLocation(keyLightLocation); + + consrt float KEY_LIGHT_INTENSITY_TO_SUN_BRIGHTNESS_RATIO = 20.0f; + float sunBrightness = scene->getKeyLightIntensity() * KEY_LIGHT_INTENSITY_TO_SUN_BRIGHTNESS_RATIO; + data.setSunBrightness(sunBrightness); + _viewState->overrideEnvironmentData(data); } } else { From 32ef0c20100a6efd4ed78d680fe4c2aa17aee8cf Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 15:49:21 -0700 Subject: [PATCH 15/27] removed some dead code --- interface/src/Application.cpp | 1 - libraries/entities/src/EntityItemProperties.cpp | 3 --- 2 files changed, 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 88496d0510..4cb3a85d7e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3132,7 +3132,6 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs } // finally render the starfield - //qDebug() << "stars alpha:" << alpha; if (hasStars) { _stars.render(theCamera.getFieldOfView(), theCamera.getAspectRatio(), theCamera.getNearClip(), alpha); } diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 480233e538..144bb28419 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -982,10 +982,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHAPE_TYPE, ShapeType, setShapeType); READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_COMPOUND_SHAPE_URL, setCompoundShapeURL); READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SKYBOX_MODE, SkyboxMode, setSkyboxMode); - - qDebug() << "EntityItemProperties::decodeEntityEditPacket()...."; properties.getAtmosphere().decodeFromEditPacket(propertyFlags, dataAt , processedBytes); - properties.getAtmosphere().debugDump(); } READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_MARKETPLACE_ID, setMarketplaceID); From 7e7500eaadf7b3b76f4d0d4902978bbe2a460a54 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Mon, 4 May 2015 15:57:21 -0700 Subject: [PATCH 16/27] fix for coding standard --- examples/grab.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/grab.js b/examples/grab.js index bd6920744a..9609354abf 100644 --- a/examples/grab.js +++ b/examples/grab.js @@ -137,7 +137,7 @@ function update(deltaTime) { var CLOSE_ENOUGH = 0.001; var FULL_STRENGTH = 0.025; var distanceToTarget = Vec3.length(dPosition); - if (distanceToTarget/cameraEntityDistance > CLOSE_ENOUGH) { + if (distanceToTarget / cameraEntityDistance > CLOSE_ENOUGH) { // compute current velocity in the direction we want to move var velocityTowardTarget = Vec3.dot(currentVelocity, Vec3.normalize(dPosition)); // compute the speed we would like to be going toward the target position @@ -147,7 +147,7 @@ function update(deltaTime) { // compute how much we want to add to the existing velocity var addedVelocity = Vec3.subtract(desiredVelocity, velocityTowardTarget); // If target is too far, roll off the force as inverse square of distance - if (distanceToTarget/cameraEntityDistance > FULL_STRENGTH) { + if (distanceToTarget / cameraEntityDistance > FULL_STRENGTH) { addedVelocity = Vec3.multiply(addedVelocity, Math.pow(FULL_STRENGTH / distanceToTarget, 2.0)); } var newVelocity = Vec3.sum(currentVelocity, addedVelocity); From 2c02bfdda5534d6c54633f9ead86fd26c9e47ccb Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 16:01:50 -0700 Subject: [PATCH 17/27] fix build buster --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index f5c56ad04b..5ee0dafce8 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -435,7 +435,7 @@ void EntityTreeRenderer::render(RenderArgs::RenderMode renderMode, glm::vec3 keyLightLocation = _viewState->getAvatarPosition() + (inverseKeyLightDirection * data.getAtmosphereOuterRadius()); data.setSunLocation(keyLightLocation); - consrt float KEY_LIGHT_INTENSITY_TO_SUN_BRIGHTNESS_RATIO = 20.0f; + const float KEY_LIGHT_INTENSITY_TO_SUN_BRIGHTNESS_RATIO = 20.0f; float sunBrightness = scene->getKeyLightIntensity() * KEY_LIGHT_INTENSITY_TO_SUN_BRIGHTNESS_RATIO; data.setSunBrightness(sunBrightness); From ff898318944ab7a19a7fa6f61adf981390dcf423 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 4 May 2015 16:32:26 -0700 Subject: [PATCH 18/27] fix for object below array in JSONBreakableMarshal --- assignment-client/src/audio/AudioMixerClientData.cpp | 2 +- libraries/networking/src/JSONBreakableMarshal.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 4db5611bb5..3320ae182e 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -274,7 +274,7 @@ QJsonObject AudioMixerClientData::getAudioStreamStats() const { injectorArray.push_back(upstreamStats); } } - + result["injectors"] = injectorArray; return result; diff --git a/libraries/networking/src/JSONBreakableMarshal.cpp b/libraries/networking/src/JSONBreakableMarshal.cpp index 768d4e32b6..ca56df52ad 100644 --- a/libraries/networking/src/JSONBreakableMarshal.cpp +++ b/libraries/networking/src/JSONBreakableMarshal.cpp @@ -185,7 +185,7 @@ QVariantMap JSONBreakableMarshal::fromStringList(const QStringList& stringList) // check if we need to resize the array if (currentList.size() < arrayIndex + 1) { - for (int i = currentList.size() - 1; i < arrayIndex + 1; i++) { + for (int i = currentList.size(); i < arrayIndex + 1; i++) { // add the null QJsonValue at this array index to get the array to the right size currentList.push_back(QJsonValue()); } @@ -221,7 +221,7 @@ QVariantMap JSONBreakableMarshal::fromStringList(const QStringList& stringList) nextBreakIndex = keySeparatorIndex; nextKeypathStartIndex = keySeparatorIndex + 1; } else if (keySeparatorIndex == -1 || (arrayBracketIndex != -1 - && keySeparatorIndex < arrayBracketIndex)) { + && arrayBracketIndex < keySeparatorIndex)) { nextBreakIndex = arrayBracketIndex; nextKeypathStartIndex = arrayBracketIndex; } else { From 00b8c937c77afa347aadace519262558c9d103db Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 4 May 2015 16:34:50 -0700 Subject: [PATCH 19/27] remove spacing change in AudioMixerClientData --- assignment-client/src/audio/AudioMixerClientData.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 3320ae182e..4db5611bb5 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -274,7 +274,7 @@ QJsonObject AudioMixerClientData::getAudioStreamStats() const { injectorArray.push_back(upstreamStats); } } - + result["injectors"] = injectorArray; return result; From 3f8c52cdd48d533d3730a26e381a0fba245e68d8 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 16:36:38 -0700 Subject: [PATCH 20/27] attempt to fix unix build buster --- libraries/entities/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt index e57bcf67fa..d21906fa3f 100644 --- a/libraries/entities/CMakeLists.txt +++ b/libraries/entities/CMakeLists.txt @@ -13,4 +13,4 @@ find_package(Bullet REQUIRED) target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${BULLET_INCLUDE_DIRS}) target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES}) -link_hifi_libraries(avatars shared octree gpu model fbx networking animation) +link_hifi_libraries(avatars shared octree gpu model fbx networking animation environment) From 6a987fdaf5d004ba1978412bb60f0d23a5e6edc0 Mon Sep 17 00:00:00 2001 From: Eric Levin Date: Mon, 4 May 2015 16:40:04 -0700 Subject: [PATCH 21/27] now conforming to coding standards --- libraries/script-engine/src/Quat.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/script-engine/src/Quat.cpp b/libraries/script-engine/src/Quat.cpp index 9299f64c46..9cd659dd5d 100644 --- a/libraries/script-engine/src/Quat.cpp +++ b/libraries/script-engine/src/Quat.cpp @@ -67,7 +67,7 @@ glm::vec3 Quat::axis(const glm::quat& orientation) { return glm::axis(orientation); } -float Quat::angle(const glm::quat &orientation) { +float Quat::angle(const glm::quat& orientation) { return glm::angle(orientation); } From dc1b5a262f8e1b0e246ce971b18d4cabf167f1e8 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Mon, 4 May 2015 17:03:33 -0700 Subject: [PATCH 22/27] Remove camera wobble cause by the face tracker and by idle animations --- interface/src/Application.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index fe92972f48..06071831a3 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -819,13 +819,18 @@ void Application::paintGL() { glEnable(GL_LINE_SMOOTH); if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) { + // Always use the default eye position, not the actual head eye position. + // Using the latter will cause the camera to wobble with idle animations, + // or with changes from the face tracker + _myCamera.setPosition(_myAvatar->getDefaultEyePosition()); if (!OculusManager::isConnected()) { - // If there isn't an HMD, match exactly to avatar's head - _myCamera.setPosition(_myAvatar->getHead()->getEyePosition()); + // If not using an HMD, grab the camera orientation directly _myCamera.setRotation(_myAvatar->getHead()->getCameraOrientation()); } else { - // For an HMD, set the base position and orientation to that of the avatar body - _myCamera.setPosition(_myAvatar->getDefaultEyePosition()); + // In an HMD, people can look up and down with their actual neck, and the + // per-eye HMD pose will be applied later. So set the camera orientation + // to only the yaw, excluding pitch and roll, i.e. an orientation that + // is orthongonal to the (body's) Y axis _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation()); } From 8b3b32c70d502d4ef0df46f7b2b8e74759fb6857 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 17:21:50 -0700 Subject: [PATCH 23/27] add example --- .../example/entities/zoneAtmosphereExample.js | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 examples/example/entities/zoneAtmosphereExample.js diff --git a/examples/example/entities/zoneAtmosphereExample.js b/examples/example/entities/zoneAtmosphereExample.js new file mode 100644 index 0000000000..57d71a53b6 --- /dev/null +++ b/examples/example/entities/zoneAtmosphereExample.js @@ -0,0 +1,73 @@ +// +// zoneAtmosphereExample.js +// examples +// +// Created by Brad Hefta-Gaub on 4/16/15. +// Copyright 2015 High Fidelity, Inc. +// +// This is an example script that demonstrates creating a zone using the atmosphere features +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; + +var count = 0; +var stopAfter = 10000; + +var zoneEntityA = Entities.addEntity({ + type: "Zone", + position: { x: 1000, y: 1000, z: 1000}, + dimensions: { x: 2000, y: 2000, z: 2000 }, + keyLightColor: { red: 255, green: 0, blue: 0 }, + stageSunModelEnabled: false, + shapeType: "sphere", + skyboxMode: "atmosphere", + atmosphere: { + center: { x: 1000, y: 0, z: 1000}, + innerRadius: 1000.0, + outerRadius: 1025.0, + rayleighScattering: 0.0025, + mieScattering: 0.0010, + scatteringWavelengths: { x: 0.650, y: 0.570, z: 0.475 }, + hasStars: false + }, + stageLatitude: 37.777, + stageLongitude: 122.407, + stageAltitude: 0.03, + stageDay: 60, + stageHour: 0, + stageSunModelEnabled: true +}); + + +// register the call back so it fires before each data send +Script.update.connect(function(deltaTime) { + // stop it... + if (count >= stopAfter) { + print("calling Script.stop()"); + Script.stop(); + } + count++; + var newHour = (count / 10) % 24; + var newIntensity = ((count / 10) % 24) / 24; + print("newHour:" + newHour); + print("newIntensity:" + newIntensity); + + Entities.editEntity(zoneEntityA, { + skyboxMode: "atmosphere", + atmosphere: { + center: { x: 1000, y: 0, z: 1000}, + innerRadius: 1000.0, + outerRadius: 1025.0, + rayleighScattering: 0.0025, + mieScattering: 0.0010, + scatteringWavelengths: { x: 0.650, y: 0.570, z: 0.475 }, + hasStars: false + }, + stageHour: newHour, + keyLightIntensity: newIntensity + }); +}); + From b28e7cc765adb60eb043cac4c9f16f66ff67fd8e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 4 May 2015 17:46:03 -0700 Subject: [PATCH 24/27] handle case where a symlink replaces copy --- .../SymlinkOrCopyDirectoryBesideTarget.cmake | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake b/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake index d64e6821e3..fe6f5b671e 100644 --- a/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake +++ b/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake @@ -10,21 +10,41 @@ # macro(SYMLINK_OR_COPY_DIRECTORY_BESIDE_TARGET _SHOULD_SYMLINK _DIRECTORY _DESTINATION) + + # remove the current directory + add_custom_command( + TARGET ${TARGET_NAME} POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E remove_directory $/${_DESTINATION} + ) + if (${_SHOULD_SYMLINK}) - # the caller wants a symlink, so just add a command to symlink the DIR beside target + + # first create the destination add_custom_command( TARGET ${TARGET_NAME} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E create_symlink - "${_DIRECTORY}" + COMMAND "${CMAKE_COMMAND}" -E make_directory $/${_DESTINATION} - ) - else () - # remove the current directory - add_custom_command( - TARGET ${TARGET_NAME} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E remove_directory $/${_DESTINATION} ) + + # the caller wants a symlink, so just add a command to symlink all contents of _DIRECTORY + # in the destination - we can't simply create a symlink for _DESTINATION + # because the remove_directory call above would delete the original files + file(GLOB _DIR_ITEMS ${_DIRECTORY}/*) + + foreach(_ITEM ${_DIR_ITEMS}) + # get the filename for this item + get_filename_component(_ITEM_FILENAME ${_ITEM} NAME) + + # add the command to symlink this item + add_custom_command( + TARGET ${TARGET_NAME} POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E create_symlink + ${_ITEM} + $/${_DESTINATION}/${_ITEM_FILENAME} + ) + endforeach() + else () # copy the directory add_custom_command( TARGET ${TARGET_NAME} POST_BUILD From 39efde7e8ca88849e9327c02c9d6ad907f7f1302 Mon Sep 17 00:00:00 2001 From: Eric Levin Date: Mon, 4 May 2015 18:14:46 -0700 Subject: [PATCH 25/27] added rotation ability to grab script --- examples/grab.js | 114 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 79 insertions(+), 35 deletions(-) diff --git a/examples/grab.js b/examples/grab.js index 9609354abf..5d2ae13cde 100644 --- a/examples/grab.js +++ b/examples/grab.js @@ -18,10 +18,22 @@ var deltaMouse = { z: 0 } var entityProps; -var targetPosition; var moveUpDown = false; - -var currentPosition, currentVelocity, cameraEntityDistance; +var CLOSE_ENOUGH = 0.001; +var FULL_STRENGTH = 0.11; +var SPRING_RATE = 1.5; +var DAMPING_RATE = 0.80; +var ANGULAR_DAMPING_RATE = 0.40; +var SCREEN_TO_METERS = 0.001; +var currentPosition, currentVelocity, cameraEntityDistance, currentRotation; +var velocityTowardTarget, desiredVelocity, addedVelocity, newVelocity, dPosition, camYaw, distanceToTarget, targetPosition; +var shouldRotate = false; +var dQ, theta, axisAngle, dT; +var angularVelocity = { + x: 0, + y: 0, + z: 0 +}; var grabSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/eric/sounds/CloseClamp.wav"); var releaseSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/eric/sounds/ReleaseClamp.wav"); @@ -54,8 +66,8 @@ function mousePressEvent(event) { var props = Entities.getEntityProperties(grabbedEntity) isGrabbing = true; targetPosition = props.position; - currentPosition = props.position; - currentVelocity = props.velocity; + currentPosition = props.position; + currentVelocity = props.velocity; updateDropLine(targetPosition); Audio.playSound(grabSound, { position: props.position, @@ -64,12 +76,20 @@ function mousePressEvent(event) { } } -function updateDropLine(position) { - Overlays.editOverlay(dropLine, { - visible: true, - start: { x: position.x, y: position.y + DROP_DISTANCE, z: position.z }, - end: { x: position.x, y: position.y - DROP_DISTANCE, z: position.z } - }) +function updateDropLine(position) { + Overlays.editOverlay(dropLine, { + visible: true, + start: { + x: position.x, + y: position.y + DROP_DISTANCE, + z: position.z + }, + end: { + x: position.x, + y: position.y - DROP_DISTANCE, + z: position.z + } + }) } @@ -99,14 +119,26 @@ function mouseMoveEvent(event) { deltaMouse.z = 0; } // Update the target position by the amount the mouse moved - var camYaw = Quat.safeEulerAngles(Camera.getOrientation()).y; - var dPosition = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, camYaw, 0), deltaMouse); - // Adjust target position for the object by the mouse move - cameraEntityDistance = Vec3.distance(Camera.getPosition(), currentPosition); + camYaw = Quat.safeEulerAngles(Camera.getOrientation()).y; + dPosition = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, camYaw, 0), deltaMouse); + if (!shouldRotate) { + // Adjust target position for the object by the mouse move + cameraEntityDistance = Vec3.distance(Camera.getPosition(), currentPosition); // Scale distance we want to move by the distance from the camera to the grabbed object // TODO: Correct SCREEN_TO_METERS to be correct for the actual FOV, resolution - var SCREEN_TO_METERS = 0.001; - targetPosition = Vec3.sum(targetPosition, Vec3.multiply(dPosition, cameraEntityDistance * SCREEN_TO_METERS)); + targetPosition = Vec3.sum(targetPosition, Vec3.multiply(dPosition, cameraEntityDistance * SCREEN_TO_METERS)); + } else if (shouldRotate) { + var transformedDeltaMouse = { + x: deltaMouse.z, + y: deltaMouse.x, + z: deltaMouse.y + }; + transformedDeltaMouse = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, camYaw, 0), transformedDeltaMouse); + dQ = Quat.fromVec3Degrees(transformedDeltaMouse); + theta = 2 * Math.acos(dQ.w); + axisAngle = Quat.axis(dQ); + angularVelocity = Vec3.multiply((theta / dT), axisAngle); + } } prevMouse.x = event.x; prevMouse.y = event.y; @@ -118,46 +150,59 @@ function keyReleaseEvent(event) { if (event.text === "SHIFT") { moveUpDown = false; } + if (event.text === "SPACE") { + shouldRotate = false; + } } function keyPressEvent(event) { if (event.text === "SHIFT") { moveUpDown = true; } + if (event.text === "SPACE") { + shouldRotate = true; + } } function update(deltaTime) { + dT = deltaTime; if (isGrabbing) { entityProps = Entities.getEntityProperties(grabbedEntity); - currentPosition = entityProps.position; - currentVelocity = entityProps.velocity; + currentPosition = entityProps.position; + currentVelocity = entityProps.velocity; + currentRotation = entityProps.rotation; var dPosition = Vec3.subtract(targetPosition, currentPosition); - var CLOSE_ENOUGH = 0.001; - var FULL_STRENGTH = 0.025; - var distanceToTarget = Vec3.length(dPosition); - if (distanceToTarget / cameraEntityDistance > CLOSE_ENOUGH) { + + distanceToTarget = Vec3.length(dPosition); + if (distanceToTarget > CLOSE_ENOUGH) { // compute current velocity in the direction we want to move - var velocityTowardTarget = Vec3.dot(currentVelocity, Vec3.normalize(dPosition)); + velocityTowardTarget = Vec3.dot(currentVelocity, Vec3.normalize(dPosition)); + velocityTowardTarget = Vec3.multiply(dPosition, velocityTowardTarget); // compute the speed we would like to be going toward the target position - var SPRING_RATE = 1.5; - var DAMPING_RATE = 0.80; - var desiredVelocity = Vec3.multiply(dPosition, (1.0 / deltaTime) * SPRING_RATE); + + desiredVelocity = Vec3.multiply(dPosition, (1.0 / deltaTime) * SPRING_RATE); // compute how much we want to add to the existing velocity - var addedVelocity = Vec3.subtract(desiredVelocity, velocityTowardTarget); + addedVelocity = Vec3.subtract(desiredVelocity, velocityTowardTarget); // If target is too far, roll off the force as inverse square of distance if (distanceToTarget / cameraEntityDistance > FULL_STRENGTH) { addedVelocity = Vec3.multiply(addedVelocity, Math.pow(FULL_STRENGTH / distanceToTarget, 2.0)); } - var newVelocity = Vec3.sum(currentVelocity, addedVelocity); + newVelocity = Vec3.sum(currentVelocity, addedVelocity); // Add Damping newVelocity = Vec3.subtract(newVelocity, Vec3.multiply(newVelocity, DAMPING_RATE)); // Update entity - Entities.editEntity(grabbedEntity, { - velocity: newVelocity - }) - } + + //add damping to angular velocity: + } + if (shouldRotate) { + angularVelocity = Vec3.subtract(angularVelocity, Vec3.multiply(angularVelocity, ANGULAR_DAMPING_RATE)); + } + Entities.editEntity(grabbedEntity, { + velocity: newVelocity, + angularVelocity: angularVelocity + }) updateDropLine(targetPosition); } } @@ -167,5 +212,4 @@ Controller.mousePressEvent.connect(mousePressEvent); Controller.mouseReleaseEvent.connect(mouseReleaseEvent); Controller.keyPressEvent.connect(keyPressEvent); Controller.keyReleaseEvent.connect(keyReleaseEvent); -Script.update.connect(update); - +Script.update.connect(update); \ No newline at end of file From 4b9c6728e76bbae38543e38a0b031cf56de64f88 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 18:58:35 -0700 Subject: [PATCH 26/27] fix issue with skyboxMode getting randomly set --- examples/example/entities/zoneAtmosphereExample.js | 10 ---------- .../entities-renderer/src/EntityTreeRenderer.cpp | 7 ++++++- libraries/entities/src/AtmospherePropertyGroup.cpp | 14 +++++++------- libraries/entities/src/EntityItemProperties.cpp | 13 ++++++++----- libraries/entities/src/EntityItemProperties.h | 2 ++ .../entities/src/EntityItemPropertiesMacros.h | 5 ++--- libraries/entities/src/ZoneEntityItem.cpp | 12 ++---------- 7 files changed, 27 insertions(+), 36 deletions(-) diff --git a/examples/example/entities/zoneAtmosphereExample.js b/examples/example/entities/zoneAtmosphereExample.js index 57d71a53b6..2f21ea3db2 100644 --- a/examples/example/entities/zoneAtmosphereExample.js +++ b/examples/example/entities/zoneAtmosphereExample.js @@ -56,16 +56,6 @@ Script.update.connect(function(deltaTime) { print("newIntensity:" + newIntensity); Entities.editEntity(zoneEntityA, { - skyboxMode: "atmosphere", - atmosphere: { - center: { x: 1000, y: 0, z: 1000}, - innerRadius: 1000.0, - outerRadius: 1025.0, - rayleighScattering: 0.0025, - mieScattering: 0.0010, - scatteringWavelengths: { x: 0.650, y: 0.570, z: 0.475 }, - hasStars: false - }, stageHour: newHour, keyLightIntensity: newIntensity }); diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 5ee0dafce8..8c738fe366 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -432,7 +432,12 @@ void EntityTreeRenderer::render(RenderArgs::RenderMode renderMode, EnvironmentData data = _bestZone->getEnvironmentData(); glm::vec3 keyLightDirection = scene->getKeyLightDirection(); glm::vec3 inverseKeyLightDirection = keyLightDirection * -1.0f; - glm::vec3 keyLightLocation = _viewState->getAvatarPosition() + (inverseKeyLightDirection * data.getAtmosphereOuterRadius()); + + // NOTE: is this right? It seems like the "sun" should be based on the center of the + // atmosphere, not where the camera is. + glm::vec3 keyLightLocation = _viewState->getAvatarPosition() + + (inverseKeyLightDirection * data.getAtmosphereOuterRadius()); + data.setSunLocation(keyLightLocation); const float KEY_LIGHT_INTENSITY_TO_SUN_BRIGHTNESS_RATIO = 20.0f; diff --git a/libraries/entities/src/AtmospherePropertyGroup.cpp b/libraries/entities/src/AtmospherePropertyGroup.cpp index c59882791f..54e48023b8 100644 --- a/libraries/entities/src/AtmospherePropertyGroup.cpp +++ b/libraries/entities/src/AtmospherePropertyGroup.cpp @@ -47,13 +47,13 @@ void AtmospherePropertyGroup::copyFromScriptValue(const QScriptValue& object, bo void AtmospherePropertyGroup::debugDump() const { qDebug() << " AtmospherePropertyGroup: ---------------------------------------------"; - qDebug() << " Center:" << getCenter(); - qDebug() << " Inner Radius:" << getInnerRadius(); - qDebug() << " Outer Radius:" << getOuterRadius(); - qDebug() << " Mie Scattering:" << getMieScattering(); - qDebug() << " Rayleigh Scattering:" << getRayleighScattering(); - qDebug() << " Scattering Wavelengths:" << getScatteringWavelengths(); - qDebug() << " Has Stars:" << getHasStars(); + qDebug() << " Center:" << getCenter() << " has changed:" << centerChanged(); + qDebug() << " Inner Radius:" << getInnerRadius() << " has changed:" << innerRadiusChanged(); + qDebug() << " Outer Radius:" << getOuterRadius() << " has changed:" << outerRadiusChanged(); + qDebug() << " Mie Scattering:" << getMieScattering() << " has changed:" << mieScatteringChanged(); + qDebug() << " Rayleigh Scattering:" << getRayleighScattering() << " has changed:" << rayleighScatteringChanged(); + qDebug() << " Scattering Wavelengths:" << getScatteringWavelengths() << " has changed:" << scatteringWavelengthsChanged(); + qDebug() << " Has Stars:" << getHasStars() << " has changed:" << hasStarsChanged(); } bool AtmospherePropertyGroup::appentToEditPacket(OctreePacketData* packetData, diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 144bb28419..7613f1912c 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -257,11 +257,17 @@ QString EntityItemProperties::getSkyboxModeAsString() const { return QString(skyboxModeNames[SKYBOX_MODE_INHERIT]); } -void EntityItemProperties::setSkyboxModeFromString(const QString& shapeName) { +QString EntityItemProperties::getSkyboxModeString(SkyboxMode mode) { + if (mode < sizeof(skyboxModeNames) / sizeof(char *)) + return QString(skyboxModeNames[mode]); + return QString(skyboxModeNames[SKYBOX_MODE_INHERIT]); +} + +void EntityItemProperties::setSkyboxModeFromString(const QString& skyboxMode) { if (stringToSkyboxModeLookup.empty()) { buildStringToSkyboxModeLookup(); } - auto skyboxModeItr = stringToSkyboxModeLookup.find(shapeName.toLower()); + auto skyboxModeItr = stringToSkyboxModeLookup.find(skyboxMode.toLower()); if (skyboxModeItr != stringToSkyboxModeLookup.end()) { _skyboxMode = skyboxModeItr.value(); _skyboxModeChanged = true; @@ -518,11 +524,8 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object) { COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(stageAltitude, setStageAltitude); COPY_PROPERTY_FROM_QSCRIPTVALUE_INT(stageDay, setStageDay); COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(stageHour, setStageHour); - COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(skyboxMode, SkyboxMode); - _atmosphere.copyFromScriptValue(object, _defaultSettings); - _lastEdited = usecTimestampNow(); } diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 595329b4a6..95072f23a0 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -141,6 +141,8 @@ public: DEFINE_PROPERTY_GROUP(Atmosphere, atmosphere, AtmospherePropertyGroup); DEFINE_PROPERTY_REF_ENUM(PROP_SKYBOX_MODE, SkyboxMode, skyboxMode, SkyboxMode); + static QString getSkyboxModeString(SkyboxMode mode); + public: float getMaxDimension() const { return glm::max(_dimensions.x, _dimensions.y, _dimensions.z); } diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h index b8564f650f..aa4bd674cd 100644 --- a/libraries/entities/src/EntityItemPropertiesMacros.h +++ b/libraries/entities/src/EntityItemPropertiesMacros.h @@ -51,7 +51,6 @@ } \ } - #define READ_ENTITY_PROPERTY_QUAT(P,M) \ if (propertyFlags.getHasProperty(P)) { \ glm::quat fromBuffer; \ @@ -458,7 +457,7 @@ void set##N##Changed(bool value) { _##n##Changed = value; } \ private: \ T _##n; \ - bool _##n##Changed; + bool _##n##Changed = false; #define DEFINE_PROPERTY_REF(P, N, n, T) \ public: \ @@ -468,7 +467,7 @@ void set##N##Changed(bool value) { _##n##Changed = value; } \ private: \ T _##n; \ - bool _##n##Changed; + bool _##n##Changed = false; #define DEFINE_PROPERTY_REF_WITH_SETTER(P, N, n, T) \ public: \ diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index 69fad0c313..a6e11294b9 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -126,7 +126,6 @@ bool ZoneEntityItem::setProperties(const EntityItemProperties& properties) { SET_ENTITY_PROPERTY_FROM_PROPERTIES(stageHour, setStageHour); SET_ENTITY_PROPERTY_FROM_PROPERTIES(shapeType, updateShapeType); SET_ENTITY_PROPERTY_FROM_PROPERTIES(compoundShapeURL, setCompoundShapeURL); - SET_ENTITY_PROPERTY_FROM_PROPERTIES(skyboxMode, setSkyboxMode); bool somethingChangedInAtmosphere = _atmospherePropeties.setProperties(properties); @@ -150,7 +149,6 @@ bool ZoneEntityItem::setProperties(const EntityItemProperties& properties) { int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args, EntityPropertyFlags& propertyFlags, bool overwriteLocalData) { - int bytesRead = 0; const unsigned char* dataAt = data; @@ -166,13 +164,10 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, READ_ENTITY_PROPERTY(PROP_STAGE_HOUR, float, _stageHour); READ_ENTITY_PROPERTY_SETTER(PROP_SHAPE_TYPE, ShapeType, updateShapeType); READ_ENTITY_PROPERTY_STRING(PROP_COMPOUND_SHAPE_URL, setCompoundShapeURL); - READ_ENTITY_PROPERTY_SETTER(PROP_SKYBOX_MODE, SkyboxMode, setSkyboxMode); - bytesRead += _atmospherePropeties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args, propertyFlags, overwriteLocalData); - return bytesRead; } @@ -193,9 +188,7 @@ EntityPropertyFlags ZoneEntityItem::getEntityProperties(EncodeBitstreamParams& p requestedProperties += PROP_STAGE_HOUR; requestedProperties += PROP_SHAPE_TYPE; requestedProperties += PROP_COMPOUND_SHAPE_URL; - requestedProperties += PROP_SKYBOX_MODE; - requestedProperties += _atmospherePropeties.getEntityProperties(params); return requestedProperties; @@ -223,8 +216,7 @@ void ZoneEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBits APPEND_ENTITY_PROPERTY(PROP_STAGE_HOUR, appendValue, getStageHour()); APPEND_ENTITY_PROPERTY(PROP_SHAPE_TYPE, appendValue, (uint32_t)getShapeType()); APPEND_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, appendValue, getCompoundShapeURL()); - - APPEND_ENTITY_PROPERTY(PROP_SKYBOX_MODE, appendValue, (uint32_t)getShapeType()); // could this be a uint16?? + APPEND_ENTITY_PROPERTY(PROP_SKYBOX_MODE, appendValue, (uint32_t)getSkyboxMode()); // could this be a uint16?? _atmospherePropeties.appendSubclassData(packetData, params, modelTreeElementExtraEncodeData, requestedProperties, propertyFlags, propertiesDidntFit, propertyCount, appendState); @@ -247,7 +239,7 @@ void ZoneEntityItem::debugDump() const { qCDebug(entities) << " _stageAltitude:" << _stageAltitude; qCDebug(entities) << " _stageDay:" << _stageDay; qCDebug(entities) << " _stageHour:" << _stageHour; - qCDebug(entities) << " _skyboxMode:" << _skyboxMode; + qCDebug(entities) << " _skyboxMode:" << EntityItemProperties::getSkyboxModeString(_skyboxMode); _atmospherePropeties.debugDump(); } From 4422c63c791471c5fc705842b5b3e123585d73aa Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 4 May 2015 20:31:37 -0700 Subject: [PATCH 27/27] another sample for changing atmosphere properties --- .../entities/changingAtmosphereExample.js | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 examples/example/entities/changingAtmosphereExample.js diff --git a/examples/example/entities/changingAtmosphereExample.js b/examples/example/entities/changingAtmosphereExample.js new file mode 100644 index 0000000000..82689fa12b --- /dev/null +++ b/examples/example/entities/changingAtmosphereExample.js @@ -0,0 +1,69 @@ +// +// changingAtmosphereExample.js +// examples +// +// Created by Brad Hefta-Gaub on 4/16/15. +// Copyright 2015 High Fidelity, Inc. +// +// This is an example script that demonstrates creating a zone using the atmosphere features that changes scatter properties +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; + +var count = 0; +var stopAfter = 10000; + +var zoneEntityA = Entities.addEntity({ + type: "Zone", + position: { x: 1000, y: 1000, z: 1000}, + dimensions: { x: 2000, y: 2000, z: 2000 }, + keyLightColor: { red: 255, green: 0, blue: 0 }, + stageSunModelEnabled: false, + shapeType: "sphere", + skyboxMode: "atmosphere", + atmosphere: { + center: { x: 1000, y: 0, z: 1000}, + innerRadius: 1000.0, + outerRadius: 1025.0, + rayleighScattering: 0.0025, // Meaningful values 0 to ~0.01 + mieScattering: 0.0010, // Meaningful values 0 to ~0.01 + + // First two, Meaningful values 0 to 1 each, blue, purple; third meaningful 0.3 to 1 - affects shape + scatteringWavelengths: { x: 0.650, y: 0.570, z: 0.475 }, + hasStars: true + }, + stageLatitude: 37.777, + stageLongitude: 122.407, + stageAltitude: 0.03, + stageDay: 183, + stageHour: 5, + stageSunModelEnabled: true +}); + + +// register the call back so it fires before each data send +Script.update.connect(function(deltaTime) { + // stop it... + if (count >= stopAfter) { + print("calling Script.stop()"); + Script.stop(); + } + count++; + var rayleighScattering = (count / 100000) % 0.01; + var mieScattering = (count / 100000) % 0.01; + var waveX = (count / 2000) % 1; + var waveZ = ((count / 2000) % 0.7) + 0.3; + + Entities.editEntity(zoneEntityA, { + atmosphere: { + rayleighScattering: rayleighScattering, + mieScattering: mieScattering, + scatteringWavelengths: { x: waveX, y: waveX, z: waveZ } + }, + + }); +}); +