summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Render/StudioWidgetImpl.h
diff options
context:
space:
mode:
authorMäättä Antti <antti.maatta@qt.io>2017-10-13 11:42:45 +0300
committerAntti Määttä <antti.maatta@qt.io>2017-10-24 13:23:14 +0000
commita0ee8e091ee53ec1c52ab71fbf7334657182a336 (patch)
treea911b9af3118632735e18f448d5d28290ba37ce0 /src/Authoring/Studio/Render/StudioWidgetImpl.h
parent544204f17381e6e6ae025388ed4ee2d0cfd22b06 (diff)
Replace uic namespace with qt3ds namespace
Task-number: QT3DS-18 Change-Id: I3a39265bb47930e4f4924aab4b098a40f15c5b0a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Render/StudioWidgetImpl.h')
-rw-r--r--src/Authoring/Studio/Render/StudioWidgetImpl.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Authoring/Studio/Render/StudioWidgetImpl.h b/src/Authoring/Studio/Render/StudioWidgetImpl.h
index a00f4fcd..15b8ae14 100644
--- a/src/Authoring/Studio/Render/StudioWidgetImpl.h
+++ b/src/Authoring/Studio/Render/StudioWidgetImpl.h
@@ -37,7 +37,7 @@
#include "UICRenderNode.h"
#include "UICRenderShaderCodeGeneratorV2.h"
-namespace uic {
+namespace qt3ds {
namespace widgets {
typedef nvvector<QT3DSVec4> TResultVecType;
@@ -116,9 +116,9 @@ namespace widgets {
}
StudioWidgetTypes::Enum GetWidgetType() const override { return TWidgetType; }
- uic::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) override
+ qt3ds::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) override
{
- return uic::studio::SWidgetPick((QT3DSI32)inPickIndex);
+ return qt3ds::studio::SWidgetPick((QT3DSI32)inPickIndex);
}
void SetupRender(IRenderWidgetContext &inWidgetContext, NVRenderContext &inRenderContext)
@@ -264,13 +264,13 @@ namespace widgets {
m_ImmediateShader = inWidgetContext.GetShader(theShaderName);
if (m_ImmediateShader == nullptr) {
- uic::render::IShaderProgramGenerator &theGenerator(
+ qt3ds::render::IShaderProgramGenerator &theGenerator(
inWidgetContext.GetProgramGenerator());
theGenerator.BeginProgram();
- uic::render::IShaderStageGenerator &theVertexGenerator(
- *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Vertex));
- uic::render::IShaderStageGenerator &theFragmentGenerator(
- *theGenerator.GetStage(uic::render::ShaderGeneratorStages::Fragment));
+ qt3ds::render::IShaderStageGenerator &theVertexGenerator(
+ *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Vertex));
+ qt3ds::render::IShaderStageGenerator &theFragmentGenerator(
+ *theGenerator.GetStage(qt3ds::render::ShaderGeneratorStages::Fragment));
theVertexGenerator.AddIncoming("attr_pos", "vec3");
theVertexGenerator.AddIncoming("attr_color", "vec4");
theVertexGenerator.AddUniform("model_view_projection", "mat4");