~haggai-eran/nux/rtl-rebased

« back to all changes in this revision

Viewing changes to Nux/Painter.cpp

Committer: Jay Taoko
Date: 2011-10-21 23:49:15 UTC
mfrom: (508.1.2 nux-20)
Revision ID: jay.taoko@canonical.com-20111021234915-hnzakb5ndebica8i

* Removed custom Nux types: t_u32, t_s32, t_bool, ...

files modified:
Nux/ClientArea.cpp

Nux/EditTextBox.h

Nux/GridHLayout.cpp

Nux/GridHLayout.h

Nux/GridVLayout.cpp

Nux/HLayout.cpp

Nux/HLayout.h

Nux/HSplitter.cpp

Nux/HSplitter.h

Nux/KeyboardHandler.cpp

Nux/KeyboardHandler.h

Nux/LayeredLayout.cpp

Nux/MenuBar.cpp

Nux/MenuPage.cpp

Nux/Nux.cpp

Nux/Nux.h

Nux/PaintLayer.cpp

Nux/Painter.cpp

Nux/StaticText.cpp

Nux/StaticTextBox.h

Nux/SystemThread.cpp

Nux/TabView.cpp

Nux/TextEntry.cpp

Nux/TextEntry.h

Nux/Theme.cpp

Nux/TimerProc.cpp

Nux/TimerProc.h

Nux/VLayout.cpp

Nux/VLayout.h

Nux/VSplitter.cpp

Nux/VSplitter.h

Nux/WindowCompositor.cpp

Nux/WindowThread.cpp

Nux/WindowThread.h

NuxCore/CPU.cpp

NuxCore/CPU.h

NuxCore/CRC32.cpp

NuxCore/CRC32.h

NuxCore/Character/NAscii.cpp

NuxCore/Character/NUTF.cpp

NuxCore/Character/NUTF.h

NuxCore/Character/NUnicodeGNU.h

NuxCore/Color.cpp

NuxCore/FileIO.cpp

NuxCore/FileManager/NFileManagerGNU.cpp

NuxCore/FileManager/NFileManagerGNU.h

NuxCore/FileManager/NFileManagerGeneric.cpp

NuxCore/FileManager/NFileManagerGeneric.h

NuxCore/FileManager/NFileManagerStandardAnsi.cpp

NuxCore/FileManager/NFileManagerStandardAnsi.h

NuxCore/FileManager/NFileManagerWindows.cpp

NuxCore/FileManager/NFileManagerWindows.h

NuxCore/FileManager/NSerializer.cpp

NuxCore/FileManager/NSerializer.h

NuxCore/FileName.cpp

NuxCore/FilePath.cpp

NuxCore/Math/Bezier.cpp

NuxCore/Math/Bezier.h

NuxCore/Math/Complex.cpp

NuxCore/Math/Complex.h

NuxCore/Math/MathFunctions.cpp

NuxCore/Math/MathFunctions.h

NuxCore/Math/MathUtility.h

NuxCore/Math/Matrix2.h

NuxCore/Math/Matrix3.h

NuxCore/Math/Matrix4.h

NuxCore/Math/Vector2.h

NuxCore/Math/Vector3.h

NuxCore/Math/Vector4.h

NuxCore/Memory.cpp

NuxCore/Memory.h

NuxCore/NUniqueIndex.cpp

NuxCore/NUniqueIndex.h

NuxCore/NumberConversion.cpp

NuxCore/NumberConversion.h

NuxCore/NuxCore.cpp

NuxCore/NuxCore.h

NuxCore/OutputDevice.cpp

NuxCore/Parsing.cpp

NuxCore/Parsing.h

NuxCore/Platform.cpp

NuxCore/Platform.h

NuxCore/SystemTypes.h

NuxCore/TextString.cpp

NuxCore/TextString.h

NuxCore/ThreadGNU.cpp

NuxCore/ThreadGNU.h

NuxCore/ThreadWin.cpp

