Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 16:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed compilation errors with array initializations

Browse source
This commit is contained in:
Olivier Prat 2017-07-03 16:12:23 +02:00
parent d9a83539b2
commit 3fddac9f6e
2 changed files with 94 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
libraries/render-utils/src/FadeEffect.cpp
View file

@ -102,6 +102,86 @@ void FadeSwitchJob::distribute(const render::RenderContextPointer& renderContext
}
}
FadeCommonParameters::FadeCommonParameters() :
_durations{
30.0f, // ELEMENT_ENTER_LEAVE_DOMAIN
0.0f, // BUBBLE_ISECT_OWNER
0.0f, // BUBBLE_ISECT_TRESPASSER
3.0f, // USER_ENTER_LEAVE_DOMAIN
3.0f, // AVATAR_CHANGE
}
{
}
FadeJobConfig::FadeJobConfig() :
noiseSize{
{ 0.75f, 0.75f, 0.75f }, // ELEMENT_ENTER_LEAVE_DOMAIN
{ 0.4f, 0.4f, 0.4f }, // BUBBLE_ISECT_OWNER
{ 0.4f, 0.4f, 0.4f }, // BUBBLE_ISECT_TRESPASSER
{ 10.f, 0.01f, 10.0f }, // USER_ENTER_LEAVE_DOMAIN
{ 0.4f, 0.4f, 0.4f }, // AVATAR_CHANGE
},
noiseLevel{
1.0f, // ELEMENT_ENTER_LEAVE_DOMAIN
1.0f, // BUBBLE_ISECT_OWNER
1.0f, // BUBBLE_ISECT_TRESPASSER
0.70f, // USER_ENTER_LEAVE_DOMAIN
1.0f, // AVATAR_CHANGE
},
baseSize{
{ 1.0f, 1.0f, 1.0f }, // ELEMENT_ENTER_LEAVE_DOMAIN
{ 0.4f, 0.4f, 0.4f }, // BUBBLE_ISECT_OWNER
{ 0.4f, 0.4f, 0.4f }, // BUBBLE_ISECT_TRESPASSER
{ 10000.f, 1.0f, 10000.0f }, // USER_ENTER_LEAVE_DOMAIN
{ 0.4f, 0.4f, 0.4f }, // AVATAR_CHANGE
},
baseLevel{
0.0f, // ELEMENT_ENTER_LEAVE_DOMAIN
1.0f, // BUBBLE_ISECT_OWNER
1.0f, // BUBBLE_ISECT_TRESPASSER
1.0f, // USER_ENTER_LEAVE_DOMAIN
1.0f, // AVATAR_CHANGE
},
baseInverted{
false, // ELEMENT_ENTER_LEAVE_DOMAIN
false, // BUBBLE_ISECT_OWNER
false, // BUBBLE_ISECT_TRESPASSER
true, // USER_ENTER_LEAVE_DOMAIN
false, // AVATAR_CHANGE
},
_duration{
4.0f, // ELEMENT_ENTER_LEAVE_DOMAIN
0.0f, // BUBBLE_ISECT_OWNER
0.0f, // BUBBLE_ISECT_TRESPASSER
3.0f, // USER_ENTER_LEAVE_DOMAIN
3.0f, // AVATAR_CHANGE
},
edgeWidth{
0.10f, // ELEMENT_ENTER_LEAVE_DOMAIN
0.10f, // BUBBLE_ISECT_OWNER
0.10f, // BUBBLE_ISECT_TRESPASSER
0.529f, // USER_ENTER_LEAVE_DOMAIN
0.05f, // AVATAR_CHANGE
},
edgeInnerColor{
{ 78.f / 255.f, 215.f / 255.f, 255.f / 255.f, 0.0f }, // ELEMENT_ENTER_LEAVE_DOMAIN
{ 31.f / 255.f, 198.f / 255.f, 166.f / 255.f, 1.0f }, // BUBBLE_ISECT_OWNER
{ 1.0f, 1.0f, 1.0f, 1.0f }, // BUBBLE_ISECT_TRESPASSER
{ 78.f / 255.f, 215.f / 255.f, 255.f / 255.f, 0.25f }, // USER_ENTER_LEAVE_DOMAIN
{ 1.0f, 1.0f, 1.0f, 1.0f }, // AVATAR_CHANGE
},
edgeOuterColor{
{ 78.f / 255.f, 215.f / 255.f, 255.f / 255.f, 1.0f }, // ELEMENT_ENTER_LEAVE_DOMAIN
{ 31.f / 255.f, 198.f / 255.f, 166.f / 255.f, 1.0f }, // BUBBLE_ISECT_OWNER
{ 1.0f, 1.0f, 1.0f, 1.0f }, // BUBBLE_ISECT_TRESPASSER
{ 78.f / 255.f, 215.f / 255.f, 255.f / 255.f, 1.0f }, // USER_ENTER_LEAVE_DOMAIN
{ 1.0f, 1.0f, 1.0f, 1.0f }, // AVATAR_CHANGE
}
{
}
void FadeJobConfig::setEditedCategory(int value) {
assert(value < EVENT_CATEGORY_COUNT);
editedCategory = std::min<int>(EVENT_CATEGORY_COUNT, value);

84
libraries/render-utils/src/FadeEffect.h
View file

@ -68,6 +68,8 @@ public:
EVENT_CATEGORY_COUNT
};
FadeJobConfig();
void setEditedCategory(int value);
void setDuration(float value);
@ -130,69 +132,15 @@ public:
bool manualFade{ false };
float manualThreshold{ 0.f };
int editedCategory{ ELEMENT_ENTER_LEAVE_DOMAIN };
glm::vec3 noiseSize[EVENT_CATEGORY_COUNT]{
{ 0.75f, 0.75f, 0.75f }, // ELEMENT_ENTER_LEAVE_DOMAIN
{ 0.4f, 0.4f, 0.4f }, // BUBBLE_ISECT_OWNER
{ 0.4f, 0.4f, 0.4f }, // BUBBLE_ISECT_TRESPASSER
{ 10.f, 0.01f, 10.0f }, // USER_ENTER_LEAVE_DOMAIN
{ 0.4f, 0.4f, 0.4f }, // AVATAR_CHANGE
};
float noiseLevel[EVENT_CATEGORY_COUNT]{
1.0f, // ELEMENT_ENTER_LEAVE_DOMAIN
1.0f, // BUBBLE_ISECT_OWNER
1.0f, // BUBBLE_ISECT_TRESPASSER
0.70f, // USER_ENTER_LEAVE_DOMAIN
1.0f, // AVATAR_CHANGE
};
glm::vec3 baseSize[EVENT_CATEGORY_COUNT]{
{ 1.0f, 1.0f, 1.0f }, // ELEMENT_ENTER_LEAVE_DOMAIN
{ 0.4f, 0.4f, 0.4f }, // BUBBLE_ISECT_OWNER
{ 0.4f, 0.4f, 0.4f }, // BUBBLE_ISECT_TRESPASSER
{ 10000.f, 1.0f, 10000.0f }, // USER_ENTER_LEAVE_DOMAIN
{ 0.4f, 0.4f, 0.4f }, // AVATAR_CHANGE
};
float baseLevel[EVENT_CATEGORY_COUNT]{
0.0f, // ELEMENT_ENTER_LEAVE_DOMAIN
1.0f, // BUBBLE_ISECT_OWNER
1.0f, // BUBBLE_ISECT_TRESPASSER
1.0f, // USER_ENTER_LEAVE_DOMAIN
1.0f, // AVATAR_CHANGE
};
bool baseInverted[EVENT_CATEGORY_COUNT]{
false, // ELEMENT_ENTER_LEAVE_DOMAIN
false, // BUBBLE_ISECT_OWNER
false, // BUBBLE_ISECT_TRESPASSER
true, // USER_ENTER_LEAVE_DOMAIN
false, // AVATAR_CHANGE
};
float _duration[EVENT_CATEGORY_COUNT]{
4.0f, // ELEMENT_ENTER_LEAVE_DOMAIN
0.0f, // BUBBLE_ISECT_OWNER
0.0f, // BUBBLE_ISECT_TRESPASSER
3.0f, // USER_ENTER_LEAVE_DOMAIN
3.0f, // AVATAR_CHANGE
};
float edgeWidth[EVENT_CATEGORY_COUNT]{
0.10f, // ELEMENT_ENTER_LEAVE_DOMAIN
0.10f, // BUBBLE_ISECT_OWNER
0.10f, // BUBBLE_ISECT_TRESPASSER
0.529f, // USER_ENTER_LEAVE_DOMAIN
0.05f, // AVATAR_CHANGE
};
glm::vec4 edgeInnerColor[EVENT_CATEGORY_COUNT]{
{ 78.f / 255.f, 215.f / 255.f, 255.f / 255.f, 0.0f }, // ELEMENT_ENTER_LEAVE_DOMAIN
{ 31.f / 255.f, 198.f / 255.f, 166.f / 255.f, 1.0f }, // BUBBLE_ISECT_OWNER
{ 1.0f, 1.0f, 1.0f, 1.0f }, // BUBBLE_ISECT_TRESPASSER
{ 78.f / 255.f, 215.f / 255.f, 255.f / 255.f, 0.25f }, // USER_ENTER_LEAVE_DOMAIN
{ 1.0f, 1.0f, 1.0f, 1.0f }, // AVATAR_CHANGE
};
glm::vec4 edgeOuterColor[EVENT_CATEGORY_COUNT]{
{ 78.f / 255.f, 215.f / 255.f, 255.f / 255.f, 1.0f }, // ELEMENT_ENTER_LEAVE_DOMAIN
{ 31.f / 255.f, 198.f / 255.f, 166.f / 255.f, 1.0f }, // BUBBLE_ISECT_OWNER
{ 1.0f, 1.0f, 1.0f, 1.0f }, // BUBBLE_ISECT_TRESPASSER
{ 78.f / 255.f, 215.f / 255.f, 255.f / 255.f, 1.0f }, // USER_ENTER_LEAVE_DOMAIN
{ 1.0f, 1.0f, 1.0f, 1.0f }, // AVATAR_CHANGE
};
glm::vec3 noiseSize[EVENT_CATEGORY_COUNT];
float noiseLevel[EVENT_CATEGORY_COUNT];
glm::vec3 baseSize[EVENT_CATEGORY_COUNT];
float baseLevel[EVENT_CATEGORY_COUNT];
bool baseInverted[EVENT_CATEGORY_COUNT];
float _duration[EVENT_CATEGORY_COUNT];
float edgeWidth[EVENT_CATEGORY_COUNT];
glm::vec4 edgeInnerColor[EVENT_CATEGORY_COUNT];
glm::vec4 edgeOuterColor[EVENT_CATEGORY_COUNT];
signals:
void dirty();
@ -204,18 +152,14 @@ struct FadeCommonParameters
{
using Pointer = std::shared_ptr<FadeCommonParameters>;
FadeCommonParameters();
bool _isEditEnabled{ false };
bool _isManualThresholdEnabled{ false };
float _manualThreshold{ 0.f };
float _thresholdScale[FadeJobConfig::EVENT_CATEGORY_COUNT];
int _editedCategory{ FadeJobConfig::ELEMENT_ENTER_LEAVE_DOMAIN };
float _durations[FadeJobConfig::EVENT_CATEGORY_COUNT]{
30.0f, // ELEMENT_ENTER_LEAVE_DOMAIN
0.0f, // BUBBLE_ISECT_OWNER
0.0f, // BUBBLE_ISECT_TRESPASSER
3.0f, // USER_ENTER_LEAVE_DOMAIN
3.0f, // AVATAR_CHANGE
};
float _durations[FadeJobConfig::EVENT_CATEGORY_COUNT];
};
class FadeSwitchJob {