Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 02:03:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed haze init variables from the model namespace.

Browse source
This commit is contained in:
Nissim Hadar 2017-10-30 21:40:14 -07:00
parent 636f7858a3
commit 3ddf970be3
7 changed files with 90 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/CMakeLists.txt
View file

@ -1,4 +1,4 @@
set(TARGET_NAME entities)
setup_hifi_library(Network Script)
include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
link_hifi_libraries(shared networking octree avatars model gpu)
link_hifi_libraries(shared networking octree avatars model)

33
libraries/entities/src/HazePropertyGroup.h
View file

@ -21,14 +21,25 @@
#include "PropertyGroup.h"
#include "EntityItemPropertiesMacros.h"
#include <model/Haze.h>
class EntityItemProperties;
class EncodeBitstreamParams;
class OctreePacketData;
class EntityTreeElementExtraEncodeData;
class ReadBitstreamToTreeParams;
static const float initialHazeRange{ 1000.0f };
static const xColor initialHazeGlareColorXcolor{ 255, 229, 179 };
static const xColor initialHazeColorXcolor{ 128, 154, 179 };
static const float initialGlareAngle{ 20.0f };
static const float initialHazeBaseReference{ 0.0f };
static const float initialHazeHeight{ 200.0f };
static const float initialHazeBackgroundBlend{ 0.0f };
static const float initialHazeKeyLightRange{ 1000.0f };
static const float initialHazeKeyLightAltitude{ 200.0f };
class HazePropertyGroup : public PropertyGroup {
public:
// EntityItemProperty related helpers
@ -77,24 +88,24 @@ public:
bool& somethingChanged) override;
// Range only parameters
DEFINE_PROPERTY(PROP_HAZE_RANGE, HazeRange, hazeRange, float, model::Haze::initialHazeRange);
DEFINE_PROPERTY_REF(PROP_HAZE_COLOR, HazeColor, hazeColor, xColor, model::Haze::initialHazeColorXcolor);
DEFINE_PROPERTY_REF(PROP_HAZE_GLARE_COLOR, HazeGlareColor, hazeGlareColor, xColor, model::Haze::initialHazeGlareColorXcolor);
DEFINE_PROPERTY(PROP_HAZE_RANGE, HazeRange, hazeRange, float, initialHazeRange);
DEFINE_PROPERTY_REF(PROP_HAZE_COLOR, HazeColor, hazeColor, xColor, initialHazeColorXcolor);
DEFINE_PROPERTY_REF(PROP_HAZE_GLARE_COLOR, HazeGlareColor, hazeGlareColor, xColor, initialHazeGlareColorXcolor);
DEFINE_PROPERTY(PROP_HAZE_ENABLE_GLARE, HazeEnableGlare, hazeEnableGlare, bool, false);
DEFINE_PROPERTY_REF(PROP_HAZE_GLARE_ANGLE, HazeGlareAngle, hazeGlareAngle, float, model::Haze::initialGlareAngle);
DEFINE_PROPERTY_REF(PROP_HAZE_GLARE_ANGLE, HazeGlareAngle, hazeGlareAngle, float, initialGlareAngle);
// Altitude parameters
DEFINE_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, HazeAltitudeEffect, hazeAltitudeEffect, bool, false);
DEFINE_PROPERTY_REF(PROP_HAZE_CEILING, HazeCeiling, hazeCeiling, float, model::Haze::initialHazeBaseReference + model::Haze::initialHazeHeight);
DEFINE_PROPERTY_REF(PROP_HAZE_BASE_REF, HazeBaseRef, hazeBaseRef, float, model::Haze::initialHazeBaseReference);
DEFINE_PROPERTY_REF(PROP_HAZE_CEILING, HazeCeiling, hazeCeiling, float, initialHazeBaseReference + initialHazeHeight);
DEFINE_PROPERTY_REF(PROP_HAZE_BASE_REF, HazeBaseRef, hazeBaseRef, float, initialHazeBaseReference);
// Background (skybox) blend value
DEFINE_PROPERTY_REF(PROP_HAZE_BACKGROUND_BLEND, HazeBackgroundBlend, hazeBackgroundBlend, float, model::Haze::initialHazeBackgroundBlend);
DEFINE_PROPERTY_REF(PROP_HAZE_BACKGROUND_BLEND, HazeBackgroundBlend, hazeBackgroundBlend, float, initialHazeBackgroundBlend);
// hazeDirectional light attenuation
DEFINE_PROPERTY(PROP_HAZE_ATTENUATE_KEYLIGHT, HazeAttenuateKeyLight, hazeAttenuateKeyLight, bool, false);
DEFINE_PROPERTY_REF(PROP_HAZE_KEYLIGHT_RANGE, HazeKeyLightRange, hazeKeyLightRange, float, model::Haze::initialHazeKeyLightRange);
DEFINE_PROPERTY_REF(PROP_HAZE_KEYLIGHT_ALTITUDE, HazeKeyLightAltitude, hazeKeyLightAltitude, float, model::Haze::initialHazeKeyLightAltitude);
DEFINE_PROPERTY_REF(PROP_HAZE_KEYLIGHT_RANGE, HazeKeyLightRange, hazeKeyLightRange, float, initialHazeKeyLightRange);
DEFINE_PROPERTY_REF(PROP_HAZE_KEYLIGHT_ALTITUDE, HazeKeyLightAltitude, hazeKeyLightAltitude, float, initialHazeKeyLightAltitude);
};
#endif // hifi_HazePropertyGroup_h

