diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2017-10-13 11:42:45 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-10-24 13:23:14 +0000 |
| commit | a0ee8e091ee53ec1c52ab71fbf7334657182a336 (patch) | |
| tree | a911b9af3118632735e18f448d5d28290ba37ce0 /src/Authoring/Studio/Render/StudioWidget.cpp | |
| parent | 544204f17381e6e6ae025388ed4ee2d0cfd22b06 (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/StudioWidget.cpp')
| -rw-r--r-- | src/Authoring/Studio/Render/StudioWidget.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Authoring/Studio/Render/StudioWidget.cpp b/src/Authoring/Studio/Render/StudioWidget.cpp index d37341da..01331b3e 100644 --- a/src/Authoring/Studio/Render/StudioWidget.cpp +++ b/src/Authoring/Studio/Render/StudioWidget.cpp @@ -34,7 +34,7 @@ #include "foundation/Qt3DSContainers.h" #include "UICRenderShaderCodeGeneratorV2.h" -using namespace uic::widgets; +using namespace qt3ds::widgets; void IStudioWidget::CreateRect(QT3DSVec3 rectStart, QT3DSVec3 rectEnd, QT3DSVec3 orth1, QT3DSF32 axisHalfWidth, QT3DSF32 inColorIndex, TResultVecType &outResult) @@ -241,12 +241,12 @@ NVRenderShaderProgram *IStudioWidget::CreateWidgetShader(IRenderWidgetContext &i NVRenderShaderProgram *retval = inWidgetContext.GetShader(theSharedName); if (retval) return retval; - uic::render::IShaderProgramGenerator &theGenerator(inWidgetContext.GetProgramGenerator()); + 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_index", "float"); theVertexGenerator.AddOutgoing("output_color_index", "float"); @@ -278,12 +278,12 @@ NVRenderShaderProgram *IStudioWidget::CreateWidgetPickShader(IRenderWidgetContex NVRenderShaderProgram *retval = inWidgetContext.GetShader(theSharedName); if (retval) return retval; - uic::render::IShaderProgramGenerator &theGenerator(inWidgetContext.GetProgramGenerator()); + 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.AddUniform("model_view_projection", "mat4"); theVertexGenerator.Append("void main() {"); |