Merge lp://qastaging/~unity-team/nux/nux.fix-839476 into lp://qastaging/nux/2.0
Proposed by
Mirco Müller
| Status: | Rejected |
|---|---|
| Rejected by: | Mirco Müller |
| Proposed branch: | lp://qastaging/~unity-team/nux/nux.fix-839476 |
| Merge into: | lp://qastaging/nux/2.0 |
| Diff against target: |
409 lines (+316/-1) 4 files modified
NuxGraphics/GraphicsEngine.h (+43/-1) NuxGraphics/RenderingPipe.cpp (+22/-0) NuxGraphics/RenderingPipeAsm.cpp (+112/-0) NuxGraphics/RenderingPipeGLSL.cpp (+139/-0) |
| To merge this branch: | bzr merge lp://qastaging/~unity-team/nux/nux.fix-839476 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity Team | Pending | ||
|
Review via email:
|
|||
Description of the change
Added an rendering-method to allow masking out portions of an image-texture using the alpha-channel of a second texture. Both textures can be modulated by a color if needed.
To post a comment you must log in.
Revision history for this message
| Mirco Müller (macslow) wrote | # |
Unmerged revisions
- 587. By Mirco Müller
-
Needed to update a vertex- and fragment-program definition
- 586. By Mirco Müller
-
Re-merge with nux trunk
- 585. By Jay Taoko
-
* Fix to QRP_TexMaskTexAlpha shader in GLSL.
- 584. By Mirco Müller
-
Fixed stupid crash because of calling wrong shader-program. Renamed member for masking-shader.
- 583. By Mirco Müller
-
Added GLSL- and shader-assembly for QRP_TexMaskTexA
lpha() - 582. By Mirco Müller
-
Added a color-parameter to each texture for cases when you want to modulate the image-/
alpha-texture - 581. By Mirco Müller
-
Trying to implement new drawing method for rendering an image-textures masked by an alpha-texture
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Marked it as "Rejected" as we don't longer need this. A unity-only solution was found and implemented.