1
libraries/entities/src/ZoneEntityItem.h
View file

@ -19,7 +19,6 @@
#include "HazePropertyGroup.h"
#include "StagePropertyGroup.h"
#include <ComponentMode.h>
#include <model/Haze.h>
class ZoneEntityItem : public EntityItem {
public:

26
libraries/model/src/model/Haze.cpp
View file

@ -14,29 +14,21 @@
using namespace model;
const float Haze::initialHazeRange{ 1000.0f };
const float Haze::initialHazeHeight{ 200.0f };
const float HazeInit::initialHazeRange{ 1000.0f };
const float HazeInit::initialHazeHeight{ 200.0f };
const float Haze::initialHazeKeyLightRange{ 1000.0f };
const float Haze::initialHazeKeyLightAltitude{ 200.0f };
const float HazeInit::initialHazeKeyLightRange{ 1000.0f };
const float HazeInit::initialHazeKeyLightAltitude{ 200.0f };
const float Haze::initialHazeBackgroundBlend{ 0.0f };
const float HazeInit::initialHazeBackgroundBlend{ 0.0f };
const glm::vec3 Haze::initialColorModulationFactor{
convertHazeRangeToHazeRangeFactor(initialHazeRange),
convertHazeRangeToHazeRangeFactor(initialHazeRange),
convertHazeRangeToHazeRangeFactor(initialHazeRange)
};
const glm::vec3 HazeInit::initialHazeColor{ 0.5f, 0.6f, 0.7f }; // Bluish
const glm::vec3 Haze::initialHazeColor{ 0.5f, 0.6f, 0.7f }; // Bluish
const xColor Haze::initialHazeColorXcolor{ 128, 154, 179 };
const float HazeInit::initialGlareAngle{ 20.0f };
const float Haze::initialGlareAngle{ 20.0f };
const glm::vec3 HazeInit::initialHazeGlareColor{ 1.0f, 0.9f, 0.7f };
const glm::vec3 Haze::initialHazeGlareColor{ 1.0f, 0.9f, 0.7f };
const xColor Haze::initialHazeGlareColorXcolor{ 255, 229, 179 };
const float Haze::initialHazeBaseReference{ 0.0f };
const float HazeInit::initialHazeBaseReference{ 0.0f };
Haze::Haze() {
Parameters parameters;

61
libraries/model/src/model/Haze.h
View file

@ -17,6 +17,26 @@
#include "Transform.h"
#include "NumericalConstants.h"
class HazeInit {
public:
// Initial values
static const float initialHazeRange;
static const float initialHazeHeight;
static const float initialHazeKeyLightRange;
static const float initialHazeKeyLightAltitude;
static const float initialHazeBackgroundBlend;
static const glm::vec3 initialHazeColor;
static const float initialGlareAngle;
static const glm::vec3 initialHazeGlareColor;
static const float initialHazeBaseReference;
};
namespace model {
const float LOG_P_005 = logf(0.05f);
const float LOG_P_05 = logf(0.5f);
@ -53,27 +73,6 @@ namespace model {
class Haze {
public:
// Initial values
static const float initialHazeRange;
static const float initialHazeHeight;
static const float initialHazeKeyLightRange;
static const float initialHazeKeyLightAltitude;
static const float initialHazeBackgroundBlend;
static const glm::vec3 initialColorModulationFactor;
static const glm::vec3 initialHazeColor;
static const xColor initialHazeColorXcolor;
static const float initialGlareAngle;
static const glm::vec3 initialHazeGlareColor;
static const xColor initialHazeGlareColorXcolor;
static const float initialHazeBaseReference;
using UniformBufferView = gpu::BufferView;
Haze();
@ -106,13 +105,13 @@ namespace model {
class Parameters {
public:
// DO NOT CHANGE ORDER HERE WITHOUT UNDERSTANDING THE std140 LAYOUT
glm::vec3 hazeColor{ initialHazeColor };
float hazeGlareBlend{ convertGlareAngleToPower(initialGlareAngle) };
glm::vec3 hazeColor{ HazeInit::initialHazeColor };
float hazeGlareBlend{ convertGlareAngleToPower(HazeInit::initialGlareAngle) };
glm::vec3 hazeGlareColor{ initialHazeGlareColor };
float hazeBaseReference{ initialHazeBaseReference };
glm::vec3 hazeGlareColor{ HazeInit::initialHazeGlareColor };
float hazeBaseReference{ HazeInit::initialHazeBaseReference };
glm::vec3 colorModulationFactor{ initialColorModulationFactor };
glm::vec3 colorModulationFactor;
int hazeMode{ 0 }; // bit 0 - set to activate haze attenuation of fragment color
// bit 1 - set to add the effect of altitude to the haze attenuation
// bit 2 - set to activate directional light attenuation mode
@ -121,14 +120,14 @@ namespace model {
glm::mat4 zoneTransform;
// Amount of background (skybox) to display, overriding the haze effect for the background
float hazeBackgroundBlend{ initialHazeBackgroundBlend };
float hazeBackgroundBlend{ HazeInit::initialHazeBackgroundBlend };
// The haze attenuation exponents used by both fragment and directional light attenuation
float hazeRangeFactor{ convertHazeRangeToHazeRangeFactor(initialHazeRange) };
float hazeHeightFactor{ convertHazeAltitudeToHazeAltitudeFactor(initialHazeHeight) };
float hazeRangeFactor{ convertHazeRangeToHazeRangeFactor(HazeInit::initialHazeRange) };
float hazeHeightFactor{ convertHazeAltitudeToHazeAltitudeFactor(HazeInit::initialHazeHeight) };
float hazeKeyLightRangeFactor{ convertHazeRangeToHazeRangeFactor(initialHazeKeyLightRange) };
float hazeKeyLightAltitudeFactor{ convertHazeAltitudeToHazeAltitudeFactor(initialHazeKeyLightAltitude) };
float hazeKeyLightRangeFactor{ convertHazeRangeToHazeRangeFactor(HazeInit::initialHazeKeyLightRange) };
float hazeKeyLightAltitudeFactor{ convertHazeAltitudeToHazeAltitudeFactor(HazeInit::initialHazeKeyLightAltitude) };
Parameters() {}
};

39
libraries/render-utils/src/DrawHaze.h
View file

@ -19,11 +19,10 @@
#include <gpu/Pipeline.h>
#include <render/Forward.h>
#include <render/DrawTask.h>
#include <model/Haze.h>
#include "SurfaceGeometryPass.h"
#include <model/Haze.h>
using LinearDepthFramebufferPointer = std::shared_ptr<LinearDepthFramebuffer>;
class MakeHazeConfig : public render::Job::Config {
@ -52,11 +51,11 @@ class MakeHazeConfig : public render::Job::Config {
public:
MakeHazeConfig() : render::Job::Config() {}
glm::vec3 hazeColor{ model::Haze::initialHazeColor };
float hazeGlareAngle{ model::Haze::initialGlareAngle };
glm::vec3 hazeColor{ HazeInit::initialHazeColor };
float hazeGlareAngle{ HazeInit::initialGlareAngle };
glm::vec3 hazeGlareColor{ model::Haze::initialHazeGlareColor };
float hazeBaseReference{ model::Haze::initialHazeBaseReference };
glm::vec3 hazeGlareColor{ HazeInit::initialHazeGlareColor };
float hazeBaseReference{ HazeInit::initialHazeBaseReference };
bool isHazeActive{ false };
bool isAltitudeBased{ false };
@ -64,13 +63,13 @@ public:
bool isModulateColorActive{ false };
bool isHazeEnableGlare{ false };
float hazeRange{ model::Haze::initialHazeRange };
float hazeHeight{ model::Haze::initialHazeHeight };
float hazeRange{ HazeInit::initialHazeRange };
float hazeHeight{ HazeInit::initialHazeHeight };
float hazeKeyLightRange{ model::Haze::initialHazeKeyLightRange };
float hazeKeyLightAltitude{ model::Haze::initialHazeKeyLightAltitude };
float hazeKeyLightRange{ HazeInit::initialHazeKeyLightRange };
float hazeKeyLightAltitude{ HazeInit::initialHazeKeyLightAltitude };
float hazeBackgroundBlend{ model::Haze::initialHazeBackgroundBlend };
float hazeBackgroundBlend{ HazeInit::initialHazeBackgroundBlend };
public slots:
void setHazeColor(const glm::vec3 value) { hazeColor = value; emit dirty(); }
@ -116,11 +115,11 @@ public:
HazeConfig() : render::Job::Config(true) {}
// attributes
glm::vec3 hazeColor{ model::Haze::initialHazeColor };
float hazeGlareAngle{ model::Haze::initialGlareAngle };
glm::vec3 hazeColor{ HazeInit::initialHazeColor };
float hazeGlareAngle{ HazeInit::initialGlareAngle };
glm::vec3 hazeGlareColor{ model::Haze::initialHazeGlareColor };
float hazeBaseReference{ model::Haze::initialHazeBaseReference };
glm::vec3 hazeGlareColor{ HazeInit::initialHazeGlareColor };
float hazeBaseReference{ HazeInit::initialHazeBaseReference };
bool isHazeActive{ false }; // Setting this to true will set haze to on
bool isAltitudeBased{ false };
@ -128,13 +127,13 @@ public:
bool isModulateColorActive{ false };
bool isHazeEnableGlare{ false };
float hazeRange{ model::Haze::initialHazeRange };
float hazeHeight{ model::Haze::initialHazeHeight };
float hazeRange{ HazeInit::initialHazeRange };
float hazeHeight{ HazeInit::initialHazeHeight };
float hazeKeyLightRange{ model::Haze::initialHazeKeyLightRange };
float hazeKeyLightAltitude{ model::Haze::initialHazeKeyLightAltitude };
float hazeKeyLightRange{ HazeInit::initialHazeKeyLightRange };
float hazeKeyLightAltitude{ HazeInit::initialHazeKeyLightAltitude };
float hazeBackgroundBlend{ model::Haze::initialHazeBackgroundBlend };
float hazeBackgroundBlend{ HazeInit::initialHazeBackgroundBlend };
// methods
void setHazeColor(const glm::vec3 value);

18
libraries/render-utils/src/HazeStage.h
View file

@ -106,11 +106,11 @@ class FetchHazeConfig : public render::Job::Config {
public:
FetchHazeConfig() : render::Job::Config() {}
glm::vec3 hazeColor{ model::Haze::initialHazeColor };
float hazeGlareAngle{ model::Haze::initialGlareAngle };
glm::vec3 hazeColor{ HazeInit::initialHazeColor };
float hazeGlareAngle{ HazeInit::initialGlareAngle };
glm::vec3 hazeGlareColor{ model::Haze::initialHazeGlareColor };
float hazeBaseReference{ model::Haze::initialHazeBaseReference };
glm::vec3 hazeGlareColor{ HazeInit::initialHazeGlareColor };
float hazeBaseReference{ HazeInit::initialHazeBaseReference };
bool isHazeActive{ false };
bool isAltitudeBased{ false };
@ -118,13 +118,13 @@ public:
bool isModulateColorActive{ false };
bool isHazeEnableGlare{ false };
float hazeRange{ model::Haze::initialHazeRange };
float hazeHeight{ model::Haze::initialHazeHeight };
float hazeRange{ HazeInit::initialHazeRange };
float hazeHeight{ HazeInit::initialHazeHeight };
float hazeKeyLightRange{ model::Haze::initialHazeKeyLightRange };
float hazeKeyLightAltitude{ model::Haze::initialHazeKeyLightAltitude };
float hazeKeyLightRange{ HazeInit::initialHazeKeyLightRange };
float hazeKeyLightAltitude{ HazeInit::initialHazeKeyLightAltitude };
float hazeBackgroundBlend{ model::Haze::initialHazeBackgroundBlend };
float hazeBackgroundBlend{ HazeInit::initialHazeBackgroundBlend };
public slots:
void setHazeColor(const glm::vec3 value) { hazeColor = value; emit dirty(); }