Merge lp://qastaging/~unity-team/nux/nux.redirected-views into lp://qastaging/nux
| Status: | Merged |
|---|---|
| Approved by: | Neil J. Patel |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 661 |
| Proposed branch: | lp://qastaging/~unity-team/nux/nux.redirected-views |
| Merge into: | lp://qastaging/nux |
| Diff against target: |
6727 lines (+2510/-1026) 96 files modified
Nux/AbstractCheckedButton.cpp (+1/-1) Nux/AbstractComboBox.cpp (+2/-2) Nux/AbstractComboBox.h (+2/-2) Nux/Area.cpp (+211/-25) Nux/Area.h (+113/-8) Nux/BaseWindow.h (+0/-1) Nux/BasicView.cpp (+46/-0) Nux/BasicView.h (+42/-0) Nux/Button.cpp (+25/-8) Nux/CheckBox.cpp (+0/-2) Nux/ClientArea.cpp (+74/-125) Nux/ClientArea.h (+0/-1) Nux/ColorEditor.cpp (+29/-53) Nux/ColorPreview.cpp (+1/-1) Nux/ComboBoxSimple.cpp (+1/-1) Nux/Coverflow.cpp (+3/-3) Nux/Coverflow.h (+1/-1) Nux/CoverflowItem.h (+1/-1) Nux/EditTextBox.cpp (+1/-1) Nux/FloatingWindow.cpp (+11/-11) Nux/FloatingWindow.h (+5/-5) Nux/GridHLayout.cpp (+1/-1) Nux/GridVLayout.cpp (+1/-1) Nux/GroupBox.h (+1/-1) Nux/GroupBox2.cpp (+1/-1) Nux/GroupBox2.h (+1/-1) Nux/HScrollBar.cpp (+4/-4) Nux/HScrollBar.h (+4/-4) Nux/HSplitter.cpp (+0/-20) Nux/HSplitter.h (+1/-1) Nux/InputArea.cpp (+4/-2) Nux/InputArea.h (+0/-2) Nux/LayeredLayout.cpp (+2/-7) Nux/Layout.cpp (+306/-63) Nux/Layout.h (+26/-9) Nux/LinearLayout.cpp (+3/-3) Nux/MainLoopGLib.cpp (+0/-1) Nux/Makefile.am (+3/-0) Nux/MenuBar.cpp (+5/-5) Nux/MenuBar.h (+1/-1) Nux/MouseAreaCtrl.cpp (+1/-1) Nux/MouseAreaCtrl.h (+1/-1) Nux/Nux.cpp (+1/-0) Nux/Nux.h (+5/-0) Nux/NuxTimerTickSource.h (+54/-0) Nux/PaintLayer.cpp (+9/-0) Nux/Painter.cpp (+42/-4) Nux/Painter.h (+7/-0) Nux/RGBValuator.cpp (+10/-21) Nux/RGBValuator.h (+9/-9) Nux/RadioButton.cpp (+1/-3) Nux/RangeValue.cpp (+1/-1) Nux/RangeValue.h (+1/-1) Nux/RangeValueInteger.cpp (+1/-1) Nux/RangeValueInteger.h (+1/-1) Nux/ScrollView.cpp (+0/-2) Nux/SpinBox_Logic.cpp (+2/-2) Nux/SpinBox_Logic.h (+2/-2) Nux/TabView.cpp (+3/-3) Nux/TabView.h (+3/-3) Nux/TextEntry.cpp (+6/-7) Nux/TextEntry.h (+1/-1) Nux/Theme.cpp (+1/-1) Nux/VScrollBar.cpp (+4/-4) Nux/VScrollBar.h (+4/-4) Nux/VSplitter.cpp (+0/-19) Nux/VSplitter.h (+1/-1) Nux/View.cpp (+290/-36) Nux/View.h (+22/-14) Nux/WindowCompositor.cpp (+12/-12) Nux/WindowCompositor.h (+0/-1) Nux/WindowThread.cpp (+0/-1) Nux/WindowThread.h (+0/-1) NuxCore/Animation.cpp (+3/-2) NuxCore/AnimationController.cpp (+1/-0) NuxCore/AnimationController.h (+6/-1) NuxCore/Color.cpp (+1/-1) NuxCore/EasingCurve.cpp (+14/-0) NuxCore/EasingCurve.h (+6/-0) NuxGraphics/GLWindowManager.cpp (+2/-2) NuxGraphics/GLWindowManager.h (+2/-2) NuxGraphics/GpuDevice.cpp (+27/-4) NuxGraphics/GpuDevice.h (+10/-1) NuxGraphics/GpuDeviceTexture.cpp (+11/-0) NuxGraphics/GraphicsDisplayWin.cpp (+233/-244) NuxGraphics/GraphicsDisplayWin.h (+32/-37) NuxGraphics/GraphicsDisplayX11.cpp (+54/-55) NuxGraphics/GraphicsDisplayX11.h (+13/-15) NuxGraphics/GraphicsEngine.cpp (+7/-0) NuxGraphics/GraphicsEngine.h (+38/-2) NuxGraphics/IOpenGLFrameBufferObject.cpp (+190/-90) NuxGraphics/IOpenGLFrameBufferObject.h (+24/-9) NuxGraphics/RenderingPipe.cpp (+32/-6) NuxGraphics/RenderingPipeAsm.cpp (+120/-0) NuxGraphics/RenderingPipeGLSL.cpp (+254/-18) configure.ac (+2/-1) |
| To merge this branch: | bzr merge lp://qastaging/~unity-team/nux/nux.redirected-views |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Neil J. Patel (community) | Approve | ||
|
Review via email:
|
|||
Commit message
This branch introduces "Redirected Views" in Nux. Redirected views allows a view to be rendered inside its own texture and that texture is latter composited inside the main rendering.
This branch contains the required changes for redirected views. The opportunty was also taken to fix minor issues and introduce API changes.
== Core of the Redirected View
Nux/Area.cpp
Nux/Area.h
Nux/Layout.cpp
Nux/Layout.h
Nux/View.cpp
Nux/View.h
== Fixed ClientArea to work with RedirectedViews
Nux/ClientAre
Nux/ClientArea.h
== Concrete implementation of a view to replace InputArea in some locations
Nux/BasicView.cpp
Nux/BasicView.h
== Nux.h contains the Feature.h file of Nux
Nux/Nux.h
== API change to frame buffer object architecture
NuxGraphics/
NuxGraphics/
== Added InitSlTexturePr
NuxGraphics/
NuxGraphics/
NuxGraphics/
NuxGraphics/
== Fixed texture inversion
NuxGraphics/
Description of the change
This branch introduces "Redirected Views" in Nux. Redirected views allows a view to be rendered inside its own texture and that texture is latter composited inside the main rendering.
This branch contains the required changes for redirected views. The opportunty was also taken to fix minor issues and introduce API changes.
== Core of the Redirected View
Nux/Area.cpp
Nux/Area.h
Nux/Layout.cpp
Nux/Layout.h
Nux/View.cpp
Nux/View.h
== Fixed ClientArea to work with RedirectedViews
Nux/ClientAre
Nux/ClientArea.h
== Concrete implementation of a view to replace InputArea in some locations
Nux/BasicView.cpp
Nux/BasicView.h
== Nux.h contains the Feature.h file of Nux
Nux/Nux.h
== API change to frame buffer object architecture
NuxGraphics/
NuxGraphics/
== Added InitSlTexturePr
NuxGraphics/
NuxGraphics/
NuxGraphics/
NuxGraphics/
== Fixed texture inversion
NuxGraphics/
Been testing this for over a week and works well. Diff is larger as there is API clean up too, but the guts aren't crazy and i've been over them a few times. Tests for the work are covered in the Unity branch that uses them (https:/