NuxCore/ThreadWin.h

NuxCore/TimeFunctions.cpp

NuxCore/TimeFunctions.h

NuxCore/TinyXML/tinystr.cpp

NuxCore/Win32Dialogs/NWin32Clipboard.cpp

NuxCore/Win32Dialogs/NWin32CustomDialog.cpp

NuxCore/Win32Dialogs/NWin32CustomDialog.h

NuxCore/Win32Dialogs/NWin32MessageBox.cpp

NuxGraphics/FontTexture.h

NuxGraphics/GLDeviceObjects.cpp

NuxGraphics/GLRenderStates.cpp

NuxGraphics/GLRenderStates.h

NuxGraphics/GLResourceManager.cpp

NuxGraphics/GLTemplatePrimitiveBuffer.cpp

NuxGraphics/GLTextureResourceManager.cpp

NuxGraphics/GpuDevice.cpp

NuxGraphics/GpuDevice.h

NuxGraphics/GpuDeviceTexture.cpp

NuxGraphics/GpuDeviceVertex.cpp

NuxGraphics/GraphicsDisplayWin.cpp

NuxGraphics/GraphicsDisplayWin.h

NuxGraphics/GraphicsDisplayX11.cpp

NuxGraphics/GraphicsEngine.cpp

NuxGraphics/GraphicsEngine.h

NuxGraphics/IOpenGLAnimatedTexture.cpp

NuxGraphics/IOpenGLAnimatedTexture.h

NuxGraphics/IOpenGLAsmShader.cpp

NuxGraphics/IOpenGLAsmShader.h

NuxGraphics/IOpenGLBaseTexture.cpp

NuxGraphics/IOpenGLBaseTexture.h

NuxGraphics/IOpenGLGLSLShader.cpp

NuxGraphics/IOpenGLIndexBuffer.cpp

NuxGraphics/IOpenGLIndexBuffer.h

NuxGraphics/IOpenGLPixelBufferOject.cpp

NuxGraphics/IOpenGLPixelBufferOject.h

NuxGraphics/IOpenGLQuery.cpp

NuxGraphics/IOpenGLQuery.h

NuxGraphics/IOpenGLVertexBuffer.cpp

NuxGraphics/IOpenGLVertexBuffer.h

NuxGraphics/IOpenGLVolumeTexture.cpp

NuxGraphics/RenderingPipe.cpp

NuxGraphics/RenderingPipe.h

NuxGraphics/RunTimeStats.cpp

NuxGraphics/RunTimeStats.h

NuxImage/Bmp.cpp

NuxImage/DDS.cpp

NuxImage/ImageSurface.cpp

NuxImage/ImageSurface.h

NuxImage/NAnimatedTexture.cpp

NuxImage/NITX.cpp

NuxImage/NITX.h

NuxImage/NPng.cpp

NuxImage/RGBE.cpp

NuxImage/Tga.cpp

Show diffs side-by-side

added added

removed removed

Nux/Painter.cpp

442

int border_top = pimage->border_top;

443

int border_bottom = pimage->border_bottom;

444

bool draw_borders_only = pimage->draw_borders_only;

445

t_u32 current_alpha_blend;

446

t_u32 current_src_blend_factor;

447

t_u32 current_dest_blend_factor;

448

t_u32 current_red_mask;

449

t_u32 current_green_mask;

450

t_u32 current_blue_mask;

451

t_u32 current_alpha_mask;

445

unsigned int current_alpha_blend;

446

unsigned int current_src_blend_factor;

447

unsigned int current_dest_blend_factor;

448

unsigned int current_red_mask;

449

unsigned int current_green_mask;

450

unsigned int current_blue_mask;

451

unsigned int current_alpha_mask;

452

453

// Get the current color mask and blend states. They will be restored later.

454

graphics_engine.GetRenderStates().GetColorMask(current_red_mask, current_green_mask, current_blue_mask, current_alpha_mask);

Older »