diff options
Diffstat (limited to 'src/Runtime/Source/runtimerender/graphobjects')
10 files changed, 22 insertions, 21 deletions
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp index 06f3649a..e18a84d2 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp @@ -36,15 +36,15 @@ SDefaultMaterial::SDefaultMaterial() , m_IblProbe(NULL) , m_Lighting(DefaultMaterialLighting::VertexLighting) , m_BlendMode(DefaultMaterialBlendMode::Normal) - , m_DiffuseColor(1, 1, 1) + , m_DiffuseColor(1, 1, 1, 1) , m_EmissivePower(0) , m_EmissiveMap(NULL) , m_EmissiveMap2(NULL) - , m_EmissiveColor(1, 1, 1) + , m_EmissiveColor(1, 1, 1, 1) , m_SpecularReflection(NULL) , m_SpecularMap(NULL) , m_SpecularModel(DefaultMaterialSpecularModel::Default) - , m_SpecularTint(1, 1, 1) + , m_SpecularTint(1, 1, 1, 1) , m_IOR(.2f) , m_FresnelPower(0.0f) , m_SpecularAmount(0) diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h index 09595236..48c8d0ba 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h @@ -80,16 +80,16 @@ namespace render { SImage *m_IblProbe; DefaultMaterialLighting::Enum m_Lighting; // defaults to vertex DefaultMaterialBlendMode::Enum m_BlendMode; // defaults to normal - QT3DSVec3 m_DiffuseColor; // colors are 0-1 normalized + QT3DSVec4 m_DiffuseColor; // colors are 0-1 normalized SImage *m_DiffuseMaps[3]; QT3DSF32 m_EmissivePower; // 0-100, defaults to 0 - QT3DSVec3 m_EmissiveColor; + QT3DSVec4 m_EmissiveColor; SImage *m_EmissiveMap; SImage *m_EmissiveMap2; SImage *m_SpecularReflection; SImage *m_SpecularMap; DefaultMaterialSpecularModel::Enum m_SpecularModel; - QT3DSVec3 m_SpecularTint; + QT3DSVec4 m_SpecularTint; QT3DSF32 m_IOR; QT3DSF32 m_FresnelPower; QT3DSF32 m_SpecularAmount; // 0-??, defaults to 0 diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.cpp index ee146624..36a826cb 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.cpp +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.cpp @@ -41,7 +41,7 @@ SLayer::SLayer() , m_ProgressiveAAMode(AAModeValues::NoAA) , m_MultisampleAAMode(AAModeValues::NoAA) , m_Background(LayerBackground::Transparent) - , m_ClearColor(0) + , m_ClearColor(0.0f) , m_BlendType(LayerBlendTypes::Normal) , m_HorizontalFieldValues(HorizontalFieldValues::LeftWidth) , m_Left(0) diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.h index 3759fe12..5c08e917 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.h +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.h @@ -125,7 +125,7 @@ namespace render { AAModeValues::Enum m_ProgressiveAAMode; AAModeValues::Enum m_MultisampleAAMode; LayerBackground::Enum m_Background; - QT3DSVec3 m_ClearColor; + QT3DSVec4 m_ClearColor; LayerBlendTypes::Enum m_BlendType; diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.cpp index 3b45e8c9..5c983243 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.cpp +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.cpp @@ -35,9 +35,9 @@ SLight::SLight() : SNode(GraphObjectTypes::Light) , m_LightType(RenderLightTypes::Directional) , m_Scope(NULL) - , m_DiffuseColor(1, 1, 1) - , m_SpecularColor(1, 1, 1) - , m_AmbientColor(0, 0, 0) + , m_DiffuseColor(1, 1, 1, 1) + , m_SpecularColor(1, 1, 1, 1) + , m_AmbientColor(0, 0, 0, 1) , m_Brightness(100) , m_LinearFade(0) , m_ExponentialFade(0) diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.h index 549e3e26..10f2b866 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.h +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.h @@ -51,9 +51,9 @@ namespace render { { RenderLightTypes::Enum m_LightType; // Directional SNode *m_Scope; - QT3DSVec3 m_DiffuseColor; // colors are 0-1 normalized - QT3DSVec3 m_SpecularColor; // colors are 0-1 normalized - QT3DSVec3 m_AmbientColor; // colors are 0-1 normalized + QT3DSVec4 m_DiffuseColor; // colors are 0-1 normalized + QT3DSVec4 m_SpecularColor; // colors are 0-1 normalized + QT3DSVec4 m_AmbientColor; // colors are 0-1 normalized // The variables below are in the same range as Studio // Only valid if node is a point light diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.cpp index 8d206e69..7917bd7a 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.cpp +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.cpp @@ -39,7 +39,7 @@ SScene::SScene() : SGraphObject(GraphObjectTypes::Scene) , m_Presentation(NULL) , m_FirstChild(NULL) - , m_ClearColor(0, 0, 0) + , m_ClearColor(0.0f) , m_UseClearColor(true) , m_Dirty(true) { @@ -91,6 +91,7 @@ void SScene::Render(const QT3DSVec2 &inViewportDimensions, IQt3DSRenderContext & clearColor.x = m_ClearColor.x; clearColor.y = m_ClearColor.y; clearColor.z = m_ClearColor.z; + clearColor.w = m_ClearColor.w; } // Maybe clear and reset to previous clear color after we leave. qt3ds::render::NVRenderContextScopedProperty<QT3DSVec4> __clearColor( @@ -106,7 +107,7 @@ void SScene::Render(const QT3DSVec2 &inViewportDimensions, IQt3DSRenderContext & void SScene::RenderWithClear(const QT3DSVec2 &inViewportDimensions, IQt3DSRenderContext &inContext, RenderClearCommand inClearColorBuffer, - QT3DSVec3 inClearColor, + QT3DSVec4 inClearColor, const SRenderInstanceId id) { // If this scene is not using clear color, we set the color diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.h index 57887199..8c4d3fec 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.h +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.h @@ -31,7 +31,7 @@ #ifndef QT3DS_RENDER_SCENE_H #define QT3DS_RENDER_SCENE_H #include "Qt3DSRender.h" -#include "foundation/Qt3DSVec3.h" +#include "foundation/Qt3DSVec4.h" #include "Qt3DSRenderGraphObject.h" namespace qt3ds { @@ -44,7 +44,7 @@ namespace render { { SPresentation *m_Presentation; SLayer *m_FirstChild; - QT3DSVec3 m_ClearColor; + QT3DSVec4 m_ClearColor; bool m_UseClearColor; bool m_Dirty; @@ -76,7 +76,7 @@ namespace render { const SRenderInstanceId id = nullptr); void RenderWithClear(const QT3DSVec2 &inViewportDimensions, IQt3DSRenderContext &inContext, RenderClearCommand inClearColorBuffer, - QT3DSVec3 inclearColor, const SRenderInstanceId id = nullptr); + QT3DSVec4 inclearColor, const SRenderInstanceId id = nullptr); }; } } diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp index e4694c56..b76240b4 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp @@ -59,7 +59,7 @@ STextRenderInfo::~STextRenderInfo() SText::SText() : SNode(GraphObjectTypes::Text) - , m_TextColor(1, 1, 1) + , m_TextColor(1, 1, 1, 1) , m_TextTexture(NULL) { m_Bounds.setEmpty(); diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.h index 56a2a9bf..13f5748a 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.h +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.h @@ -44,7 +44,7 @@ namespace render { // For these you need to set TextDirty. // These properties can change every frame with no additional cost. - QT3DSVec3 m_TextColor; + QT3DSVec4 m_TextColor; // Setup and utilized by the rendering system NVRenderTexture2D *m_TextTexture; STextTextureDetails m_TextTextureDetails; |