Merge lp:~unity-team/nux/nux.depth-texture-detection-support into lp:nux
| Status: | Merged |
|---|---|
| Approved by: | Jay Taoko on 2012-11-29 |
| Approved revision: | 724 |
| Merged at revision: | 726 |
| Proposed branch: | lp:~unity-team/nux/nux.depth-texture-detection-support |
| Merge into: | lp:nux |
| Diff against target: |
535 lines (+174/-64) 8 files modified
Nux/WindowCompositor.cpp (+28/-5) Nux/WindowCompositor.h (+3/-0) NuxGraphics/GpuDevice.cpp (+48/-19) NuxGraphics/GpuDevice.h (+3/-1) NuxGraphics/GpuDeviceTexture.cpp (+46/-10) NuxGraphics/GraphicsEngine.cpp (+15/-12) NuxGraphics/IOpenGLFrameBufferObject.cpp (+30/-17) NuxGraphics/IOpenGLFrameBufferObject.h (+1/-0) |
| To merge this branch: | bzr merge lp:~unity-team/nux/nux.depth-texture-detection-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Penhey (community) | 2012-11-16 | Approve on 2012-11-20 | |
| PS Jenkins bot | continuous-integration | Pending | |
|
Review via email:
|
|||
Commit Message
* Added depth texture support detection.
* Disable use of depth textures if support not available.
Description of the Change
* Added depth texture support detection.
* Disable use of depth textures if support not available.
- 709. By MC Return on 2012-11-18
-
Performance:
Check for emptiness instead of calculating the size as this might be inefficient.
xxxx.size() can take linear time while xxxx.empty() is guaranteed to take constant time.Approved by Michi Henning.
- 710. By MC Return on 2012-11-18
-
Performance: Do not create unnecessary string copies by converting const char* to std::string, instead use those directly.
Approved by Michi Henning.
- 711. By Michael Terry on 2012-11-19
-
Enable headless tests during build.
Approved by Didier Roche.
- 712. By Brandon Schaefer on 2012-11-20
-
Adds a input area proximity class which takes an input area and the proximity.
It has 3 signals, mouse_near, mouse_approaching, and mouse_beyond. They depend on the CheckMousePosition function. The default function expands each side of the InputArea by the proximity and checks if the mouse is within that geo. If true then emit mouse_near, if the mouse then is moved from that geo mouse_beyond will emit. (Some what like enter/leave). If the mouse is near, but not yet inside the input area then the mouse_approaching signal emits the mouses position and the distance to the input area. Fixes: https:/
/bugs.launchpad .net/bugs/ 608124. Approved by Jay Taoko, Marco Trevisan (Treviño).
- 713. By Tim Penhey on 2012-11-21
-
- Introducing improvements for ARM build.
- Resolved build failures
- Added --enable-x-support option
- Added --enable-minimal- build option [Tests] Covered by existing tests.
Approved by Brandon Schaefer, Jay Taoko.
- 714. By Ricardo Salveti on 2012-11-21
-
make check-headless should respect DEB_BUILD_
OPTIONS= nocheck
.Approved by Didier Roche.
- 715. By Brandon Schaefer on 2012-11-22
-
Check the position of mouse events for InputAreaProxim
ities if an event type is NUX_WINDOW_ MOUSE_LEAVE. Approved by Jay Taoko.
- 716. By Tim Penhey on 2012-11-22
-
Make tests/gtest-nuxcore only depend on NuxCore libs.
Approved by Brandon Schaefer.
- 717. By Michi Henning on 2012-11-23
-
Fixes random color generation (which left the green component always at zero) in RandomColorINT().
Approved by Michi Henning.
- 718. By Albert Astals Cid on 2012-11-23
-
Make GetPosition const.
Approved by Marco Trevisan (Treviño), Neil J. Patel.
- 719. By Michi Henning on 2012-11-24
-
Added unit test for RandomColor().
Approved by .
- 720. By Brandon Schaefer on 2012-11-24
-
Fixes multi monitor issue with input area prox.
Approved by Andrea Azzarone.
- 721. By Marco Trevisan (Treviño) on 2012-11-27
-
AnimationValue: add Reverse and CurrentTimePosition methods
The first allow to revert the "direction" of an animation, while the second returns the current elapsed time since the animation has started.
Approved by Tim Penhey.
- 722. By Daniel d'Andrada on 2012-11-27
-
Fix build when geis is located outside /usr.
Approved by Stephen M. Webb.
- 723. By Jay Taoko on 2012-11-27
-
* Merged with lp:nux
- 724. By Jay Taoko on 2012-11-28
-
* Fixed ARM build error [-Werror=
unused- but-set- variable]
| Sean Feole (sfeole) wrote : | # |
Last night I successfully installed and tested nux4.0 and unity 6.12 built by Lucasz (sil2100) in the unity-team/ppa targeted for Quantal. All of the packages appeared to work as expected.
If Jay is rebasing this patch to the nux trunk and I would be happy to retest once that finishes.

Looks ok to me.