From f50de50e6b4becee295fbc0596fab6213283e1e8 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 23 Apr 2016 09:33:24 +0100 Subject: [PATCH 01/54] Add missing POSIX include for sleep() --- source/platform/platforms/NullPlatform.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/platform/platforms/NullPlatform.cpp b/source/platform/platforms/NullPlatform.cpp index 465f7c0b..1ef1e5bf 100644 --- a/source/platform/platforms/NullPlatform.cpp +++ b/source/platform/platforms/NullPlatform.cpp @@ -7,6 +7,7 @@ #include #include +#include static Gwk::String gs_ClipboardEmulator; @@ -33,7 +34,7 @@ bool Gwk::Platform::SetClipboardText(const Gwk::String& str) float Gwk::Platform::GetTimeInSeconds() { - float fSeconds = (float)clock()/(float)CLOCKS_PER_SEC; + const float fSeconds = (float)clock()/(float)CLOCKS_PER_SEC; return fSeconds; } @@ -74,7 +75,7 @@ void Gwk::Platform::SetBoundsPlatformWindow(void* ptr, int x, int y, int w, int } void Gwk::Platform::SetWindowMaximized(void* ptr, bool bMax, Gwk::Point& newPos, - Gwk::Point& newSize) + Gwk::Point& newSize) { } From 90755f1082c9f980f47e01b5f1fdf7d5fdd9ed5a Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 23 Apr 2016 09:45:31 +0100 Subject: [PATCH 02/54] We shouldnt need Ponder in main branch yet --- cmake/Config.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Config.cmake b/cmake/Config.cmake index e087cedb..dd24d343 100644 --- a/cmake/Config.cmake +++ b/cmake/Config.cmake @@ -53,7 +53,7 @@ endif() if(BUILD_TEST) message("Including tests") - find_package(Ponder 1.0 REQUIRED) + # find_package(Ponder 1.0 REQUIRED) endif(BUILD_TEST) if(BUILD_SAMPLE) From ca6bd145ea368361d690bc99f83ccc4b4fce0329 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 23 Apr 2016 09:56:18 +0100 Subject: [PATCH 03/54] Fix SDL2 sample after refactoring changes --- source/samples/SDL2/SDL2Sample.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/samples/SDL2/SDL2Sample.cpp b/source/samples/SDL2/SDL2Sample.cpp index 4a38f684..3db412bc 100644 --- a/source/samples/SDL2/SDL2Sample.cpp +++ b/source/samples/SDL2/SDL2Sample.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ int main(int argc, char** argv) canvas->SetBackgroundColor(Gwk::Color(150, 170, 170, 255)); // Create our unittest control (which is a Window with controls in it) - UnitTest* unit = new UnitTest(canvas); + TestAPI* unit = new TestAPI(canvas); unit->SetPos(10, 10); Gwk::Input::SDL2 GworkInput; From bf0447316c4c3d8f6939c09caf6c08f57bae3567 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 23 Apr 2016 10:22:07 +0100 Subject: [PATCH 04/54] SDL2 problem. Clipping broken in SDL2 --- source/platform/renderers/SDL2/SDL2.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source/platform/renderers/SDL2/SDL2.cpp b/source/platform/renderers/SDL2/SDL2.cpp index 2386281b..68fad53f 100644 --- a/source/platform/renderers/SDL2/SDL2.cpp +++ b/source/platform/renderers/SDL2/SDL2.cpp @@ -103,13 +103,16 @@ namespace Gwk void SDL2::StartClip() { const Gwk::Rect &rect = ClipRegion(); - const SDL_Rect clip = { rect.x,rect.y, rect.w,rect.h }; - SDL_RenderSetClipRect(m_renderer, &clip); + const SDL_Rect clip = { rect.x, rect.y, rect.w,rect.h }; + +// TODO - BAD! There seems to be something wrong with clip rectangles in SDL2. +// https://bugzilla.libsdl.org/show_bug.cgi?id=2700 +// SDL_RenderSetClipRect(m_renderer, &clip); } void SDL2::EndClip() { - SDL_RenderSetClipRect(m_renderer, nullptr); + SDL_RenderSetClipRect(m_renderer, 0); } void SDL2::LoadTexture(Gwk::Texture* texture) From 17690c2c90fafc13cb04872a06f89282a9a91d49 Mon Sep 17 00:00:00 2001 From: Billy Quith Date: Sun, 24 Apr 2016 19:21:51 +0100 Subject: [PATCH 05/54] Use a build folder --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index da51854f..ee099a32 100644 --- a/README.md +++ b/README.md @@ -25,16 +25,16 @@ CMake is used to generate the project files. ```bash cd gwork -cmake -G Ninja -DRENDER_SDL2=ON # create Ninja project files with SDL2 renderer +mkdir build && cd build # put all build files in separate directory +cmake -G Ninja -DRENDER_SDL2=ON .. # create Ninja project files with SDL2 renderer ``` Providing the dependencies are present, this will create a sample executable. When run it will demonstrate all of the controls available: ```bash -ninja # build project -cd build/bin -./GworkSDL2Sample +ninja # build project +bin/GworkSDL2Sample # run sample ``` ## Changes from GWEN From 30cbd4b2cac10c5aa8acbf034062a55742900ad3 Mon Sep 17 00:00:00 2001 From: BQ Date: Mon, 25 Apr 2016 09:04:54 +0100 Subject: [PATCH 06/54] Remove dev script --- cmgen.sh | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100755 cmgen.sh diff --git a/cmgen.sh b/cmgen.sh deleted file mode 100755 index 2d3895e8..00000000 --- a/cmgen.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -rm CMakeCache.txt -rm -r CMakeFiles -rm *.cmake -rm gwork/*.cmake -rm *.ninja -rm -r build/ -rm gwork/lib*.a -rm -r gwork.*/ # Xcode - -# GEN="-G Ninja" -GEN="-G Xcode" -# DBFLAGS="--debug-output" -# DBFLAGS="--trace" -# RENDER=-DRENDER_SDL2=ON -# RENDER="-DRENDER_SFML2=ON" -RENDER="-DRENDER_ALLEGRO5=ON" - -CMD="cmake $GEN $DBFLAGS $RENDER" -echo $CMD -$CMD - From b269a97bdf79e775aae6eaf6f1ac971ad00e892b Mon Sep 17 00:00:00 2001 From: BQ Date: Mon, 16 May 2016 18:50:18 +0100 Subject: [PATCH 07/54] Remove references to GworkUtil. - This uses Ponder, which should only be in the Ponder branch. --- source/CMakeLists.txt | 2 +- source/samples/CMakeLists.txt | 4 ++-- source/util/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 020849e6..ac655c12 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(platform) add_subdirectory(gwork) -add_subdirectory(util) +# add_subdirectory(util) add_subdirectory(test) add_subdirectory(samples) diff --git a/source/samples/CMakeLists.txt b/source/samples/CMakeLists.txt index 90da132e..4419b06b 100644 --- a/source/samples/CMakeLists.txt +++ b/source/samples/CMakeLists.txt @@ -17,8 +17,8 @@ if(BUILD_SAMPLE) add_executable(${SAMPLE_NAME} ${SAMPLE_SOURCES}) target_compile_features(${SAMPLE_NAME} PRIVATE cxx_override) target_link_libraries(${SAMPLE_NAME} - Gwork Gwork${GWK_RENDER_NAME} GworkUtil - ${GWK_RENDER_LIBRARIES} ${PONDER_LIBRARIES}) + Gwork Gwork${GWK_RENDER_NAME} # GworkUtil + ${GWK_RENDER_LIBRARIES}) if(BUILD_TEST) target_link_libraries(${SAMPLE_NAME} GworkTest) diff --git a/source/util/CMakeLists.txt b/source/util/CMakeLists.txt index 762af548..e7010d04 100644 --- a/source/util/CMakeLists.txt +++ b/source/util/CMakeLists.txt @@ -1,13 +1,13 @@ # Gwork util library -find_package(Ponder REQUIRED) # TODO - temporary hack whilst testing +# find_package(Ponder REQUIRED) # TODO - temporary hack whilst testing include_directories( ${CMAKE_SOURCE_DIR}/source/platform/include ${CMAKE_SOURCE_DIR}/source/gwork/include ${GWK_RENDER_INCLUDES} ${CMAKE_SOURCE_DIR}/source/util/include - ${PONDER_INCLUDE_DIRS} + # ${PONDER_INCLUDE_DIRS} ) set(GWK_UTIL_SOURCES From 19978bd9e2b8f1ccf10e90efef30993509193412 Mon Sep 17 00:00:00 2001 From: Alice Date: Tue, 17 May 2016 03:09:02 -0400 Subject: [PATCH 08/54] Various fixes --- source/gwork/include/Gwork/ControlList.h | 9 +- source/gwork/include/Gwork/Skins/Simple.h | 82 ++++++++--------- .../gwork/include/Gwork/Skins/TexturedBase.h | 91 +++++++++---------- source/gwork/source/Anim.cpp | 4 +- source/gwork/source/BaseRender.cpp | 4 +- source/gwork/source/Controls/DockBase.cpp | 2 +- source/gwork/source/Controls/PropertyTree.cpp | 8 +- source/gwork/source/Controls/TabControl.cpp | 6 +- source/gwork/source/Controls/Text.cpp | 2 +- source/gwork/source/Controls/TextBox.cpp | 2 +- source/platform/include/Gwork/PlatformTypes.h | 8 ++ source/test/source/api/Button.cpp | 8 +- source/test/source/api/Checkbox.cpp | 6 +- 13 files changed, 119 insertions(+), 113 deletions(-) diff --git a/source/gwork/include/Gwork/ControlList.h b/source/gwork/include/Gwork/ControlList.h index bb5fe2fd..a54da389 100644 --- a/source/gwork/include/Gwork/ControlList.h +++ b/source/gwork/include/Gwork/ControlList.h @@ -9,6 +9,7 @@ #ifndef GWK_CONTROLLIST_H #define GWK_CONTROLLIST_H +#include namespace Gwk { @@ -48,17 +49,17 @@ namespace Gwk list.remove(control); } - void Add(const List& list) + void Add(const List& _list) { - for (typename List::const_iterator it = list.begin(); it != list.end(); ++it) + for (typename List::const_iterator it = _list.begin(); it != _list.end(); ++it) { Add(*it); } } - void Add(const TEasyList& list) + void Add(const TEasyList& _list) { - Add(list.list); + Add(_list.list); } bool Contains(TYPE control) const diff --git a/source/gwork/include/Gwork/Skins/Simple.h b/source/gwork/include/Gwork/Skins/Simple.h index f74041cc..2b7eb7f0 100644 --- a/source/gwork/include/Gwork/Skins/Simple.h +++ b/source/gwork/include/Gwork/Skins/Simple.h @@ -63,13 +63,13 @@ namespace Gwk m_defaultFont.size = 11; } - virtual void DrawGenericPanel(Controls::Base* control) + virtual void DrawGenericPanel(Controls::Base* control) override { // TODO. } virtual void DrawButton(Gwk::Controls::Base* control, bool bDepressed, bool bHovered, - bool bDisabled) + bool bDisabled) override { int w = control->Width(); int h = control->Height(); @@ -77,28 +77,28 @@ namespace Gwk } virtual void DrawWindowCloseButton(Gwk::Controls::Base* control, bool bDepressed, - bool bHovered, bool bDisabled) + bool bHovered, bool bDisabled) override { // TODO. DrawButton(control, bDepressed, bHovered, bDisabled); } virtual void DrawWindowMaximizeButton(Gwk::Controls::Base* control, bool bDepressed, - bool bHovered, bool bDisabled, bool bMaximized) + bool bHovered, bool bDisabled, bool bMaximized) override { // TODO. DrawButton(control, bDepressed, bHovered, bDisabled); } virtual void DrawWindowMinimizeButton(Gwk::Controls::Base* control, bool bDepressed, - bool bHovered, bool bDisabled) + bool bHovered, bool bDisabled) override { // TODO. DrawButton(control, bDepressed, bHovered, bDisabled); } virtual void DrawMenuItem(Gwk::Controls::Base* control, bool bSubmenuOpen, - bool bChecked) + bool bChecked) override { if (bSubmenuOpen || control->IsHovered()) { @@ -116,7 +116,7 @@ namespace Gwk } } - virtual void DrawMenuStrip(Gwk::Controls::Base* control) + virtual void DrawMenuStrip(Gwk::Controls::Base* control) override { int w = control->Width(); int h = control->Height(); @@ -127,7 +127,7 @@ namespace Gwk m_render->DrawFilledRect(Gwk::Rect(0, h/2, w, h/2)); } - virtual void DrawMenu(Gwk::Controls::Base* control, bool bPaddingDisabled) + virtual void DrawMenu(Gwk::Controls::Base* control, bool bPaddingDisabled) override { int w = control->Width(); int h = control->Height(); @@ -144,7 +144,7 @@ namespace Gwk m_render->DrawLinedRect(Gwk::Rect(0, 0, w, h)); } - virtual void DrawShadow(Gwk::Controls::Base* control) + virtual void DrawShadow(Gwk::Controls::Base* control) override { int w = control->Width(); int h = control->Height(); @@ -194,7 +194,7 @@ namespace Gwk } virtual void DrawRadioButton(Gwk::Controls::Base* control, bool bSelected, - bool bDepressed) + bool bDepressed) override { Gwk::Rect rect = control->GetRenderBounds(); @@ -231,7 +231,7 @@ namespace Gwk } virtual void DrawCheckBox(Gwk::Controls::Base* control, bool bSelected, - bool bDepressed) + bool bDepressed) override { Gwk::Rect rect = control->GetRenderBounds(); @@ -275,7 +275,7 @@ namespace Gwk } virtual void DrawGroupBox(Gwk::Controls::Base* control, int textStart, int textHeight, - int textWidth) + int textWidth) override { Gwk::Rect rect = control->GetRenderBounds(); rect.y += textHeight/2; @@ -298,7 +298,7 @@ namespace Gwk m_render->DrawFilledRect(Gwk::Rect((rect.x+rect.w)-1, rect.y+1, 1, rect.h-1)); } - virtual void DrawTextBox(Gwk::Controls::Base* control) + virtual void DrawTextBox(Gwk::Controls::Base* control) override { Gwk::Rect rect = control->GetRenderBounds(); bool bIsFocussed = control->IsFocussed(); @@ -342,7 +342,7 @@ namespace Gwk m_render->DrawShavedCornerRect(Gwk::Rect(0, 0, rect.w, rect.h)); } - virtual void DrawTabControl(Gwk::Controls::Base* control) + virtual void DrawTabControl(Gwk::Controls::Base* control) override { Gwk::Rect rect = control->GetRenderBounds(); m_render->SetDrawColor(m_colControl); @@ -353,7 +353,7 @@ namespace Gwk //m_render->DrawFilledRect( CurrentButtonRect ); } - virtual void DrawWindow(Gwk::Controls::Base* control, int topHeight, bool inFocus) + virtual void DrawWindow(Gwk::Controls::Base* control, int topHeight, bool inFocus) override { Gwk::Rect rect = control->GetRenderBounds(); @@ -393,7 +393,7 @@ namespace Gwk m_render->DrawShavedCornerRect(Gwk::Rect(rect.x, rect.y, rect.w, rect.h)); } - virtual void DrawHighlight(Gwk::Controls::Base* control) + virtual void DrawHighlight(Gwk::Controls::Base* control) override { Gwk::Rect rect = control->GetRenderBounds(); m_render->SetDrawColor(Gwk::Color(255, 100, 255, 255)); @@ -401,7 +401,7 @@ namespace Gwk } virtual void DrawScrollBar(Gwk::Controls::Base* control, bool isHorizontal, - bool bDepressed) + bool bDepressed) override { Gwk::Rect rect = control->GetRenderBounds(); @@ -413,13 +413,13 @@ namespace Gwk } virtual void DrawScrollBarBar(Controls::Base* control, bool bDepressed, bool isHovered, - bool isHorizontal) + bool isHorizontal) override { //TODO: something specialized DrawButton(control, bDepressed, isHovered, false); } - virtual void DrawTabTitleBar(Gwk::Controls::Base* control) + virtual void DrawTabTitleBar(Gwk::Controls::Base* control) override { Gwk::Rect rect = control->GetRenderBounds(); m_render->SetDrawColor(Gwk::Color(177, 193, 214, 255)); @@ -430,7 +430,7 @@ namespace Gwk } virtual void DrawProgressBar(Gwk::Controls::Base* control, bool isHorizontal, - float progress) + float progress) override { Gwk::Rect rect = control->GetRenderBounds(); Gwk::Color FillColour(0, 211, 40, 255); @@ -467,7 +467,7 @@ namespace Gwk m_render->DrawShavedCornerRect(rect); } - virtual void DrawListBox(Gwk::Controls::Base* control) + virtual void DrawListBox(Gwk::Controls::Base* control) override { Gwk::Rect rect = control->GetRenderBounds(); m_render->SetDrawColor(m_colControlBright); @@ -476,7 +476,7 @@ namespace Gwk m_render->DrawLinedRect(rect); } - virtual void DrawListBoxLine(Gwk::Controls::Base* control, bool bSelected, bool bEven) + virtual void DrawListBoxLine(Gwk::Controls::Base* control, bool bSelected, bool bEven) override { Gwk::Rect rect = control->GetRenderBounds(); @@ -493,7 +493,7 @@ namespace Gwk } virtual void DrawSlider(Gwk::Controls::Base* control, bool bIsHorizontal, - int numNotches, int barSize) + int numNotches, int barSize) override { Gwk::Rect rect = control->GetRenderBounds(); @@ -514,13 +514,13 @@ namespace Gwk m_render->DrawLinedRect(rect); } - virtual void DrawComboBox(Gwk::Controls::Base* control, bool bIsDown, bool bIsMenuOpen) + virtual void DrawComboBox(Gwk::Controls::Base* control, bool bIsDown, bool bIsMenuOpen) override { DrawTextBox(control); } virtual void DrawKeyboardHighlight(Gwk::Controls::Base* control, const Gwk::Rect& r, - int iOffset) + int iOffset) override { Gwk::Rect rect = r; rect.x += iOffset; @@ -564,7 +564,7 @@ namespace Gwk } } - virtual void DrawToolTip(Gwk::Controls::Base* control) + virtual void DrawToolTip(Gwk::Controls::Base* control) override { Gwk::Rect rct = control->GetRenderBounds(); rct.x -= 3; @@ -578,7 +578,7 @@ namespace Gwk } virtual void DrawScrollButton(Gwk::Controls::Base* control, Position direction, - bool bDepressed, bool bHovered, bool bDisabled) + bool bDepressed, bool bHovered, bool bDisabled) override { DrawButton(control, bDepressed, false, false); m_render->SetDrawColor(Gwk::Color(0, 0, 0, 240)); @@ -595,7 +595,7 @@ namespace Gwk } virtual void DrawComboDownArrow(Gwk::Controls::Base* control, bool bHovered, - bool bDown, bool bOpen, bool bDisabled) + bool bDown, bool bOpen, bool bDisabled) override { //DrawButton( control->Width(), control->Height(), bDepressed, false, true ); m_render->SetDrawColor(Gwk::Color(0, 0, 0, 240)); @@ -604,7 +604,7 @@ namespace Gwk } virtual void DrawNumericUpDownButton(Gwk::Controls::Base* control, bool bDepressed, - bool bUp) + bool bUp) override { //DrawButton( control->Width(), control->Height(), bDepressed, false, true ); m_render->SetDrawColor(Gwk::Color(0, 0, 0, 240)); @@ -616,7 +616,7 @@ namespace Gwk DrawArrowDown(r); } - virtual void DrawTreeButton(Controls::Base* control, bool bOpen) + virtual void DrawTreeButton(Controls::Base* control, bool bOpen) override { Gwk::Rect rect = control->GetRenderBounds(); rect.x += 2; @@ -641,7 +641,7 @@ namespace Gwk 1)); } - virtual void DrawTreeControl(Controls::Base* control) + virtual void DrawTreeControl(Controls::Base* control) override { Gwk::Rect rect = control->GetRenderBounds(); m_render->SetDrawColor(m_colControlBright); @@ -650,8 +650,8 @@ namespace Gwk m_render->DrawLinedRect(rect); } - void DrawTreeNode(Controls::Base* ctrl, bool bOpen, bool bSelected, int iLabelHeight, - int iLabelWidth, int iHalfWay, int iLastBranch, bool bIsRoot) + virtual void DrawTreeNode(Controls::Base* ctrl, bool bOpen, bool bSelected, int iLabelHeight, + int iLabelWidth, int iHalfWay, int iLastBranch, bool bIsRoot) override { if (bSelected) { @@ -665,12 +665,12 @@ namespace Gwk iLastBranch, bIsRoot); } - virtual void DrawStatusBar(Controls::Base* control) + virtual void DrawStatusBar(Controls::Base* control) override { // TODO. } - void DrawColorDisplay(Controls::Base* control, Gwk::Color color) + virtual void DrawColorDisplay(Controls::Base* control, Gwk::Color color) override { Gwk::Rect rect = control->GetRenderBounds(); @@ -689,7 +689,7 @@ namespace Gwk GetRender()->DrawLinedRect(rect); } - virtual void DrawModalControl(Controls::Base* control) + virtual void DrawModalControl(Controls::Base* control) override { if (control->ShouldDrawBackground()) { @@ -699,7 +699,7 @@ namespace Gwk } } - virtual void DrawMenuDivider(Controls::Base* control) + virtual void DrawMenuDivider(Controls::Base* control) override { Gwk::Rect rect = control->GetRenderBounds(); GetRender()->SetDrawColor(m_colBGDark); @@ -708,19 +708,19 @@ namespace Gwk GetRender()->DrawLinedRect(rect); } - virtual void DrawMenuRightArrow(Controls::Base* control) + virtual void DrawMenuRightArrow(Controls::Base* control) override { DrawArrowRight(control->GetRenderBounds()); } virtual void DrawSlideButton(Gwk::Controls::Base* control, bool bDepressed, - bool bHorizontal) + bool bHorizontal) override { DrawButton(control, bDepressed, control->IsHovered(), control->IsDisabled()); } - virtual void DrawCategoryHolder(Controls::Base* ctrl) {} - virtual void DrawCategoryInner(Controls::Base* ctrl, bool bCollapsed) {} + virtual void DrawCategoryHolder(Controls::Base* ctrl) override {} + virtual void DrawCategoryInner(Controls::Base* ctrl, bool bCollapsed) override {} }; diff --git a/source/gwork/include/Gwork/Skins/TexturedBase.h b/source/gwork/include/Gwork/Skins/TexturedBase.h index 69f9f712..8f5bf0af 100644 --- a/source/gwork/include/Gwork/Skins/TexturedBase.h +++ b/source/gwork/include/Gwork/Skins/TexturedBase.h @@ -297,11 +297,11 @@ namespace Gwk { m_defaultFont.facename = "Microsoft Sans Serif"; m_defaultFont.size = 11; - + m_texture.name = TextureName; m_texture.readable = true; GetRender()->LoadTexture(&m_texture); // Readable texture - + Colors.Window.TitleActive = GetRender()->PixelColour( &m_texture, 4 + 8 * 0, 508, Color( 255, 0, 0 ) ); Colors.Window.TitleInactive = GetRender()->PixelColour( &m_texture, 4 + 8 * 1, 508, Color( 255, 255, 0 ) ); Colors.Button.Normal = GetRender()->PixelColour( &m_texture, 4 + 8 * 2, 508, Color( 255, 255, 0 ) ); @@ -464,8 +464,7 @@ namespace Gwk Textures.GroupBox.Init( &m_texture, 0, 448, 31, 31, Margin( 8, 8, 8, 8 ) ); } - - virtual void DrawButton( Gwk::Controls::Base* control, bool bDepressed, bool bHovered, bool bDisabled ) + virtual void DrawButton( Gwk::Controls::Base* control, bool bDepressed, bool bHovered, bool bDisabled ) override { if ( bDisabled ) { return Textures.Input.Button.Disabled.Draw( GetRender(), control->GetRenderBounds() ); } @@ -476,7 +475,7 @@ namespace Gwk Textures.Input.Button.Normal.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawMenuItem( Gwk::Controls::Base* control, bool bSubmenuOpen, bool bChecked ) + virtual void DrawMenuItem( Gwk::Controls::Base* control, bool bSubmenuOpen, bool bChecked ) override { const Gwk::Rect & rect = control->GetRenderBounds(); @@ -485,12 +484,12 @@ namespace Gwk if ( bChecked ) { Textures.Menu.Check.Draw( GetRender(), Gwk::Rect( rect.x + 4, rect.y + 3, 15, 15 ) ); } } - virtual void DrawMenuStrip( Gwk::Controls::Base* control ) + virtual void DrawMenuStrip( Gwk::Controls::Base* control ) override { Textures.Menu.Strip.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawMenu( Gwk::Controls::Base* control, bool bPaddingDisabled ) + virtual void DrawMenu( Gwk::Controls::Base* control, bool bPaddingDisabled ) override { if ( !bPaddingDisabled ) { @@ -500,12 +499,12 @@ namespace Gwk Textures.Menu.Background.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawMenuRightArrow( Controls::Base* control ) + virtual void DrawMenuRightArrow( Controls::Base* control ) override { Textures.Menu.RightArrow.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawShadow( Gwk::Controls::Base* control ) + virtual void DrawShadow( Gwk::Controls::Base* control ) override { Gwk::Rect r = control->GetRenderBounds(); r.x -= 4; @@ -515,7 +514,7 @@ namespace Gwk Textures.Shadow.Draw( GetRender(), r ); } - virtual void DrawRadioButton( Gwk::Controls::Base* control, bool bSelected, bool bDepressed ) + virtual void DrawRadioButton( Gwk::Controls::Base* control, bool bSelected, bool bDepressed ) override { if ( bSelected ) { @@ -533,8 +532,7 @@ namespace Gwk } } - - virtual void DrawCheckBox( Gwk::Controls::Base* control, bool bSelected, bool bDepressed ) + virtual void DrawCheckBox( Gwk::Controls::Base* control, bool bSelected, bool bDepressed ) override { if ( bSelected ) { @@ -552,7 +550,7 @@ namespace Gwk } } - virtual void DrawGroupBox( Gwk::Controls::Base* control, int textStart, int textHeight, int textWidth ) + virtual void DrawGroupBox( Gwk::Controls::Base* control, int textStart, int textHeight, int textWidth ) override { Gwk::Rect rect = control->GetRenderBounds(); rect.y += textHeight/2; @@ -563,7 +561,7 @@ namespace Gwk Textures.GroupBox.Draw( GetRender(), rect, Gwk::Colors::White, (1<<1) ); } - virtual void DrawTextBox( Gwk::Controls::Base* control ) + virtual void DrawTextBox( Gwk::Controls::Base* control ) override { if ( control->IsDisabled() ) { return Textures.TextBox.Disabled.Draw( GetRender(), control->GetRenderBounds() ); } @@ -604,35 +602,35 @@ namespace Gwk Textures.Tab.Right.Inactive.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawTabControl( Gwk::Controls::Base* control ) + virtual void DrawTabControl( Gwk::Controls::Base* control ) override { Textures.Tab.Control.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawTabTitleBar( Gwk::Controls::Base* control ) + virtual void DrawTabTitleBar( Gwk::Controls::Base* control ) override { Textures.Tab.HeaderBar.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawGenericPanel( Controls::Base* control ) + virtual void DrawGenericPanel( Controls::Base* control ) override { Textures.Panel.Normal.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawWindow( Gwk::Controls::Base* control, int topHeight, bool inFocus ) + virtual void DrawWindow( Gwk::Controls::Base* control, int topHeight, bool inFocus ) override { if ( inFocus ) { Textures.Window.Normal.Draw( GetRender(), control->GetRenderBounds() ); } else { Textures.Window.Inactive.Draw( GetRender(), control->GetRenderBounds() ); } } - virtual void DrawHighlight( Gwk::Controls::Base* control ) + virtual void DrawHighlight( Gwk::Controls::Base* control ) override { Gwk::Rect rect = control->GetRenderBounds(); GetRender()->SetDrawColor( Gwk::Color( 255, 100, 255, 255 ) ); GetRender()->DrawFilledRect( rect ); } - virtual void DrawScrollBar( Gwk::Controls::Base* control, bool isHorizontal, bool bDepressed ) + virtual void DrawScrollBar( Gwk::Controls::Base* control, bool isHorizontal, bool bDepressed ) override { if ( isHorizontal ) { Textures.Scroller.TrackH.Draw( GetRender(), control->GetRenderBounds() ); } @@ -640,7 +638,7 @@ namespace Gwk { Textures.Scroller.TrackV.Draw( GetRender(), control->GetRenderBounds() ); } } - virtual void DrawScrollBarBar( Controls::Base* control, bool bDepressed, bool isHovered, bool isHorizontal ) + virtual void DrawScrollBarBar( Controls::Base* control, bool bDepressed, bool isHovered, bool isHorizontal ) override { if ( !isHorizontal ) { @@ -668,8 +666,7 @@ namespace Gwk return Textures.Scroller.ButtonH_Normal.Draw( GetRender(), control->GetRenderBounds() ); } - - virtual void DrawProgressBar( Gwk::Controls::Base* control, bool isHorizontal, float progress ) + virtual void DrawProgressBar( Gwk::Controls::Base* control, bool isHorizontal, float progress ) override { Gwk::Rect rect = control->GetRenderBounds(); Gwk::Color FillColour( 0, 211, 40, 255 ); @@ -692,12 +689,12 @@ namespace Gwk } } - virtual void DrawListBox( Gwk::Controls::Base* control ) + virtual void DrawListBox( Gwk::Controls::Base* control ) override { return Textures.Input.ListBox.Background.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawListBoxLine( Gwk::Controls::Base* control, bool bSelected, bool bEven ) + virtual void DrawListBoxLine( Gwk::Controls::Base* control, bool bSelected, bool bEven ) override { if ( bSelected ) { @@ -716,7 +713,7 @@ namespace Gwk return Textures.Input.ListBox.OddLine.Draw( GetRender(), control->GetRenderBounds() ); } - void DrawSliderNotchesH( Gwk::Rect rect, int numNotches, int dist ) + virtual void DrawSliderNotchesH( Gwk::Rect rect, int numNotches, int dist ) { if ( numNotches == 0 ) { return; } @@ -728,7 +725,7 @@ namespace Gwk } } - void DrawSliderNotchesV( Gwk::Rect rect, int numNotches, int dist ) + virtual void DrawSliderNotchesV( Gwk::Rect rect, int numNotches, int dist ) { if ( numNotches == 0 ) { return; } @@ -740,7 +737,7 @@ namespace Gwk } } - virtual void DrawSlider( Gwk::Controls::Base* control, bool bIsHorizontal, int numNotches, int barSize ) + virtual void DrawSlider( Gwk::Controls::Base* control, bool bIsHorizontal, int numNotches, int barSize ) override { if ( bIsHorizontal ) { @@ -764,7 +761,7 @@ namespace Gwk return GetRender()->DrawFilledRect( rect ); } - virtual void DrawComboBox( Gwk::Controls::Base* control, bool bDown, bool bMenuOpen ) + virtual void DrawComboBox( Gwk::Controls::Base* control, bool bDown, bool bMenuOpen ) override { if (control->IsDisabled()) return Textures.Input.ComboBox.Disabled.Draw( GetRender(), control->GetRenderBounds() ); @@ -778,7 +775,7 @@ namespace Gwk Textures.Input.ComboBox.Normal.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawKeyboardHighlight( Gwk::Controls::Base* control, const Gwk::Rect & r, int iOffset ) + virtual void DrawKeyboardHighlight( Gwk::Controls::Base* control, const Gwk::Rect & r, int iOffset ) override { Gwk::Rect rect = r; rect.x += iOffset; @@ -817,12 +814,12 @@ namespace Gwk } } - virtual void DrawToolTip( Gwk::Controls::Base* control ) + virtual void DrawToolTip( Gwk::Controls::Base* control ) override { return Textures.Tooltip.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawScrollButton( Gwk::Controls::Base* control, Position direction, bool bDepressed, bool bHovered, bool bDisabled ) + virtual void DrawScrollButton( Gwk::Controls::Base* control, Position direction, bool bDepressed, bool bHovered, bool bDisabled ) override { int i = 0; @@ -842,7 +839,7 @@ namespace Gwk return Textures.Scroller.Button.Normal[i].Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawComboDownArrow( Gwk::Controls::Base* control, bool bHovered, bool bDown, bool bMenuOpen, bool bDisabled ) + virtual void DrawComboDownArrow( Gwk::Controls::Base* control, bool bHovered, bool bDown, bool bMenuOpen, bool bDisabled ) override { if ( bDisabled ) { return Textures.Input.ComboBox.Button.Disabled.Draw( GetRender(), control->GetRenderBounds() ); } @@ -856,7 +853,7 @@ namespace Gwk Textures.Input.ComboBox.Button.Normal.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawNumericUpDownButton( Gwk::Controls::Base* control, bool bDepressed, bool bUp ) + virtual void DrawNumericUpDownButton( Gwk::Controls::Base* control, bool bDepressed, bool bUp ) override { if ( bUp ) { @@ -878,12 +875,12 @@ namespace Gwk return Textures.Input.UpDown.Down.Normal.DrawCenter( GetRender(), control->GetRenderBounds() ); } - virtual void DrawStatusBar( Controls::Base* control ) + virtual void DrawStatusBar( Controls::Base* control ) override { Textures.StatusBar.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawTreeButton( Controls::Base* control, bool bOpen ) + virtual void DrawTreeButton( Controls::Base* control, bool bOpen ) override { Gwk::Rect rect = control->GetRenderBounds(); @@ -893,7 +890,7 @@ namespace Gwk { Textures.Tree.Plus.Draw( GetRender(), rect ); } } - void DrawColorDisplay( Controls::Base* control, Gwk::Color color ) + virtual void DrawColorDisplay( Controls::Base* control, Gwk::Color color ) override { Gwk::Rect rect = control->GetRenderBounds(); @@ -912,7 +909,7 @@ namespace Gwk GetRender()->DrawLinedRect( rect ); } - virtual void DrawModalControl( Controls::Base* control ) + virtual void DrawModalControl( Controls::Base* control ) override { if ( !control->ShouldDrawBackground() ) { return; } @@ -921,19 +918,19 @@ namespace Gwk GetRender()->DrawFilledRect( rect ); } - virtual void DrawMenuDivider( Controls::Base* control ) + virtual void DrawMenuDivider( Controls::Base* control ) override { Gwk::Rect rect = control->GetRenderBounds(); GetRender()->SetDrawColor( Gwk::Color( 0, 0, 0, 100 ) ); GetRender()->DrawFilledRect( rect ); } - virtual void DrawTreeControl( Controls::Base* control ) + virtual void DrawTreeControl( Controls::Base* control ) override { Textures.Tree.Background.Draw( GetRender(), control->GetRenderBounds() ); } - virtual void DrawWindowCloseButton( Gwk::Controls::Base* control, bool bDepressed, bool bHovered, bool bDisabled ) + virtual void DrawWindowCloseButton( Gwk::Controls::Base* control, bool bDepressed, bool bHovered, bool bDisabled ) override { Gwk::Rect r = Gwk::Rect( control->GetRenderBounds().x, control->GetRenderBounds().y, 31, 31 ); @@ -946,7 +943,7 @@ namespace Gwk Textures.Window.Close.Draw( GetRender(), r ); } - virtual void DrawWindowMaximizeButton( Gwk::Controls::Base* control, bool bDepressed, bool bHovered, bool bDisabled, bool bMaximized ) + virtual void DrawWindowMaximizeButton( Gwk::Controls::Base* control, bool bDepressed, bool bHovered, bool bDisabled, bool bMaximized ) override { Gwk::Rect r = Gwk::Rect( control->GetRenderBounds().x, control->GetRenderBounds().y, 31, 31 ); @@ -970,7 +967,7 @@ namespace Gwk return Textures.Window.Restore.Draw( GetRender(), r ); } - virtual void DrawWindowMinimizeButton( Gwk::Controls::Base* control, bool bDepressed, bool bHovered, bool bDisabled ) + virtual void DrawWindowMinimizeButton( Gwk::Controls::Base* control, bool bDepressed, bool bHovered, bool bDisabled ) override { Gwk::Rect r = Gwk::Rect( control->GetRenderBounds().x, control->GetRenderBounds().y, 31, 31 ); @@ -984,7 +981,7 @@ namespace Gwk } - virtual void DrawSlideButton( Gwk::Controls::Base* control, bool bDepressed, bool bHorizontal ) + virtual void DrawSlideButton( Gwk::Controls::Base* control, bool bDepressed, bool bHorizontal ) override { if ( !bHorizontal ) { @@ -1006,7 +1003,7 @@ namespace Gwk Textures.Input.Slider.H.Normal.DrawCenter( GetRender(), control->GetRenderBounds() ); } - void DrawTreeNode( Controls::Base* ctrl, bool bOpen, bool bSelected, int iLabelHeight, int iLabelWidth, int iHalfWay, int iLastBranch, bool bIsRoot ) + virtual void DrawTreeNode( Controls::Base* ctrl, bool bOpen, bool bSelected, int iLabelHeight, int iLabelWidth, int iHalfWay, int iLastBranch, bool bIsRoot ) override { if ( bSelected ) { @@ -1016,12 +1013,12 @@ namespace Gwk Base::DrawTreeNode( ctrl, bOpen, bSelected, iLabelHeight, iLabelWidth, iHalfWay, iLastBranch, bIsRoot ); } - void DrawCategoryHolder( Controls::Base* ctrl ) + virtual void DrawCategoryHolder( Controls::Base* ctrl ) override { Textures.CategoryList.Outer.Draw( GetRender(), ctrl->GetRenderBounds() ); } - void DrawCategoryInner( Controls::Base* ctrl, bool bCollapsed ) + virtual void DrawCategoryInner( Controls::Base* ctrl, bool bCollapsed ) override { if ( bCollapsed ) { return Textures.CategoryList.Header.Draw( GetRender(), ctrl->GetRenderBounds() ); } diff --git a/source/gwork/source/Anim.cpp b/source/gwork/source/Anim.cpp index a19f47ac..59827489 100644 --- a/source/gwork/source/Anim.cpp +++ b/source/gwork/source/Anim.cpp @@ -113,9 +113,9 @@ static float GetEased(float fTime, float fEase) { // Ease in and Out if ease is < 0 if (fEase < 0) - return -fTime/2*(std::cosf(3.14159f*fTime)-1); + return -fTime/2*(std::cos(3.14159f*fTime)-1); - return std::powf(fTime, fEase); + return std::pow(fTime, fEase); } void Gwk::Anim::TimedAnimation::Think() diff --git a/source/gwork/source/BaseRender.cpp b/source/gwork/source/BaseRender.cpp index 1d181261..da591ab5 100644 --- a/source/gwork/source/BaseRender.cpp +++ b/source/gwork/source/BaseRender.cpp @@ -151,7 +151,7 @@ void Base::RenderText(Gwk::Font* font, Gwk::Point pos, const Gwk::String& text) if (chr == ' ') continue; - Gwk::Rect r(pos.x+i*fSize*0.4, pos.y, fSize*0.4-1, fSize); + Gwk::Rect r(pos.x+i*fSize*0.4f, pos.y, fSize*0.4f-1.0f, fSize); // // This isn't important, it's just me messing around changing @@ -190,7 +190,7 @@ void Base::RenderText(Gwk::Font* font, Gwk::Point pos, const Gwk::String& text) Gwk::Point Base::MeasureText(Gwk::Font* font, const Gwk::String& text) { Gwk::Point p; - p.x = font->size*Scale()*(float)text.length()*0.4; + p.x = font->size*Scale()*(float)text.length()*0.4f; p.y = font->size*Scale(); return p; } diff --git a/source/gwork/source/Controls/DockBase.cpp b/source/gwork/source/Controls/DockBase.cpp index 082f8749..16648d27 100644 --- a/source/gwork/source/Controls/DockBase.cpp +++ b/source/gwork/source/Controls/DockBase.cpp @@ -115,7 +115,7 @@ Position DockBase::GetDroppedTabDirection(int x, int y) float minimum = std::min(std::min(std::min(top, left), right), bottom); m_bDropFar = (minimum < 0.2f); - if (minimum > 0.3) + if (minimum > 0.3f) return Position::Fill; if (top == minimum && (!m_top || m_top->Hidden())) diff --git a/source/gwork/source/Controls/PropertyTree.cpp b/source/gwork/source/Controls/PropertyTree.cpp index 741d1d16..a28ddf07 100644 --- a/source/gwork/source/Controls/PropertyTree.cpp +++ b/source/gwork/source/Controls/PropertyTree.cpp @@ -40,11 +40,11 @@ Properties* PropertyTree::Find(const String& text) { Base::List& nodechildren = child->GetChildren(); - for (Base::List::iterator iter = nodechildren.begin(); - iter != nodechildren.end(); - ++iter) + for (Base::List::iterator subiter = nodechildren.begin(); + subiter != nodechildren.end(); + ++subiter) { - Properties* propertyChild = gwk_cast(*iter); + Properties* propertyChild = gwk_cast(*subiter); if (!propertyChild) continue; diff --git a/source/gwork/source/Controls/TabControl.cpp b/source/gwork/source/Controls/TabControl.cpp index 9623312f..ad4788eb 100644 --- a/source/gwork/source/Controls/TabControl.cpp +++ b/source/gwork/source/Controls/TabControl.cpp @@ -138,10 +138,10 @@ void TabControl::OnTabPressed(Controls::Base* control) if (m_currentButton) { - Base* page = m_currentButton->GetPage(); + Base* subpage = m_currentButton->GetPage(); - if (page) - page->SetHidden(true); + if (subpage) + subpage->SetHidden(true); m_currentButton->Redraw(); m_currentButton = nullptr; diff --git a/source/gwork/source/Controls/Text.cpp b/source/gwork/source/Controls/Text.cpp index 341d61b2..8c1a58f7 100644 --- a/source/gwork/source/Controls/Text.cpp +++ b/source/gwork/source/Controls/Text.cpp @@ -100,7 +100,7 @@ Gwk::Rect Text::GetCharacterPosition(unsigned int iChar) TextLines::iterator itEnd = m_lines.end(); int iChars = 0; - Text* line; + Text* line = nullptr; while (it != itEnd) { line = *it; diff --git a/source/gwork/source/Controls/TextBox.cpp b/source/gwork/source/Controls/TextBox.cpp index d834e5bd..1baa7275 100644 --- a/source/gwork/source/Controls/TextBox.cpp +++ b/source/gwork/source/Controls/TextBox.cpp @@ -106,7 +106,7 @@ void TextBox::UpdateCaretColor() if (m_caretColor == targetcolor) targetcolor = Gwk::Color(20, 20, 20, 255); - m_fNextCaretColorChange = Gwk::Platform::GetTimeInSeconds()+0.5; + m_fNextCaretColorChange = Gwk::Platform::GetTimeInSeconds()+0.5f; m_caretColor = targetcolor; Redraw(); } diff --git a/source/platform/include/Gwork/PlatformTypes.h b/source/platform/include/Gwork/PlatformTypes.h index 6df81c32..977a72a9 100644 --- a/source/platform/include/Gwork/PlatformTypes.h +++ b/source/platform/include/Gwork/PlatformTypes.h @@ -121,6 +121,14 @@ namespace Gwk , a(a_) {} + Color(const Color& c) + { + r = c.r; + g = c.g; + b = c.b; + a = c.a; + } + void operator = (Color c) { r = c.r; diff --git a/source/test/source/api/Button.cpp b/source/test/source/api/Button.cpp index de7e720c..1faee553 100644 --- a/source/test/source/api/Button.cpp +++ b/source/test/source/api/Button.cpp @@ -20,10 +20,10 @@ class Button : public TestUnit buttonA->SetText("Event Tester"); buttonA->onPress.Add(this, &Button::onButtonA); { - Controls::Button* buttonA = new Controls::Button(this); - buttonA->SetBounds(200, 30, 300, 200); - buttonA->SetText("Event Tester 2"); - buttonA->onPress.Add(this, &Button::onButtonA); + Controls::Button* buttonAA = new Controls::Button(this); + buttonAA->SetBounds(200, 30, 300, 200); + buttonAA->SetText("Event Tester 2"); + buttonAA->onPress.Add(this, &Button::onButtonA); } // Unicode test Controls::Button* buttonB = new Controls::Button(this); diff --git a/source/test/source/api/Checkbox.cpp b/source/test/source/api/Checkbox.cpp index 3096e357..20e7f4be 100644 --- a/source/test/source/api/Checkbox.cpp +++ b/source/test/source/api/Checkbox.cpp @@ -28,9 +28,9 @@ class Checkbox : public TestUnit labeled->Checkbox()->onUnChecked.Add(this, &Checkbox::OnUnchecked); labeled->Checkbox()->onCheckChanged.Add(this, &Checkbox::OnCheckChanged); { - Gwk::Controls::CheckBox* check = new Gwk::Controls::CheckBox(this); - check->SetPos(10, 54); - check->SetDisabled(true); + Gwk::Controls::CheckBox* check2 = new Gwk::Controls::CheckBox(this); + check2->SetPos(10, 54); + check2->SetDisabled(true); } } From 98e27a7d6e182f7b2bc41cf627b6768a7911125e Mon Sep 17 00:00:00 2001 From: Alice Date: Tue, 17 May 2016 03:29:56 -0400 Subject: [PATCH 09/54] const_iterator work --- source/designer/source/DocumentCanvas.cpp | 10 +++++----- source/designer/source/Hierarchy.cpp | 4 ++-- source/designer/source/Properties.cpp | 14 ++++++-------- source/designer/source/SelectionLayer.cpp | 8 ++++---- source/gwork/include/Gwork/ControlList.h | 6 +++--- source/gwork/source/ControlList.cpp | 18 +++++++++--------- source/gwork/source/Controls/ListBox.cpp | 8 ++++---- .../source/ControlFactory/ControlFactory.cpp | 14 +++++++------- 8 files changed, 40 insertions(+), 42 deletions(-) diff --git a/source/designer/source/DocumentCanvas.cpp b/source/designer/source/DocumentCanvas.cpp index d2c4f6d5..233e5d3e 100644 --- a/source/designer/source/DocumentCanvas.cpp +++ b/source/designer/source/DocumentCanvas.cpp @@ -67,7 +67,7 @@ void DocumentCanvas::SelectControls( ControlList& CtrlList ) { m_selectionLayer->ClearSelection(); - for ( ControlList::List::const_iterator it = CtrlList.list.begin(); it != CtrlList.list.end(); ++it ) + for ( ControlList::List::const_iterator it = CtrlList.list.cbegin(); it != CtrlList.list.cend(); ++it ) { m_selectionLayer->AddSelection( (*it) ); } @@ -99,7 +99,7 @@ void DocumentCanvas::Command( const Gwk::String& str ) { if ( str == "delete" ) { - for ( ControlList::List::const_iterator it = m_selectionLayer->GetSelected().list.begin(); it != m_selectionLayer->GetSelected().list.end(); ++it ) + for ( ControlList::List::const_iterator it = m_selectionLayer->GetSelected().list.cbegin(); it != m_selectionLayer->GetSelected().list.cend(); ++it ) { if ( *it == this ) continue; (*it)->DelayedDelete(); @@ -110,7 +110,7 @@ void DocumentCanvas::Command( const Gwk::String& str ) if ( str == "bringforward" ) { - for ( ControlList::List::const_iterator it = m_selectionLayer->GetSelected().list.begin(); it != m_selectionLayer->GetSelected().list.end(); ++it ) + for ( ControlList::List::const_iterator it = m_selectionLayer->GetSelected().list.cbegin(); it != m_selectionLayer->GetSelected().list.cend(); ++it ) { if ( *it == this ) continue; (*it)->BringToFront(); @@ -119,10 +119,10 @@ void DocumentCanvas::Command( const Gwk::String& str ) if ( str == "sendback" ) { - for ( ControlList::List::const_iterator it = m_selectionLayer->GetSelected().list.begin(); it != m_selectionLayer->GetSelected().list.end(); ++it ) + for ( ControlList::List::const_iterator it = m_selectionLayer->GetSelected().list.cbegin(); it != m_selectionLayer->GetSelected().list.cend(); ++it ) { if ( *it == this ) continue; (*it)->SendToBack(); } } -} \ No newline at end of file +} diff --git a/source/designer/source/Hierarchy.cpp b/source/designer/source/Hierarchy.cpp index 15283a5d..0dbc9a72 100644 --- a/source/designer/source/Hierarchy.cpp +++ b/source/designer/source/Hierarchy.cpp @@ -76,8 +76,8 @@ void Hierarchy::OnCanvasSelectionChanged( Event::Info info ) { m_tree->DeselectAll(); - for ( ControlList::List::const_iterator it = info.ControlList.list.begin(); - it != info.ControlList.list.end(); ++it ) + for ( ControlList::List::const_iterator it = info.ControlList.list.cbegin(); + it != info.ControlList.list.cend(); ++it ) { SelectNodeRepresentingControl( (*it), m_tree ); } diff --git a/source/designer/source/Properties.cpp b/source/designer/source/Properties.cpp index 8950274a..2cb1b8ff 100644 --- a/source/designer/source/Properties.cpp +++ b/source/designer/source/Properties.cpp @@ -18,9 +18,7 @@ void Properties::WatchCanvas( DocumentCanvas* canvas ) m_canvas->onSelectionChanged.Add( this, &ThisClass::OnCanvasSelectionChanged ); m_canvas->onPropertiesChanged.Add( this, &ThisClass::OnPropertiesChanged ); - //m_canvas->onChildAdded.Add( this, &ThisClass::OnCanvasChildAdded ); - } @@ -30,7 +28,7 @@ void Properties::OnCanvasSelectionChanged( Event::Info info ) m_selectedControls = info.ControlList; - for ( ControlList::List::const_iterator it = m_selectedControls.list.begin(); it != m_selectedControls.list.end(); ++it ) + for ( ControlList::List::const_iterator it = m_selectedControls.list.cbegin(); it != m_selectedControls.list.cend(); ++it ) { AddPropertiesFromControl( *it, true ); } @@ -57,8 +55,8 @@ void Properties::AddPropertiesFromControl( Controls::Base* control, bool bAllowD // // And foreach property in that control factory // - ControlFactory::Property::List::const_iterator it = cf->Properties().begin(); - ControlFactory::Property::List::const_iterator itEnd = cf->Properties().end(); + ControlFactory::Property::List::const_iterator it = cf->Properties().cbegin(); + ControlFactory::Property::List::const_iterator itEnd = cf->Properties().cend(); for ( ; it != itEnd; ++it ) { Gwk::String strPropertyName = (*it)->Name(); @@ -110,7 +108,7 @@ void Properties::AddPropertiesFromControl( Controls::Base* control, bool bAllowD void Properties::OnPropertyChanged( Event::Info info ) { - for ( ControlList::List::const_iterator it = m_selectedControls.list.begin(); it != m_selectedControls.list.end(); ++it ) + for ( ControlList::List::const_iterator it = m_selectedControls.list.cbegin(); it != m_selectedControls.list.cend(); ++it ) { Controls::Base* control = (*it); ControlFactory::Base* cf = control->UserData.Get( "ControlFactory" ); @@ -127,9 +125,9 @@ void Properties::OnPropertiesChanged( Event::Info info ) { m_selectedControls = info.ControlList; - for ( ControlList::List::const_iterator it = m_selectedControls.list.begin(); it != m_selectedControls.list.end(); ++it ) + for ( ControlList::List::const_iterator it = m_selectedControls.list.cbegin(); it != m_selectedControls.list.cend(); ++it ) { - AddPropertiesFromControl( *it, it != m_selectedControls.list.begin() ); + AddPropertiesFromControl( *it, it != m_selectedControls.list.cbegin() ); } m_props->ExpandAll(); diff --git a/source/designer/source/SelectionLayer.cpp b/source/designer/source/SelectionLayer.cpp index f0fe2134..caf4cb27 100644 --- a/source/designer/source/SelectionLayer.cpp +++ b/source/designer/source/SelectionLayer.cpp @@ -100,7 +100,7 @@ void SelectionLayer::OnMouseClickLeft( int x, int y, bool bDown ) void SelectionLayer::OnControlDragged( Event::Info info ) { - for ( ControlList::List::const_iterator it = m_selected.list.begin(); it != m_selected.list.end(); ++it ) + for ( ControlList::List::const_iterator it = m_selected.list.cbegin(); it != m_selected.list.cend(); ++it ) { Controls::Base* control = (*it); control->MoveBy( info.Point.x, info.Point.y ); @@ -142,8 +142,8 @@ void SelectionLayer::OnCageMoving( Event::Info info ) // Hide all of the selected panels, and this selection layer { - for ( ControlList::List::const_iterator it = m_selected.list.begin(); - it != m_selected.list.end(); ++it ) + for ( ControlList::List::const_iterator it = m_selected.list.cbegin(); + it != m_selected.list.cend(); ++it ) { (*it)->SetHidden( true ); } @@ -208,7 +208,7 @@ void SelectionLayer::OnDragStart() ControlList NewList; - for ( ControlList::List::const_iterator it = m_selected.list.begin(); it != m_selected.list.end(); ++it ) + for ( ControlList::List::const_iterator it = m_selected.list.cbegin(); it != m_selected.list.cend(); ++it ) { Gwk::ControlFactory::Base* factory = (*it)->UserData.Get( "ControlFactory" ); Controls::Base* control = ControlFactory::Clone( *it, factory ); diff --git a/source/gwork/include/Gwork/ControlList.h b/source/gwork/include/Gwork/ControlList.h index a54da389..c97a8913 100644 --- a/source/gwork/include/Gwork/ControlList.h +++ b/source/gwork/include/Gwork/ControlList.h @@ -51,7 +51,7 @@ namespace Gwk void Add(const List& _list) { - for (typename List::const_iterator it = _list.begin(); it != _list.end(); ++it) + for (typename List::const_iterator it = _list.cbegin(); it != _list.cend(); ++it) { Add(*it); } @@ -64,8 +64,8 @@ namespace Gwk bool Contains(TYPE control) const { - typename List::const_iterator it = std::find(list.begin(), list.end(), control); - return it != list.end(); + typename List::const_iterator it = std::find(list.cbegin(), list.cend(), control); + return it != list.cend(); } inline void Clear() diff --git a/source/gwork/source/ControlList.cpp b/source/gwork/source/ControlList.cpp index e1fa60a2..c9f5bf5e 100644 --- a/source/gwork/source/ControlList.cpp +++ b/source/gwork/source/ControlList.cpp @@ -14,7 +14,7 @@ namespace Gwk void ControlList::Enable() { - for (List::const_iterator it = list.begin(); it != list.end(); ++it) + for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) { (*it)->SetDisabled(false); } @@ -22,7 +22,7 @@ void ControlList::Enable() void ControlList::Disable() { - for (List::const_iterator it = list.begin(); it != list.end(); ++it) + for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) { (*it)->SetDisabled(true); } @@ -30,7 +30,7 @@ void ControlList::Disable() void ControlList::Show() { - for (List::const_iterator it = list.begin(); it != list.end(); ++it) + for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) { (*it)->Show(); } @@ -38,7 +38,7 @@ void ControlList::Show() void ControlList::Hide() { - for (List::const_iterator it = list.begin(); it != list.end(); ++it) + for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) { (*it)->Hide(); } @@ -46,7 +46,7 @@ void ControlList::Hide() Gwk::String ControlList::GetValue() { - for (List::const_iterator it = list.begin(); it != list.end(); ++it) + for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) { return (*it)->GetValue(); } @@ -56,7 +56,7 @@ Gwk::String ControlList::GetValue() void ControlList::SetValue(const Gwk::String& value) { - for (List::const_iterator it = list.begin(); it != list.end(); ++it) + for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) { (*it)->SetValue(value); } @@ -64,7 +64,7 @@ void ControlList::SetValue(const Gwk::String& value) void ControlList::MoveBy(const Gwk::Point& point) { - for (List::const_iterator it = list.begin(); it != list.end(); ++it) + for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) { (*it)->MoveBy(point.x, point.y); } @@ -72,7 +72,7 @@ void ControlList::MoveBy(const Gwk::Point& point) void ControlList::DoAction() { - for (List::const_iterator it = list.begin(); it != list.end(); ++it) + for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) { (*it)->DoAction(); } @@ -82,7 +82,7 @@ void ControlList::SetActionInternal(Gwk::Event::Handler* object, void ( Gwk::Event::Handler::*f )( Gwk::Event::Info), const Gwk::Event::Packet& packet) { - for (List::const_iterator it = list.begin(); it != list.end(); ++it) + for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) { (*it)->SetAction(object, f, packet); } diff --git a/source/gwork/source/Controls/ListBox.cpp b/source/gwork/source/Controls/ListBox.cpp index b498e414..ef60ea9f 100644 --- a/source/gwork/source/Controls/ListBox.cpp +++ b/source/gwork/source/Controls/ListBox.cpp @@ -190,8 +190,8 @@ bool ListBox::OnKeyDown(bool bDown) if (bDown) { Base::List& children = m_table->Children; - Base::List::const_iterator begin = children.begin(); - Base::List::const_iterator end = children.end(); + Base::List::const_iterator begin = children.cbegin(); + Base::List::const_iterator end = children.cend(); Controls::Base* sel_row = GetSelectedRow(); if (sel_row == nullptr && !children.empty()) // no user selection yet, so @@ -233,8 +233,8 @@ bool ListBox::OnKeyUp(bool bDown) if (bDown) { Base::List& children = m_table->Children; - Base::List::const_iterator begin = children.begin(); - Base::List::const_iterator end = children.end(); + Base::List::const_iterator begin = children.cbegin(); + Base::List::const_iterator end = children.cend(); Controls::Base* sel_row = GetSelectedRow(); // no user selection yet, so select first element diff --git a/source/util/source/ControlFactory/ControlFactory.cpp b/source/util/source/ControlFactory/ControlFactory.cpp index a835cc86..2782f23a 100644 --- a/source/util/source/ControlFactory/ControlFactory.cpp +++ b/source/util/source/ControlFactory/ControlFactory.cpp @@ -167,8 +167,8 @@ List& GetList() ControlFactory::Base* Find(const Gwk::String& name) { - for (ControlFactory::List::iterator it = ControlFactory::GetList().begin(); - it != ControlFactory::GetList().end(); + for (ControlFactory::List::iterator it = ControlFactory::GetList().cbegin(); + it != ControlFactory::GetList().cend(); ++it) { if ((*it)->Name() == name) @@ -190,8 +190,8 @@ void Base::AddProperty(Property* prop) Base* Base::GetBaseFactory() { - for (ControlFactory::List::iterator it = ControlFactory::GetList().begin(); - it != ControlFactory::GetList().end(); + for (ControlFactory::List::iterator it = ControlFactory::GetList().cbegin(); + it != ControlFactory::GetList().cend(); ++it) { if ((*it)->Name() == ParentFactory()) @@ -203,8 +203,8 @@ Base* Base::GetBaseFactory() Property* Base::GetProperty(const Gwk::String& name) { - for (ControlFactory::Property::List::const_iterator it = Properties().begin(), - itEnd = Properties().end(); + for (ControlFactory::Property::List::const_iterator it = Properties().cbegin(), + itEnd = Properties().cend(); it != itEnd; ++it) { if ((*it)->Name() != name) @@ -257,7 +257,7 @@ Controls::Base* Clone(Controls::Base* source, ControlFactory::Base* factory) while (factory) { for (ControlFactory::Property::List::const_iterator - it = factory->Properties().begin(), itEnd = factory->Properties().end(); + it = factory->Properties().cbegin(), itEnd = factory->Properties().cend(); it != itEnd; ++it) { (*it)->SetValueFromString(control, (*it)->GetValueAsString(source)); From 517810d65d0701649d4103d5249792371e84c20f Mon Sep 17 00:00:00 2001 From: Alice Date: Tue, 17 May 2016 07:04:24 -0400 Subject: [PATCH 10/54] range based for-each --- source/gwork/include/Gwork/ControlList.h | 4 +- .../include/Gwork/Controls/CollapsibleList.h | 8 +- .../include/Gwork/Controls/Layout/Position.h | 4 +- .../include/Gwork/Controls/Layout/Table.h | 16 ++-- .../include/Gwork/Controls/Layout/Tile.h | 4 +- source/gwork/include/Gwork/Hook.h | 16 ++-- source/gwork/source/ControlList.cpp | 36 ++++----- source/gwork/source/Controls/Base.cpp | 73 +++++++------------ source/gwork/source/Controls/Canvas.cpp | 5 +- .../source/Controls/CollapsibleCategory.cpp | 34 ++++----- source/gwork/source/Controls/ComboBox.cpp | 9 +-- .../source/Controls/DockedTabControl.cpp | 4 +- source/gwork/source/Controls/ListBox.cpp | 4 +- source/gwork/source/Controls/Menu.cpp | 26 ++----- source/gwork/source/Controls/Properties.cpp | 8 +- source/gwork/source/Controls/PropertyTree.cpp | 10 +-- .../source/Controls/RadioButtonController.cpp | 3 +- .../source/Controls/ResizableControl.cpp | 4 +- source/gwork/source/Controls/RichLabel.cpp | 8 +- .../gwork/source/Controls/ScrollControl.cpp | 11 +-- source/gwork/source/Controls/TabStrip.cpp | 5 +- source/gwork/source/Controls/Text.cpp | 24 ++---- source/gwork/source/Controls/TreeNode.cpp | 8 +- source/gwork/source/Events.cpp | 7 +- source/gwork/source/InputHandler.cpp | 6 +- .../source/ControlFactory/ControlFactory.cpp | 30 +++----- 26 files changed, 145 insertions(+), 222 deletions(-) diff --git a/source/gwork/include/Gwork/ControlList.h b/source/gwork/include/Gwork/ControlList.h index c97a8913..134142cd 100644 --- a/source/gwork/include/Gwork/ControlList.h +++ b/source/gwork/include/Gwork/ControlList.h @@ -51,9 +51,9 @@ namespace Gwk void Add(const List& _list) { - for (typename List::const_iterator it = _list.cbegin(); it != _list.cend(); ++it) + for (auto const& it : _list) { - Add(*it); + Add(it); } } diff --git a/source/gwork/include/Gwork/Controls/CollapsibleList.h b/source/gwork/include/Gwork/Controls/CollapsibleList.h index 9717d7e9..2818e647 100644 --- a/source/gwork/include/Gwork/Controls/CollapsibleList.h +++ b/source/gwork/include/Gwork/Controls/CollapsibleList.h @@ -61,10 +61,10 @@ namespace Gwk { Base::List& children = GetChildren(); - for (Base::List::iterator iter = children.begin(); iter != children.end(); ++iter) + for (auto&& iter : children) { Gwk::Controls::CollapsibleCategory* child = - gwk_cast(*iter); + gwk_cast(iter); if (!child) continue; @@ -77,10 +77,10 @@ namespace Gwk { Base::List& children = GetChildren(); - for (Base::List::iterator iter = children.begin(); iter != children.end(); ++iter) + for (auto&& iter : children) { Gwk::Controls::CollapsibleCategory* child = - gwk_cast(*iter); + gwk_cast(iter); if (!child) continue; diff --git a/source/gwork/include/Gwork/Controls/Layout/Position.h b/source/gwork/include/Gwork/Controls/Layout/Position.h index 2f9c6cac..4f77395e 100644 --- a/source/gwork/include/Gwork/Controls/Layout/Position.h +++ b/source/gwork/include/Gwork/Controls/Layout/Position.h @@ -30,10 +30,8 @@ namespace Gwk void PostLayout(Skin::Base* skin) override { - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for(auto&& child : Children) { - Base* child = *it; - if (child->GetDock() != Position::None) continue; diff --git a/source/gwork/include/Gwork/Controls/Layout/Table.h b/source/gwork/include/Gwork/Controls/Layout/Table.h index 5a9294c6..9a2a9a73 100644 --- a/source/gwork/include/Gwork/Controls/Layout/Table.h +++ b/source/gwork/include/Gwork/Controls/Layout/Table.h @@ -190,9 +190,9 @@ namespace Gwk if (m_columnCount == i) return; - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for(auto&& child : Children) { - TableRow* row = gwk_cast(*it); + TableRow* row = gwk_cast(child); if (!row) continue; @@ -245,9 +245,9 @@ namespace Gwk void Clear() { - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for(auto&& child : Children) { - TableRow* row = gwk_cast(*it); + TableRow* row = gwk_cast(child); if (!row) continue; @@ -279,9 +279,9 @@ namespace Gwk bool bEven = false; - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for(auto&& child : Children) { - TableRow* row = gwk_cast(*it); + TableRow* row = gwk_cast(child); if (!row) continue; @@ -324,9 +324,9 @@ namespace Gwk m_columnWidth[i] = 10; } - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for(auto&& child : Children) { - TableRow* row = gwk_cast(*it); + TableRow* row = gwk_cast(child); if (!row) continue; diff --git a/source/gwork/include/Gwork/Controls/Layout/Tile.h b/source/gwork/include/Gwork/Controls/Layout/Tile.h index 7b35260d..8b76a981 100644 --- a/source/gwork/include/Gwork/Controls/Layout/Tile.h +++ b/source/gwork/include/Gwork/Controls/Layout/Tile.h @@ -32,10 +32,8 @@ namespace Gwk Gwk::Rect bounds = GetInnerBounds(); Gwk::Point pos = Point(bounds.x, bounds.y); - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for(auto&& child : Children) { - Base* child = *it; - if (child->GetDock() != Position::None) continue; diff --git a/source/gwork/include/Gwork/Hook.h b/source/gwork/include/Gwork/Hook.h index d4bd07c5..73071d06 100644 --- a/source/gwork/include/Gwork/Hook.h +++ b/source/gwork/include/Gwork/Hook.h @@ -44,9 +44,9 @@ namespace Gwk template bool CallHook(fnc f) { - for (HookList::iterator it = GetHookList().begin(); it != GetHookList().end(); ++it) + for (auto&& it : GetHookList()) { - if (((*it)->*f)()) + if ((it->*f)()) return true; } @@ -56,9 +56,9 @@ namespace Gwk template bool CallHook(fnc f, AA a) { - for (HookList::iterator it = GetHookList().begin(); it != GetHookList().end(); ++it) + for (auto&& it : GetHookList()) { - if (((*it)->*f)(a)) + if ((it->*f)(a)) return true; } @@ -68,9 +68,9 @@ namespace Gwk template bool CallHook(fnc f, AA a, AB b) { - for (HookList::iterator it = GetHookList().begin(); it != GetHookList().end(); ++it) + for (auto&& it : GetHookList()) { - if (((*it)->*f)(a, b)) + if ((it->*f)(a, b)) return true; } @@ -80,9 +80,9 @@ namespace Gwk template bool CallHook(fnc f, AA a, AB b, AC c) { - for (HookList::iterator it = GetHookList().begin(); it != GetHookList().end(); ++it) + for (auto&& it : GetHookList()) { - if (((*it)->*f)(a, b, c)) + if ((it->*f)(a, b, c)) return true; } diff --git a/source/gwork/source/ControlList.cpp b/source/gwork/source/ControlList.cpp index c9f5bf5e..b835ebfc 100644 --- a/source/gwork/source/ControlList.cpp +++ b/source/gwork/source/ControlList.cpp @@ -14,41 +14,41 @@ namespace Gwk void ControlList::Enable() { - for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) + for(auto&& iter : list) { - (*it)->SetDisabled(false); + iter->SetDisabled(false); } } void ControlList::Disable() { - for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) + for(auto&& iter : list) { - (*it)->SetDisabled(true); + iter->SetDisabled(true); } } void ControlList::Show() { - for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) + for(auto&& iter : list) { - (*it)->Show(); + iter->Show(); } } void ControlList::Hide() { - for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) + for(auto&& iter : list) { - (*it)->Hide(); + iter->Hide(); } } Gwk::String ControlList::GetValue() { - for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) + for(auto&& iter : list) { - return (*it)->GetValue(); + return iter->GetValue(); } return ""; @@ -56,25 +56,25 @@ Gwk::String ControlList::GetValue() void ControlList::SetValue(const Gwk::String& value) { - for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) + for(auto&& iter : list) { - (*it)->SetValue(value); + iter->SetValue(value); } } void ControlList::MoveBy(const Gwk::Point& point) { - for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) + for(auto&& iter : list) { - (*it)->MoveBy(point.x, point.y); + iter->MoveBy(point.x, point.y); } } void ControlList::DoAction() { - for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) + for(auto&& iter : list) { - (*it)->DoAction(); + iter->DoAction(); } } @@ -82,9 +82,9 @@ void ControlList::SetActionInternal(Gwk::Event::Handler* object, void ( Gwk::Event::Handler::*f )( Gwk::Event::Info), const Gwk::Event::Packet& packet) { - for (List::const_iterator it = list.cbegin(); it != list.cend(); ++it) + for(auto&& iter : list) { - (*it)->SetAction(object, f, packet); + iter->SetAction(object, f, packet); } } diff --git a/source/gwork/source/Controls/Base.cpp b/source/gwork/source/Controls/Base.cpp index bfd694c4..fe10841e 100644 --- a/source/gwork/source/Controls/Base.cpp +++ b/source/gwork/source/Controls/Base.cpp @@ -63,6 +63,7 @@ Base::~Base() if (canvas) canvas->PreDeleteCanvas(this); } + Base::List::iterator iter = Children.begin(); while (iter != Children.end()) @@ -174,24 +175,22 @@ bool Base::Visible() const void Base::InvalidateChildren(bool bRecursive) { - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for(auto&& it : Children) { - (*it)->Invalidate(); + it->Invalidate(); if (bRecursive) - (*it)->InvalidateChildren(bRecursive); + it->InvalidateChildren(bRecursive); } if (m_innerPanel) { - for (Base::List::iterator it = m_innerPanel->Children.begin(); - it != m_innerPanel->Children.end(); - ++it) - { - (*it)->Invalidate(); + for(auto&& it : m_innerPanel->Children) + { + it->Invalidate(); if (bRecursive) - (*it)->InvalidateChildren(bRecursive); + it->InvalidateChildren(bRecursive); } } } @@ -253,12 +252,8 @@ void Base::BringToFront() Controls::Base* Base::FindChildByName(const Gwk::String& name, bool bRecursive) { - Base::List::iterator iter; - - for (iter = Children.begin(); iter != Children.end(); ++iter) + for(auto&& child : Children) { - Base* child = *iter; - if (!child->GetName().empty() && child->GetName() == name) return child; @@ -343,10 +338,10 @@ Controls::Base* Base::GetChild(unsigned int i) if (i >= NumChildren()) return nullptr; - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for(auto&& iter : Children) { if (i == 0) - return *iter; + return iter; i--; } @@ -423,7 +418,7 @@ bool Base::SetBounds(const Gwk::Rect& bounds) { if (m_bounds == bounds) return false; - + const Gwk::Rect oldBounds = GetBounds(); m_bounds = bounds; OnBoundsChanged(oldBounds); @@ -452,9 +447,9 @@ void Base::OnBoundsChanged(Gwk::Rect oldBounds) void Base::OnScaleChanged() { - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for(auto&& child : Children) { - (*iter)->OnScaleChanged(); + child->OnScaleChanged(); } } @@ -502,10 +497,8 @@ void Base::DoCacheRender(Gwk::Skin::Base* skin, Gwk::Controls::Base* master) if (!Children.empty()) { // Now render my kids - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for(auto&& child : Children) { - Base* child = *iter; - if (!child->Hidden()) { // Draw child control using normal render. If it is cached it will @@ -588,10 +581,8 @@ void Base::RenderRecursive(Gwk::Skin::Base* skin, const Gwk::Rect& cliprect) if (!Children.empty()) { // Now render my kids - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for(auto&& child : Children) { - Base* child = *iter; - if (child->Hidden()) continue; @@ -627,9 +618,9 @@ void Base::SetSkin(Skin::Base* skin, bool doChildren) if (doChildren) { - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for(auto&& child : Children) { - (*it)->SetSkin(skin, true); + child->SetSkin(skin, true); } } } @@ -788,10 +779,8 @@ void Base::RecurseLayout(Skin::Base* skin) rBounds.y += m_padding.top; rBounds.h -= m_padding.top + m_padding.bottom; - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for(auto&& child : Children) { - Base* child = *iter; - if (child->Hidden()) continue; @@ -855,9 +844,8 @@ void Base::RecurseLayout(Skin::Base* skin) // // Fill uses the left over space, so do that now. // - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for(auto&& child : Children) { - Base* child = *iter; Position dock = child->GetDock(); if (!(dock & Position::Fill)) @@ -886,9 +874,9 @@ void Base::RecurseLayout(Skin::Base* skin) bool Base::IsChild(Controls::Base* child) { - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for(auto&& iter : Children) { - if (child == (*iter)) + if (child == iter) return true; } @@ -949,9 +937,9 @@ bool Base::IsMenuComponent() void Base::CloseMenus() { - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for(auto&& child : Children) { - (*it)->CloseMenus(); + child->CloseMenus(); } } @@ -1015,10 +1003,8 @@ Gwk::Point Base::ChildrenSize() { Gwk::Point size; - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for(auto&& child : Children) { - Base* child = *iter; - if (child->Hidden()) continue; @@ -1071,9 +1057,9 @@ bool Base::HandleAccelerator(Gwk::String& accelerator) } } - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for(auto&& child : Children) { - if ((*it)->HandleAccelerator(accelerator)) + if (child->HandleAccelerator(accelerator)) return true; } @@ -1207,12 +1193,9 @@ void Base::SetValue(const String& strValue) int Base::GetNamedChildren(Gwk::ControlList& list, const Gwk::String& strName, bool bDeep) { int iFound = 0; - Base::List::iterator iter; - for (iter = Children.begin(); iter != Children.end(); ++iter) + for(auto&& child : Children) { - Base* child = *iter; - if (!child->GetName().empty() && child->GetName() == strName) { list.Add(child); diff --git a/source/gwork/source/Controls/Canvas.cpp b/source/gwork/source/Controls/Canvas.cpp index ce22cc83..1ea3d6cf 100644 --- a/source/gwork/source/Controls/Canvas.cpp +++ b/source/gwork/source/Controls/Canvas.cpp @@ -143,11 +143,8 @@ void Canvas::ProcessDelayedDeletes() m_deleteList.clear(); m_deleteSet.clear(); - for (Gwk::Controls::Base::List::iterator it = deleteList.begin(); - it != deleteList.end(); - ++it) + for(auto&& control : deleteList) { - Gwk::Controls::Base* control = *it; control->PreDelete(GetSkin()); delete control; Redraw(); diff --git a/source/gwork/source/Controls/CollapsibleCategory.cpp b/source/gwork/source/Controls/CollapsibleCategory.cpp index 29592353..c5694dbc 100644 --- a/source/gwork/source/Controls/CollapsibleCategory.cpp +++ b/source/gwork/source/Controls/CollapsibleCategory.cpp @@ -144,14 +144,14 @@ void CollapsibleCategory::SetText(const String& text) void CollapsibleCategory::UnselectAll() { Base::List& children = GetChildren(); - - for (Base::List::iterator iter = children.begin(); iter != children.end(); ++iter) + + for(auto&& iter : children) { - CategoryButton* child = gwk_cast(*iter); - + CategoryButton* child = gwk_cast(iter); + if (!child) continue; - + child->SetToggleState(false); } } @@ -162,17 +162,17 @@ void CollapsibleCategory::PostLayout(Skin::Base* /*skin*/) SetHeight(m_button->Height()); else SizeToChildren(false, true); - + Base::List& children = GetChildren(); bool b = true; - - for (Base::List::iterator iter = children.begin(); iter != children.end(); ++iter) + + for(auto&& iter : children) { - CategoryButton* child = gwk_cast(*iter); - + CategoryButton* child = gwk_cast(iter); + if (!child) continue; - + child->m_bAlt = b; child->UpdateColours(); b = !b; @@ -182,18 +182,18 @@ void CollapsibleCategory::PostLayout(Skin::Base* /*skin*/) Button* CollapsibleCategory::GetSelected() { Base::List& children = GetChildren(); - - for (Base::List::iterator iter = children.begin(); iter != children.end(); ++iter) + + for(auto&& iter : children) { - CategoryButton* child = gwk_cast(*iter); - + CategoryButton* child = gwk_cast(iter); + if (!child) continue; - + if (child->GetToggleState()) return child; } - + return nullptr; } diff --git a/source/gwork/source/Controls/ComboBox.cpp b/source/gwork/source/Controls/ComboBox.cpp index fc9025e5..fa6b877d 100644 --- a/source/gwork/source/Controls/ComboBox.cpp +++ b/source/gwork/source/Controls/ComboBox.cpp @@ -150,17 +150,12 @@ void ComboBox::OnItemSelected(Controls::Base* control) void ComboBox::SelectItemByName(const Gwk::String& name, bool bFireChangeEvents) { - Base::List& children = m_menu->GetChildren(); - Base::List::iterator it = children.begin(); - - while (it != children.end()) + for(auto&& iter : m_menu->GetChildren()) { - MenuItem* child = gwk_cast(*it); + MenuItem* child = gwk_cast(iter); if (child->GetName() == name) return SelectItem(child, bFireChangeEvents); - - ++it; } } diff --git a/source/gwork/source/Controls/DockedTabControl.cpp b/source/gwork/source/Controls/DockedTabControl.cpp index 61a29196..47fa701b 100644 --- a/source/gwork/source/Controls/DockedTabControl.cpp +++ b/source/gwork/source/Controls/DockedTabControl.cpp @@ -78,9 +78,9 @@ void DockedTabControl::MoveTabsTo(DockedTabControl* target) { Base::List Children = GetTabStrip()->Children; - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for (auto&& iter : Children) { - TabButton* button = gwk_cast(*iter); + TabButton* button = gwk_cast(iter); if (!button) continue; diff --git a/source/gwork/source/Controls/ListBox.cpp b/source/gwork/source/Controls/ListBox.cpp index ef60ea9f..6d9c5132 100644 --- a/source/gwork/source/Controls/ListBox.cpp +++ b/source/gwork/source/Controls/ListBox.cpp @@ -173,9 +173,9 @@ void ListBox::SelectByString(const String& strName, bool bClearOthers) Base::List& children = m_table->GetChildren(); - for (Base::List::iterator iter = children.begin(); iter != children.end(); ++iter) + for(auto&& iter : children) { - ListBoxRow* child = gwk_cast(*iter); + ListBoxRow* child = gwk_cast(iter); if (!child) continue; diff --git a/source/gwork/source/Controls/Menu.cpp b/source/gwork/source/Controls/Menu.cpp index d0d95017..9d1d3f54 100644 --- a/source/gwork/source/Controls/Menu.cpp +++ b/source/gwork/source/Controls/Menu.cpp @@ -42,15 +42,11 @@ void Menu::Layout(Skin::Base* skin) { int childrenHeight = 0; - for (Base::List::iterator it = m_innerPanel->Children.begin(); - it != m_innerPanel->Children.end(); - ++it) + for(auto&& child : m_innerPanel->Children) { - Base* child = (*it); - if (!child) continue; - + childrenHeight += child->Height(); } @@ -60,7 +56,7 @@ void Menu::Layout(Skin::Base* skin) } SetSize(Width(), childrenHeight); - + ParentClass::Layout(skin); } @@ -93,12 +89,8 @@ void Menu::OnAddItem(MenuItem* item) void Menu::ClearItems() { - for (Base::List::iterator it = m_innerPanel->Children.begin(); - it != m_innerPanel->Children.end(); - ++it) + for(auto&& child : m_innerPanel->Children) { - Base* child = *it; - if (!child) continue; @@ -108,11 +100,8 @@ void Menu::ClearItems() void Menu::CloseAll() { - for (Base::List::iterator it = m_innerPanel->Children.begin(); - it != m_innerPanel->Children.end(); - ++it) + for(auto&& child : m_innerPanel->Children) { - Base* child = *it; MenuItem* item = gwk_cast(child); if (!item) @@ -124,11 +113,8 @@ void Menu::CloseAll() bool Menu::IsMenuOpen() { - for (Base::List::iterator it = m_innerPanel->Children.begin(); - it != m_innerPanel->Children.end(); - ++it) + for(auto&& child : m_innerPanel->Children) { - Base* child = *it; MenuItem* item = gwk_cast(child); if (!item) diff --git a/source/gwork/source/Controls/Properties.cpp b/source/gwork/source/Controls/Properties.cpp index 88699719..9e23de3e 100644 --- a/source/gwork/source/Controls/Properties.cpp +++ b/source/gwork/source/Controls/Properties.cpp @@ -60,9 +60,9 @@ PropertyRow* Properties::Add(const String& text, Property::Base* prop, const Str PropertyRow* Properties::Find(const String& text) { - for (Base::List::iterator it = GetChildren().begin(); it != GetChildren().end(); ++it) + for (auto&& it : GetChildren()) { - PropertyRow* row = gwk_cast(*it); + PropertyRow* row = gwk_cast(it); if (!row) continue; @@ -78,9 +78,9 @@ void Properties::Clear() { Base::List ChildListCopy = GetChildren(); - for (Base::List::iterator it = ChildListCopy.begin(); it != ChildListCopy.end(); ++it) + for (auto&& it : ChildListCopy) { - PropertyRow* row = gwk_cast(*it); + PropertyRow* row = gwk_cast(it); if (!row) continue; diff --git a/source/gwork/source/Controls/PropertyTree.cpp b/source/gwork/source/Controls/PropertyTree.cpp index a28ddf07..982b238a 100644 --- a/source/gwork/source/Controls/PropertyTree.cpp +++ b/source/gwork/source/Controls/PropertyTree.cpp @@ -29,9 +29,9 @@ Properties* PropertyTree::Find(const String& text) { Controls::Base::List& children = GetChildNodes(); - for (Base::List::iterator iter = children.begin(); iter != children.end(); ++iter) + for (auto&& iter : children) { - PropertyTreeNode* child = gwk_cast(*iter); + PropertyTreeNode* child = gwk_cast(iter); if (!child) continue; @@ -40,11 +40,9 @@ Properties* PropertyTree::Find(const String& text) { Base::List& nodechildren = child->GetChildren(); - for (Base::List::iterator subiter = nodechildren.begin(); - subiter != nodechildren.end(); - ++subiter) + for (auto&& subiter : nodechildren) { - Properties* propertyChild = gwk_cast(*subiter); + Properties* propertyChild = gwk_cast(subiter); if (!propertyChild) continue; diff --git a/source/gwork/source/Controls/RadioButtonController.cpp b/source/gwork/source/Controls/RadioButtonController.cpp index b87ec73b..1ebe8231 100644 --- a/source/gwork/source/Controls/RadioButtonController.cpp +++ b/source/gwork/source/Controls/RadioButtonController.cpp @@ -26,9 +26,8 @@ void RadioButtonController::OnRadioClicked(Gwk::Controls::Base* fromPanel) RadioButton* checkedRadioButton = gwk_cast(fromPanel); // Iterate through all other buttons and set them to false; - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for (auto&& child : Children) { - Base* child = *iter; LabeledRadioButton* lRB = gwk_cast(child); if (lRB) diff --git a/source/gwork/source/Controls/ResizableControl.cpp b/source/gwork/source/Controls/ResizableControl.cpp index c3dfebf9..67754de9 100644 --- a/source/gwork/source/Controls/ResizableControl.cpp +++ b/source/gwork/source/Controls/ResizableControl.cpp @@ -65,9 +65,9 @@ GWK_CONTROL_CONSTRUCTOR(ResizableControl) void ResizableControl::DisableResizing() { - for (Base::List::iterator it = Children.begin(); it != Children.end(); ++it) + for (auto&& it : Children) { - Resizer* resizer = gwk_cast(*it); + Resizer* resizer = gwk_cast(it); if (!resizer) continue; diff --git a/source/gwork/source/Controls/RichLabel.cpp b/source/gwork/source/Controls/RichLabel.cpp index b6e1caa7..3c72d3df 100644 --- a/source/gwork/source/Controls/RichLabel.cpp +++ b/source/gwork/source/Controls/RichLabel.cpp @@ -170,17 +170,17 @@ void RichLabel::Rebuild() int y = 0; int lineheight = -1; - for (DividedText::List::iterator it = m_textBlocks.begin(); it != m_textBlocks.end(); ++it) + for (auto&& iter : m_textBlocks) { - if (it->type == Type_Newline) + if (iter.type == Type_Newline) { CreateNewline(x, y, lineheight); continue; } - if (it->type == Type_Text) + if (iter.type == Type_Text) { - CreateLabel((*it).text, *it, x, y, lineheight, false); + CreateLabel(iter.text, iter, x, y, lineheight, false); continue; } } diff --git a/source/gwork/source/Controls/ScrollControl.cpp b/source/gwork/source/Controls/ScrollControl.cpp index a4ab786a..e08bc323 100644 --- a/source/gwork/source/Controls/ScrollControl.cpp +++ b/source/gwork/source/Controls/ScrollControl.cpp @@ -117,12 +117,8 @@ bool ScrollControl::ContentsAreDocked() if (!m_innerPanel) return false; - for (Base::List::iterator iter = m_innerPanel->Children.begin(); - iter != m_innerPanel->Children.end(); - ++iter) + for (auto&& child : m_innerPanel->Children) { - Base* child = *iter; - if (child->GetDock() == Position::None) return false; } @@ -151,11 +147,8 @@ void ScrollControl::UpdateScrollBars() int childrenHeight = 0; // Get the max size of all our children together - for (Base::List::iterator iter = m_innerPanel->Children.begin(); - iter != m_innerPanel->Children.end(); - ++iter) + for (auto&& child : m_innerPanel->Children) { - Base* child = *iter; childrenWidth = std::max(childrenWidth, child->Right()); childrenHeight = std::max(childrenHeight, child->Bottom()); } diff --git a/source/gwork/source/Controls/TabStrip.cpp b/source/gwork/source/Controls/TabStrip.cpp index 78de9b12..40ee5a76 100644 --- a/source/gwork/source/Controls/TabStrip.cpp +++ b/source/gwork/source/Controls/TabStrip.cpp @@ -70,9 +70,9 @@ void TabStrip::Layout(Skin::Base* skin) Gwk::Point largestTab(5, 5); int iNum = 0; - for (Base::List::iterator iter = Children.begin(); iter != Children.end(); ++iter) + for (auto&& iter : Children) { - TabButton* button = gwk_cast(*iter); + TabButton* button = gwk_cast(iter); if (!button) continue; @@ -81,7 +81,6 @@ void TabStrip::Layout(Skin::Base* skin) Margin m; int iNotFirst = iNum > 0 ? -1 : 0; - if (m_dock == Position::Top) { m.left = iNotFirst; button->Dock(Position::Left); diff --git a/source/gwork/source/Controls/Text.cpp b/source/gwork/source/Controls/Text.cpp index 8c1a58f7..29a0241a 100644 --- a/source/gwork/source/Controls/Text.cpp +++ b/source/gwork/source/Controls/Text.cpp @@ -52,13 +52,9 @@ void Text::SetFont(Gwk::Font* font) m_bTextChanged = true; // Change the font of multilines too! { - TextLines::iterator it = m_lines.begin(); - TextLines::iterator itEnd = m_lines.end(); - - while (it != itEnd) + for (auto&& it : m_lines) { - (*it)->SetFont(m_font); - ++it; + it->SetFont(m_font); } } Invalidate(); @@ -280,15 +276,15 @@ void Text::RefreshSizeWrap() { RemoveAllChildren(); - for (TextLines::iterator it = m_lines.begin(); it != m_lines.end(); ++it) + for (auto&& it : m_lines) { - delete *it; + delete it; } m_lines.clear(); std::vector words; SplitWords(GetText(), words); - + // Adding a word to the end simplifies the code below // which is anything but simple. words.push_back(""); @@ -316,7 +312,7 @@ void Text::RefreshSizeWrap() // Does adding this word drive us over the width? { - strLine += (*it); + strLine += *it; Gwk::Point p = GetSkin()->GetRender()->MeasureText(GetFont(), strLine); if (p.x > Width()) @@ -375,15 +371,11 @@ unsigned int Text::NumLines() Text* Text::GetLine(int i) { - TextLines::iterator it = m_lines.begin(); - TextLines::iterator itEnd = m_lines.end(); - - while (it != itEnd) + for (auto&& it : m_lines) { if (i == 0) - return *it; + return it; - ++it; i--; } diff --git a/source/gwork/source/Controls/TreeNode.cpp b/source/gwork/source/Controls/TreeNode.cpp index d1f75d35..70c31aff 100644 --- a/source/gwork/source/Controls/TreeNode.cpp +++ b/source/gwork/source/Controls/TreeNode.cpp @@ -183,9 +183,9 @@ void TreeNode::ExpandAll() Open(); Base::List& children = GetChildNodes(); - for (Base::List::iterator iter = children.begin(); iter != children.end(); ++iter) + for (auto&& iter : children) { - TreeNode* child = gwk_cast(*iter); + TreeNode* child = gwk_cast(iter); if (!child) continue; @@ -261,9 +261,9 @@ void TreeNode::DeselectAll() Base::List& children = GetChildNodes(); - for (Base::List::iterator iter = children.begin(); iter != children.end(); ++iter) + for (auto&& iter : children) { - TreeNode* child = gwk_cast(*iter); + TreeNode* child = gwk_cast(iter); if (!child) continue; diff --git a/source/gwork/source/Events.cpp b/source/gwork/source/Events.cpp index 454a6c03..32af7c3c 100644 --- a/source/gwork/source/Events.cpp +++ b/source/gwork/source/Events.cpp @@ -59,9 +59,8 @@ void Caller::CleanLinks() { std::list::iterator iter; - for (iter = m_handlers.begin(); iter != m_handlers.end(); ++iter) + for (auto&& h : m_handlers) { - HandlerInstance& h = *iter; h.object->UnRegisterCaller(this); } @@ -80,11 +79,9 @@ void Caller::Call(Controls::Base* pThis, Gwk::Event::Info information) Gwk::Event::Information info; info = information; info.ControlCaller = pThis; - std::list::iterator iter; - for (iter = m_handlers.begin(); iter != m_handlers.end(); ++iter) + for (auto&& h : m_handlers) { - HandlerInstance& h = *iter; info.Packet = &h.Packet; if (h.fnFunction) diff --git a/source/gwork/source/InputHandler.cpp b/source/gwork/source/InputHandler.cpp index 99c7f116..6f312755 100644 --- a/source/gwork/source/InputHandler.cpp +++ b/source/gwork/source/InputHandler.cpp @@ -99,12 +99,8 @@ static bool FindKeyboardFocus(Controls::Base* control) { // Make sure none of our children have keyboard focus first // todo recursive - for (Controls::Base::List::iterator iter = control->Children.begin(); - iter != control->Children.end(); - ++iter) + for (auto&& child : control->Children) { - Controls::Base* child = *iter; - if (child == Gwk::KeyboardFocus) return false; } diff --git a/source/util/source/ControlFactory/ControlFactory.cpp b/source/util/source/ControlFactory/ControlFactory.cpp index 2782f23a..f1e4dde3 100644 --- a/source/util/source/ControlFactory/ControlFactory.cpp +++ b/source/util/source/ControlFactory/ControlFactory.cpp @@ -167,12 +167,10 @@ List& GetList() ControlFactory::Base* Find(const Gwk::String& name) { - for (ControlFactory::List::iterator it = ControlFactory::GetList().cbegin(); - it != ControlFactory::GetList().cend(); - ++it) + for (auto const& iter : ControlFactory::GetList) { - if ((*it)->Name() == name) - return *it; + if (iter->Name() == name) + return iter; } return nullptr; @@ -190,12 +188,10 @@ void Base::AddProperty(Property* prop) Base* Base::GetBaseFactory() { - for (ControlFactory::List::iterator it = ControlFactory::GetList().cbegin(); - it != ControlFactory::GetList().cend(); - ++it) + for (auto const& iter : ControlFactory::GetList()) { - if ((*it)->Name() == ParentFactory()) - return *it; + if iter->Name() == ParentFactory()) + return iter; } return nullptr; @@ -203,14 +199,12 @@ Base* Base::GetBaseFactory() Property* Base::GetProperty(const Gwk::String& name) { - for (ControlFactory::Property::List::const_iterator it = Properties().cbegin(), - itEnd = Properties().cend(); - it != itEnd; ++it) + for (auto const& iter : Properties()) { - if ((*it)->Name() != name) + if iter->Name() != name) continue; - return *it; + return iter; } Base* base = GetBaseFactory(); @@ -256,11 +250,9 @@ Controls::Base* Clone(Controls::Base* source, ControlFactory::Base* factory) while (factory) { - for (ControlFactory::Property::List::const_iterator - it = factory->Properties().cbegin(), itEnd = factory->Properties().cend(); - it != itEnd; ++it) + for(auto&& iter : factory->Properties()) { - (*it)->SetValueFromString(control, (*it)->GetValueAsString(source)); + iter->SetValueFromString(control, iter->GetValueAsString(source)); } factory = factory->GetBaseFactory(); From a9438aae31aa53b5374ae50ead84cce95676b066 Mon Sep 17 00:00:00 2001 From: BQ Date: Tue, 17 May 2016 14:09:29 +0100 Subject: [PATCH 11/54] GLFW OpenGL. Something on screen. - Hmm. --- cmake/Config.cmake | 11 +- cmake/Modules/FindGLFW.cmake | 257 + source/platform/include/Gwork/Input/OpenGL.h | 153 + source/platform/include/Gwork/PlatformTypes.h | 5 + .../platform/include/Gwork/Renderers/OpenGL.h | 46 +- .../renderers/OpenGL/FreeImage/FreeImage.h | 1104 --- source/platform/renderers/OpenGL/OpenGL.cpp | 94 +- source/platform/renderers/OpenGL/stb_image.h | 6755 +++++++++++++++++ source/samples/OpenGL/OpenGLSample.cpp | 186 +- 9 files changed, 7306 insertions(+), 1305 deletions(-) create mode 100644 cmake/Modules/FindGLFW.cmake create mode 100644 source/platform/include/Gwork/Input/OpenGL.h delete mode 100644 source/platform/renderers/OpenGL/FreeImage/FreeImage.h create mode 100644 source/platform/renderers/OpenGL/stb_image.h diff --git a/cmake/Config.cmake b/cmake/Config.cmake index dd24d343..695c6956 100644 --- a/cmake/Config.cmake +++ b/cmake/Config.cmake @@ -17,12 +17,12 @@ if(WIN32) # TODO: option(RENDER_DIRECT2D "Renderer: Direct2D" OFF) # TODO: option(RENDER_DIRECTX9 "Renderer: DirectX9" OFF) # TODO: option(RENDER_GDIPLUS "Renderer: GDIPlus" OFF) - # TODO: option(RENDER_OPENGL "Renderer: OpenGL" OFF) set(GWK_PLATFORM_NAME "Windows") endif() # Cross-platform option(RENDER_ALLEGRO5 "Renderer: Allegro5" OFF) +option(RENDER_OPENGL "Renderer: OPENGL" OFF) option(RENDER_SDL2 "Renderer: SDL2" OFF) option(RENDER_SFML2 "Renderer: SFML2" OFF) @@ -53,7 +53,6 @@ endif() if(BUILD_TEST) message("Including tests") - # find_package(Ponder 1.0 REQUIRED) endif(BUILD_TEST) if(BUILD_SAMPLE) @@ -70,6 +69,14 @@ if(RENDER_ALLEGRO5) set(GWK_PLATFORM_NAME "Allegro5") endif(RENDER_ALLEGRO5) +if(RENDER_OPENGL) + find_package(GLFW REQUIRED) + set(GLFW_DEPENDENCIES "-framework OpenGL") + set(GWK_RENDER_NAME "OpenGL") + set(GWK_RENDER_INCLUDES "${GLFW_INCLUDE_DIR}") + set(GWK_RENDER_LIBRARIES ${GLFW_LIBRARIES} ${GLFW_DEPENDENCIES}) +endif(RENDER_OPENGL) + if(RENDER_SDL2) find_package(SDL2 REQUIRED) find_package(SDL2_ttf REQUIRED) diff --git a/cmake/Modules/FindGLFW.cmake b/cmake/Modules/FindGLFW.cmake new file mode 100644 index 00000000..349f9e4c --- /dev/null +++ b/cmake/Modules/FindGLFW.cmake @@ -0,0 +1,257 @@ +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is deleted and replaced with: +# +# 6. Trademarks. This License does not grant permission to use the trade +# names, trademarks, service marks, or product names of the Licensor +# and its affiliates, except as required to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. +# +# You may obtain a copy of the Apache License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. +# + +# Try to find GLFW library and include path. +# Once done this will define +# +# GLFW_FOUND +# GLFW_INCLUDE_DIR +# GLFW_LIBRARIES +# +# Source: https://github.com/PixarAnimationStudios/OpenSubdiv/blob/master/cmake/FindGLFW.cmake +# + +find_path( GLFW_INCLUDE_DIR + NAMES + GLFW/glfw3.h + HINTS + "${GLFW_LOCATION}/include" + "$ENV{GLFW_LOCATION}/include" + PATHS + "$ENV{PROGRAMFILES}/GLFW/include" + "${OPENGL_INCLUDE_DIR}" + /usr/openwin/share/include + /usr/openwin/include + /usr/X11R6/include + /usr/include/X11 + /opt/graphics/OpenGL/include + /opt/graphics/OpenGL/contrib/libglfw + /usr/local/include + /usr/include/GL + /usr/include + DOC + "The directory where GLFW/glfw3.h resides" +) + +# +# XXX: Do we still need to search for GL/glfw.h? +# +find_path( GLFW_INCLUDE_DIR + NAMES + GL/glfw.h + HINTS + "${GLFW_LOCATION}/include" + "$ENV{GLFW_LOCATION}/include" + PATHS + "$ENV{PROGRAMFILES}/GLFW/include" + "${OPENGL_INCLUDE_DIR}" + /usr/openwin/share/include + /usr/openwin/include + /usr/X11R6/include + /usr/include/X11 + /opt/graphics/OpenGL/include + /opt/graphics/OpenGL/contrib/libglfw + /usr/local/include + /usr/include/GL + /usr/include + DOC + "The directory where GL/glfw.h resides" +) + +if (WIN32) + if(CYGWIN) + find_library( GLFW_glfw_LIBRARY + NAMES + glfw32 + HINTS + "${GLFW_LOCATION}/lib" + "${GLFW_LOCATION}/lib/x64" + "$ENV{GLFW_LOCATION}/lib" + PATHS + "${OPENGL_LIBRARY_DIR}" + /usr/lib + /usr/lib/w32api + /usr/local/lib + /usr/X11R6/lib + DOC + "The GLFW library" + ) + else() + find_library( GLFW_glfw_LIBRARY + NAMES + glfw32 + glfw32s + glfw + glfw3 + HINTS + "${GLFW_LOCATION}/lib" + "${GLFW_LOCATION}/lib/x64" + "${GLFW_LOCATION}/lib-msvc110" + "${GLFW_LOCATION}/lib-vc2012" + "$ENV{GLFW_LOCATION}/lib" + "$ENV{GLFW_LOCATION}/lib/x64" + "$ENV{GLFW_LOCATION}/lib-msvc110" + "$ENV{GLFW_LOCATION}/lib-vc2012" + PATHS + "$ENV{PROGRAMFILES}/GLFW/lib" + "${OPENGL_LIBRARY_DIR}" + DOC + "The GLFW library" + ) + endif() +else () + if (APPLE) + find_library( GLFW_glfw_LIBRARY glfw + NAMES + glfw + glfw3 + HINTS + "${GLFW_LOCATION}/lib" + "${GLFW_LOCATION}/lib/cocoa" + "$ENV{GLFW_LOCATION}/lib" + "$ENV{GLFW_LOCATION}/lib/cocoa" + PATHS + /usr/local/lib + ) + set(GLFW_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX") + set(GLFW_corevideo_LIBRARY "-framework CoreVideo" CACHE STRING "CoreVideo framework for OSX") + set(GLFW_iokit_LIBRARY "-framework IOKit" CACHE STRING "IOKit framework for OSX") + else () + # (*)NIX + + find_package(Threads REQUIRED) + + find_package(X11 REQUIRED) + + if(NOT X11_Xrandr_FOUND) + message(FATAL_ERROR "Xrandr library not found - required for GLFW") + endif() + + if(NOT X11_xf86vmode_FOUND) + message(FATAL_ERROR "xf86vmode library not found - required for GLFW") + endif() + + if(NOT X11_Xcursor_FOUND) + message(FATAL_ERROR "Xcursor library not found - required for GLFW") + endif() + + if(NOT X11_Xinerama_FOUND) + message(FATAL_ERROR "Xinerama library not found - required for GLFW") + endif() + + list(APPEND GLFW_x11_LIBRARY "${X11_Xrandr_LIB}" "${X11_Xxf86vm_LIB}" "${X11_Xcursor_LIB}" "${X11_Xinerama_LIB}" "${CMAKE_THREAD_LIBS_INIT}" -lrt -lXi) + + find_library( GLFW_glfw_LIBRARY + NAMES + glfw + glfw3 + HINTS + "${GLFW_LOCATION}/lib" + "$ENV{GLFW_LOCATION}/lib" + "${GLFW_LOCATION}/lib/x11" + "$ENV{GLFW_LOCATION}/lib/x11" + PATHS + /usr/lib64 + /usr/lib + /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} + /usr/local/lib64 + /usr/local/lib + /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE} + /usr/openwin/lib + /usr/X11R6/lib + DOC + "The GLFW library" + ) + endif (APPLE) +endif (WIN32) + +set( GLFW_FOUND "NO" ) + +if(GLFW_INCLUDE_DIR) + + if(GLFW_glfw_LIBRARY) + set( GLFW_LIBRARIES "${GLFW_glfw_LIBRARY}" + "${GLFW_x11_LIBRARY}" + "${GLFW_cocoa_LIBRARY}" + "${GLFW_iokit_LIBRARY}" + "${GLFW_corevideo_LIBRARY}" ) + set( GLFW_FOUND "YES" ) + set (GLFW_LIBRARY "${GLFW_LIBRARIES}") + set (GLFW_INCLUDE_PATH "${GLFW_INCLUDE_DIR}") + endif(GLFW_glfw_LIBRARY) + + + # Tease the GLFW_VERSION numbers from the lib headers + function(parseVersion FILENAME VARNAME) + + set(PATTERN "^#define ${VARNAME}.*$") + + file(STRINGS "${GLFW_INCLUDE_DIR}/${FILENAME}" TMP REGEX ${PATTERN}) + + string(REGEX MATCHALL "[0-9]+" TMP ${TMP}) + + set(${VARNAME} ${TMP} PARENT_SCOPE) + + endfunction() + + + if(EXISTS "${GLFW_INCLUDE_DIR}/GL/glfw.h") + + parseVersion(GL/glfw.h GLFW_VERSION_MAJOR) + parseVersion(GL/glfw.h GLFW_VERSION_MINOR) + parseVersion(GL/glfw.h GLFW_VERSION_REVISION) + + elseif(EXISTS "${GLFW_INCLUDE_DIR}/GLFW/glfw3.h") + + parseVersion(GLFW/glfw3.h GLFW_VERSION_MAJOR) + parseVersion(GLFW/glfw3.h GLFW_VERSION_MINOR) + parseVersion(GLFW/glfw3.h GLFW_VERSION_REVISION) + + endif() + + if(${GLFW_VERSION_MAJOR} OR ${GLFW_VERSION_MINOR} OR ${GLFW_VERSION_REVISION}) + set(GLFW_VERSION "${GLFW_VERSION_MAJOR}.${GLFW_VERSION_MINOR}.${GLFW_VERSION_REVISION}") + set(GLFW_VERSION_STRING "${GLFW_VERSION}") + mark_as_advanced(GLFW_VERSION) + endif() + +endif(GLFW_INCLUDE_DIR) + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args(GLFW + REQUIRED_VARS + GLFW_INCLUDE_DIR + GLFW_LIBRARIES + VERSION_VAR + GLFW_VERSION +) + +mark_as_advanced( + GLFW_INCLUDE_DIR + GLFW_LIBRARIES + GLFW_glfw_LIBRARY + GLFW_cocoa_LIBRARY +) + diff --git a/source/platform/include/Gwork/Input/OpenGL.h b/source/platform/include/Gwork/Input/OpenGL.h new file mode 100644 index 00000000..da5625b6 --- /dev/null +++ b/source/platform/include/Gwork/Input/OpenGL.h @@ -0,0 +1,153 @@ +/* + * Gwork + * Copyright (c) 2013-16 Billy Quith + * See license in Gwork.h + */ + +#pragma once +#ifndef GWK_INPUT_OPENGL_GLFW_H +#define GWK_INPUT_OPENGL_GLFW_H + +#include +#include + +namespace Gwk +{ + namespace Input + { + class GLFW + { + public: + + struct KeyEvent { + int key, scancode, action, mods; + }; + + struct MouseEvent { + double x, y; + }; + + GLFW() + : m_eventListener(nullptr) + , m_mouse(-1, -1) + {} + + void Initialize(IInputEventListener* c) + { + m_eventListener = c; + } + + unsigned char TranslateKeyCode(int iKeyCode) + { + switch (iKeyCode) + { + case GLFW_KEY_BACKSPACE: + return Gwk::Key::Backspace; + + case GLFW_KEY_ENTER: + return Gwk::Key::Return; + + case GLFW_KEY_ESCAPE: + return Gwk::Key::Escape; + + case GLFW_KEY_TAB: + return Gwk::Key::Tab; + + case GLFW_KEY_SPACE: + return Gwk::Key::Space; + + case GLFW_KEY_UP: + return Gwk::Key::Up; + + case GLFW_KEY_DOWN: + return Gwk::Key::Down; + + case GLFW_KEY_LEFT: + return Gwk::Key::Left; + + case GLFW_KEY_RIGHT: + return Gwk::Key::Right; + + case GLFW_KEY_HOME: + return Gwk::Key::Home; + + case GLFW_KEY_END: + return Gwk::Key::End; + + case GLFW_KEY_DELETE: + return Gwk::Key::Delete; + + case GLFW_KEY_LEFT_CONTROL: + return Gwk::Key::Control; + + case GLFW_KEY_LEFT_ALT: + return Gwk::Key::Alt; + + case GLFW_KEY_LEFT_SHIFT: + return Gwk::Key::Shift; + + case GLFW_KEY_RIGHT_CONTROL: + return Gwk::Key::Control; + + case GLFW_KEY_RIGHT_ALT: + return Gwk::Key::Alt; + + case GLFW_KEY_RIGHT_SHIFT: + return Gwk::Key::Shift; + + default: ; + } + + return Gwk::Key::Invalid; + } + + bool ProcessKeyEvent(const KeyEvent& event) + { + if (!m_eventListener) + return false; + + const bool bPressed = (event.action == GLFW_PRESS); + const char keyCode = event.key; + const bool control = (event.mods & GLFW_MOD_CONTROL) != 0; + + if (control && bPressed && keyCode >= 'a' && keyCode <= 'z') + return m_eventListener->InputCharacter(keyCode); + + const unsigned char iKey = TranslateKeyCode(keyCode); + return m_eventListener->InputKey(iKey, bPressed); + } + + bool ProcessMouseMove(int x, int y) + { + if (m_mouse.x < 0) + m_lastMouse = m_mouse; + + m_mouse.set(x, y); + const Point delta(m_lastMouse - m_mouse); + m_lastMouse = m_mouse; + + return m_eventListener->InputMouseMoved(m_mouse.x, m_mouse.y, + delta.x, delta.y); + } + + bool ProcessMouseButtons(int button, int action, int mods) + { + return m_eventListener->InputMouseButton(button, action == GLFW_PRESS); + } + + bool ProcessScroll(float sx, float sy) + { + return m_eventListener->InputMouseWheel(sy); + } + + protected: + + IInputEventListener *m_eventListener; + Point m_mouse, m_lastMouse; + + }; + + } // Input +} // Gwk + +#endif // ifndef GWK_INPUT_OPENGL_GLFW_H diff --git a/source/platform/include/Gwork/PlatformTypes.h b/source/platform/include/Gwork/PlatformTypes.h index 6df81c32..f8740323 100644 --- a/source/platform/include/Gwork/PlatformTypes.h +++ b/source/platform/include/Gwork/PlatformTypes.h @@ -58,6 +58,11 @@ namespace Gwk : x(x_), y(y_) {} + void set(int x_, int y_) + { + x = x_, y = y_; + } + void operator += (const Point& p) { x += p.x; diff --git a/source/platform/include/Gwork/Renderers/OpenGL.h b/source/platform/include/Gwork/Renderers/OpenGL.h index f51d9b43..743425da 100644 --- a/source/platform/include/Gwork/Renderers/OpenGL.h +++ b/source/platform/include/Gwork/Renderers/OpenGL.h @@ -8,7 +8,6 @@ #ifndef GWK_RENDERERS_OPENGL_H #define GWK_RENDERERS_OPENGL_H -#include #include namespace Gwk @@ -28,31 +27,32 @@ namespace Gwk OpenGL(); - ~OpenGL(); + virtual ~OpenGL(); - virtual void Init(); + void Init() override; - virtual void Begin(); - virtual void End(); + void Begin() override; + void End() override; - virtual void SetDrawColor(Gwk::Color color); - virtual void DrawFilledRect(Gwk::Rect rect); + void SetDrawColor(Gwk::Color color) override; + void DrawFilledRect(Gwk::Rect rect) override; - void StartClip(); - void EndClip(); + void StartClip() override; + void EndClip() override; void DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect targetRect, float u1 = 0.0f, - float v1 = 0.0f, float u2 = 1.0f, float v2 = 1.0f); - void LoadTexture(Gwk::Texture* texture); - void FreeTexture(Gwk::Texture* texture); - Gwk::Color PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, - const Gwk::Color& col_default); + float v1 = 0.0f, float u2 = 1.0f, float v2 = 1.0f) override; + void LoadTexture(Gwk::Texture* texture) override; + void FreeTexture(Gwk::Texture* texture) override; + + Gwk::Color PixelColour(Gwk::Texture* texture, + unsigned int x, unsigned int y, + const Gwk::Color& col_default) override; protected: static const int MaxVerts = 1024; - void Flush(); void AddVert(int x, int y, float u = 0.0f, float v = 0.0f); @@ -62,16 +62,12 @@ namespace Gwk public: - // - // Self Initialization - // - - virtual bool InitializeContext(Gwk::WindowProvider* window); - virtual bool ShutdownContext(Gwk::WindowProvider* window); - virtual bool PresentContext(Gwk::WindowProvider* window); - virtual bool ResizedContext(Gwk::WindowProvider* window, int w, int h); - virtual bool BeginContext(Gwk::WindowProvider* window); - virtual bool EndContext(Gwk::WindowProvider* window); + bool InitializeContext(Gwk::WindowProvider* window) override; + bool ShutdownContext(Gwk::WindowProvider* window) override; + bool PresentContext(Gwk::WindowProvider* window) override; + bool ResizedContext(Gwk::WindowProvider* window, int w, int h) override; + bool BeginContext(Gwk::WindowProvider* window) override; + bool EndContext(Gwk::WindowProvider* window) override; void* m_context; }; diff --git a/source/platform/renderers/OpenGL/FreeImage/FreeImage.h b/source/platform/renderers/OpenGL/FreeImage/FreeImage.h deleted file mode 100644 index ab9e680a..00000000 --- a/source/platform/renderers/OpenGL/FreeImage/FreeImage.h +++ /dev/null @@ -1,1104 +0,0 @@ -// ========================================================== -// FreeImage 3 -// -// Design and implementation by -// - Floris van den Berg (flvdberg@wxs.nl) -// - Hervé Drolon (drolon@infonie.fr) -// -// Contributors: -// - see changes log named 'Whatsnew.txt', see header of each .h and .cpp file -// -// This file is part of FreeImage 3 -// -// COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY -// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES -// THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE -// OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED -// CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT -// THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY -// SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL -// PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER -// THIS DISCLAIMER. -// -// Use at your own risk! -// ========================================================== - -#ifndef FREEIMAGE_H -#define FREEIMAGE_H - -// Version information ------------------------------------------------------ - -#define FREEIMAGE_MAJOR_VERSION 3 -#define FREEIMAGE_MINOR_VERSION 15 -#define FREEIMAGE_RELEASE_SERIAL 4 - -// Compiler options --------------------------------------------------------- - -#include // needed for UNICODE functions - -#if defined(FREEIMAGE_LIB) - #define DLL_API - #define DLL_CALLCONV -#else - #if defined(_WIN32) || defined(__WIN32__) - #define DLL_CALLCONV __stdcall - // The following ifdef block is the standard way of creating macros which make exporting - // from a DLL simpler. All files within this DLL are compiled with the FREEIMAGE_EXPORTS - // symbol defined on the command line. this symbol should not be defined on any project - // that uses this DLL. This way any other project whose source files include this file see - // DLL_API functions as being imported from a DLL, wheras this DLL sees symbols - // defined with this macro as being exported. - #ifdef FREEIMAGE_EXPORTS - #define DLL_API __declspec(dllexport) - #else - #define DLL_API __declspec(dllimport) - #endif // FREEIMAGE_EXPORTS - #else - // try the gcc visibility support (see http://gcc.gnu.org/wiki/Visibility) - #if defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) - #ifndef GCC_HASCLASSVISIBILITY - #define GCC_HASCLASSVISIBILITY - #endif - #endif // __GNUC__ - #define DLL_CALLCONV - #if defined(GCC_HASCLASSVISIBILITY) - #define DLL_API __attribute__ ((visibility("default"))) - #else - #define DLL_API - #endif - #endif // WIN32 / !WIN32 -#endif // FREEIMAGE_LIB - -// Some versions of gcc may have BYTE_ORDER or __BYTE_ORDER defined -// If your big endian system isn't being detected, add an OS specific check -#if (defined(BYTE_ORDER) && BYTE_ORDER==BIG_ENDIAN) || \ - (defined(__BYTE_ORDER) && __BYTE_ORDER==__BIG_ENDIAN) || \ - defined(__BIG_ENDIAN__) -#define FREEIMAGE_BIGENDIAN -#endif // BYTE_ORDER - -// This really only affects 24 and 32 bit formats, the rest are always RGB order. -#define FREEIMAGE_COLORORDER_BGR 0 -#define FREEIMAGE_COLORORDER_RGB 1 -#if defined(FREEIMAGE_BIGENDIAN) -#define FREEIMAGE_COLORORDER FREEIMAGE_COLORORDER_RGB -#else -#define FREEIMAGE_COLORORDER FREEIMAGE_COLORORDER_BGR -#endif - -// Ensure 4-byte enums if we're using Borland C++ compilers -#if defined(__BORLANDC__) -#pragma option push -b -#endif - -// For C compatibility -------------------------------------------------------- - -#ifdef __cplusplus -#define FI_DEFAULT(x) = x -#define FI_ENUM(x) enum x -#define FI_STRUCT(x) struct x -#else -#define FI_DEFAULT(x) -#define FI_ENUM(x) typedef int x; enum x -#define FI_STRUCT(x) typedef struct x x; struct x -#endif - -// Bitmap types ------------------------------------------------------------- - -FI_STRUCT (FIBITMAP) { void *data; }; -FI_STRUCT (FIMULTIBITMAP) { void *data; }; - -// Types used in the library (directly copied from Windows) ----------------- - -#if defined(__MINGW32__) && defined(_WINDOWS_H) -#define _WINDOWS_ // prevent a bug in MinGW32 -#endif // __MINGW32__ - -#ifndef _WINDOWS_ -#define _WINDOWS_ - -#ifndef FALSE -#define FALSE 0 -#endif -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef nullptr -#define nullptr 0 -#endif - -#ifndef SEEK_SET -#define SEEK_SET 0 -#define SEEK_CUR 1 -#define SEEK_END 2 -#endif - -#ifndef _MSC_VER -// define portable types for 32-bit / 64-bit OS -#include -typedef int32_t BOOL; -typedef uint8_t BYTE; -typedef uint16_t WORD; -typedef uint32_t DWORD; -typedef int32_t LONG; -typedef int64_t INT64; -typedef uint64_t UINT64; -#else -// MS is not C99 ISO compliant -typedef long BOOL; -typedef unsigned char BYTE; -typedef unsigned short WORD; -typedef unsigned long DWORD; -typedef long LONG; -typedef signed __int64 INT64; -typedef unsigned __int64 UINT64; -#endif // _MSC_VER - -#if (defined(_WIN32) || defined(__WIN32__)) -#pragma pack(push, 1) -#else -#pragma pack(1) -#endif // WIN32 - -typedef struct tagRGBQUAD { -#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR - BYTE rgbBlue; - BYTE rgbGreen; - BYTE rgbRed; -#else - BYTE rgbRed; - BYTE rgbGreen; - BYTE rgbBlue; -#endif // FREEIMAGE_COLORORDER - BYTE rgbReserved; -} RGBQUAD; - -typedef struct tagRGBTRIPLE { -#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR - BYTE rgbtBlue; - BYTE rgbtGreen; - BYTE rgbtRed; -#else - BYTE rgbtRed; - BYTE rgbtGreen; - BYTE rgbtBlue; -#endif // FREEIMAGE_COLORORDER -} RGBTRIPLE; - -#if (defined(_WIN32) || defined(__WIN32__)) -#pragma pack(pop) -#else -#pragma pack() -#endif // WIN32 - -typedef struct tagBITMAPINFOHEADER{ - DWORD biSize; - LONG biWidth; - LONG biHeight; - WORD biPlanes; - WORD biBitCount; - DWORD biCompression; - DWORD biSizeImage; - LONG biXPelsPerMeter; - LONG biYPelsPerMeter; - DWORD biClrUsed; - DWORD biClrImportant; -} BITMAPINFOHEADER, *PBITMAPINFOHEADER; - -typedef struct tagBITMAPINFO { - BITMAPINFOHEADER bmiHeader; - RGBQUAD bmiColors[1]; -} BITMAPINFO, *PBITMAPINFO; - -#endif // _WINDOWS_ - -// Types used in the library (specific to FreeImage) ------------------------ - -#if (defined(_WIN32) || defined(__WIN32__)) -#pragma pack(push, 1) -#else -#pragma pack(1) -#endif // WIN32 - -/** 48-bit RGB -*/ -typedef struct tagFIRGB16 { - WORD red; - WORD green; - WORD blue; -} FIRGB16; - -/** 64-bit RGBA -*/ -typedef struct tagFIRGBA16 { - WORD red; - WORD green; - WORD blue; - WORD alpha; -} FIRGBA16; - -/** 96-bit RGB Float -*/ -typedef struct tagFIRGBF { - float red; - float green; - float blue; -} FIRGBF; - -/** 128-bit RGBA Float -*/ -typedef struct tagFIRGBAF { - float red; - float green; - float blue; - float alpha; -} FIRGBAF; - -/** Data structure for COMPLEX type (complex number) -*/ -typedef struct tagFICOMPLEX { - /// real part - double r; - /// imaginary part - double i; -} FICOMPLEX; - -#if (defined(_WIN32) || defined(__WIN32__)) -#pragma pack(pop) -#else -#pragma pack() -#endif // WIN32 - -// Indexes for byte arrays, masks and shifts for treating pixels as words --- -// These coincide with the order of RGBQUAD and RGBTRIPLE ------------------- - -#ifndef FREEIMAGE_BIGENDIAN -#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR -// Little Endian (x86 / MS Windows, Linux) : BGR(A) order -#define FI_RGBA_RED 2 -#define FI_RGBA_GREEN 1 -#define FI_RGBA_BLUE 0 -#define FI_RGBA_ALPHA 3 -#define FI_RGBA_RED_MASK 0x00FF0000 -#define FI_RGBA_GREEN_MASK 0x0000FF00 -#define FI_RGBA_BLUE_MASK 0x000000FF -#define FI_RGBA_ALPHA_MASK 0xFF000000 -#define FI_RGBA_RED_SHIFT 16 -#define FI_RGBA_GREEN_SHIFT 8 -#define FI_RGBA_BLUE_SHIFT 0 -#define FI_RGBA_ALPHA_SHIFT 24 -#else -// Little Endian (x86 / MaxOSX) : RGB(A) order -#define FI_RGBA_RED 0 -#define FI_RGBA_GREEN 1 -#define FI_RGBA_BLUE 2 -#define FI_RGBA_ALPHA 3 -#define FI_RGBA_RED_MASK 0x000000FF -#define FI_RGBA_GREEN_MASK 0x0000FF00 -#define FI_RGBA_BLUE_MASK 0x00FF0000 -#define FI_RGBA_ALPHA_MASK 0xFF000000 -#define FI_RGBA_RED_SHIFT 0 -#define FI_RGBA_GREEN_SHIFT 8 -#define FI_RGBA_BLUE_SHIFT 16 -#define FI_RGBA_ALPHA_SHIFT 24 -#endif // FREEIMAGE_COLORORDER -#else -#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_BGR -// Big Endian (PPC / none) : BGR(A) order -#define FI_RGBA_RED 2 -#define FI_RGBA_GREEN 1 -#define FI_RGBA_BLUE 0 -#define FI_RGBA_ALPHA 3 -#define FI_RGBA_RED_MASK 0x0000FF00 -#define FI_RGBA_GREEN_MASK 0x00FF0000 -#define FI_RGBA_BLUE_MASK 0xFF000000 -#define FI_RGBA_ALPHA_MASK 0x000000FF -#define FI_RGBA_RED_SHIFT 8 -#define FI_RGBA_GREEN_SHIFT 16 -#define FI_RGBA_BLUE_SHIFT 24 -#define FI_RGBA_ALPHA_SHIFT 0 -#else -// Big Endian (PPC / Linux, MaxOSX) : RGB(A) order -#define FI_RGBA_RED 0 -#define FI_RGBA_GREEN 1 -#define FI_RGBA_BLUE 2 -#define FI_RGBA_ALPHA 3 -#define FI_RGBA_RED_MASK 0xFF000000 -#define FI_RGBA_GREEN_MASK 0x00FF0000 -#define FI_RGBA_BLUE_MASK 0x0000FF00 -#define FI_RGBA_ALPHA_MASK 0x000000FF -#define FI_RGBA_RED_SHIFT 24 -#define FI_RGBA_GREEN_SHIFT 16 -#define FI_RGBA_BLUE_SHIFT 8 -#define FI_RGBA_ALPHA_SHIFT 0 -#endif // FREEIMAGE_COLORORDER -#endif // FREEIMAGE_BIGENDIAN - -#define FI_RGBA_RGB_MASK (FI_RGBA_RED_MASK|FI_RGBA_GREEN_MASK|FI_RGBA_BLUE_MASK) - -// The 16bit macros only include masks and shifts, since each color element is not byte aligned - -#define FI16_555_RED_MASK 0x7C00 -#define FI16_555_GREEN_MASK 0x03E0 -#define FI16_555_BLUE_MASK 0x001F -#define FI16_555_RED_SHIFT 10 -#define FI16_555_GREEN_SHIFT 5 -#define FI16_555_BLUE_SHIFT 0 -#define FI16_565_RED_MASK 0xF800 -#define FI16_565_GREEN_MASK 0x07E0 -#define FI16_565_BLUE_MASK 0x001F -#define FI16_565_RED_SHIFT 11 -#define FI16_565_GREEN_SHIFT 5 -#define FI16_565_BLUE_SHIFT 0 - -// ICC profile support ------------------------------------------------------ - -#define FIICC_DEFAULT 0x00 -#define FIICC_COLOR_IS_CMYK 0x01 - -FI_STRUCT (FIICCPROFILE) { - WORD flags; // info flag - DWORD size; // profile's size measured in bytes - void *data; // points to a block of contiguous memory containing the profile -}; - -// Important enums ---------------------------------------------------------- - -/** I/O image format identifiers. -*/ -FI_ENUM(FREE_IMAGE_FORMAT) { - FIF_UNKNOWN = -1, - FIF_BMP = 0, - FIF_ICO = 1, - FIF_JPEG = 2, - FIF_JNG = 3, - FIF_KOALA = 4, - FIF_LBM = 5, - FIF_IFF = FIF_LBM, - FIF_MNG = 6, - FIF_PBM = 7, - FIF_PBMRAW = 8, - FIF_PCD = 9, - FIF_PCX = 10, - FIF_PGM = 11, - FIF_PGMRAW = 12, - FIF_PNG = 13, - FIF_PPM = 14, - FIF_PPMRAW = 15, - FIF_RAS = 16, - FIF_TARGA = 17, - FIF_TIFF = 18, - FIF_WBMP = 19, - FIF_PSD = 20, - FIF_CUT = 21, - FIF_XBM = 22, - FIF_XPM = 23, - FIF_DDS = 24, - FIF_GIF = 25, - FIF_HDR = 26, - FIF_FAXG3 = 27, - FIF_SGI = 28, - FIF_EXR = 29, - FIF_J2K = 30, - FIF_JP2 = 31, - FIF_PFM = 32, - FIF_PICT = 33, - FIF_RAW = 34 -}; - -/** Image type used in FreeImage. -*/ -FI_ENUM(FREE_IMAGE_TYPE) { - FIT_UNKNOWN = 0, // unknown type - FIT_BITMAP = 1, // standard image : 1-, 4-, 8-, 16-, 24-, 32-bit - FIT_UINT16 = 2, // array of unsigned short : unsigned 16-bit - FIT_INT16 = 3, // array of short : signed 16-bit - FIT_UINT32 = 4, // array of unsigned long : unsigned 32-bit - FIT_INT32 = 5, // array of long : signed 32-bit - FIT_FLOAT = 6, // array of float : 32-bit IEEE floating point - FIT_DOUBLE = 7, // array of double : 64-bit IEEE floating point - FIT_COMPLEX = 8, // array of FICOMPLEX : 2 x 64-bit IEEE floating point - FIT_RGB16 = 9, // 48-bit RGB image : 3 x 16-bit - FIT_RGBA16 = 10, // 64-bit RGBA image : 4 x 16-bit - FIT_RGBF = 11, // 96-bit RGB float image : 3 x 32-bit IEEE floating point - FIT_RGBAF = 12 // 128-bit RGBA float image : 4 x 32-bit IEEE floating point -}; - -/** Image color type used in FreeImage. -*/ -FI_ENUM(FREE_IMAGE_COLOR_TYPE) { - FIC_MINISWHITE = 0, // min value is white - FIC_MINISBLACK = 1, // min value is black - FIC_RGB = 2, // RGB color model - FIC_PALETTE = 3, // color map indexed - FIC_RGBALPHA = 4, // RGB color model with alpha channel - FIC_CMYK = 5 // CMYK color model -}; - -/** Color quantization algorithms. -Constants used in FreeImage_ColorQuantize. -*/ -FI_ENUM(FREE_IMAGE_QUANTIZE) { - FIQ_WUQUANT = 0, // Xiaolin Wu color quantization algorithm - FIQ_NNQUANT = 1 // NeuQuant neural-net quantization algorithm by Anthony Dekker -}; - -/** Dithering algorithms. -Constants used in FreeImage_Dither. -*/ -FI_ENUM(FREE_IMAGE_DITHER) { - FID_FS = 0, // Floyd & Steinberg error diffusion - FID_BAYER4x4 = 1, // Bayer ordered dispersed dot dithering (order 2 dithering matrix) - FID_BAYER8x8 = 2, // Bayer ordered dispersed dot dithering (order 3 dithering matrix) - FID_CLUSTER6x6 = 3, // Ordered clustered dot dithering (order 3 - 6x6 matrix) - FID_CLUSTER8x8 = 4, // Ordered clustered dot dithering (order 4 - 8x8 matrix) - FID_CLUSTER16x16= 5, // Ordered clustered dot dithering (order 8 - 16x16 matrix) - FID_BAYER16x16 = 6 // Bayer ordered dispersed dot dithering (order 4 dithering matrix) -}; - -/** Lossless JPEG transformations -Constants used in FreeImage_JPEGTransform -*/ -FI_ENUM(FREE_IMAGE_JPEG_OPERATION) { - FIJPEG_OP_NONE = 0, // no transformation - FIJPEG_OP_FLIP_H = 1, // horizontal flip - FIJPEG_OP_FLIP_V = 2, // vertical flip - FIJPEG_OP_TRANSPOSE = 3, // transpose across UL-to-LR axis - FIJPEG_OP_TRANSVERSE = 4, // transpose across UR-to-LL axis - FIJPEG_OP_ROTATE_90 = 5, // 90-degree clockwise rotation - FIJPEG_OP_ROTATE_180 = 6, // 180-degree rotation - FIJPEG_OP_ROTATE_270 = 7 // 270-degree clockwise (or 90 ccw) -}; - -/** Tone mapping operators. -Constants used in FreeImage_ToneMapping. -*/ -FI_ENUM(FREE_IMAGE_TMO) { - FITMO_DRAGO03 = 0, // Adaptive logarithmic mapping (F. Drago, 2003) - FITMO_REINHARD05 = 1, // Dynamic range reduction inspired by photoreceptor physiology (E. Reinhard, 2005) - FITMO_FATTAL02 = 2 // Gradient domain high dynamic range compression (R. Fattal, 2002) -}; - -/** Upsampling / downsampling filters. -Constants used in FreeImage_Rescale. -*/ -FI_ENUM(FREE_IMAGE_FILTER) { - FILTER_BOX = 0, // Box, pulse, Fourier window, 1st order (constant) b-spline - FILTER_BICUBIC = 1, // Mitchell & Netravali's two-param cubic filter - FILTER_BILINEAR = 2, // Bilinear filter - FILTER_BSPLINE = 3, // 4th order (cubic) b-spline - FILTER_CATMULLROM = 4, // Catmull-Rom spline, Overhauser spline - FILTER_LANCZOS3 = 5 // Lanczos3 filter -}; - -/** Color channels. -Constants used in color manipulation routines. -*/ -FI_ENUM(FREE_IMAGE_COLOR_CHANNEL) { - FICC_RGB = 0, // Use red, green and blue channels - FICC_RED = 1, // Use red channel - FICC_GREEN = 2, // Use green channel - FICC_BLUE = 3, // Use blue channel - FICC_ALPHA = 4, // Use alpha channel - FICC_BLACK = 5, // Use black channel - FICC_REAL = 6, // Complex images: use real part - FICC_IMAG = 7, // Complex images: use imaginary part - FICC_MAG = 8, // Complex images: use magnitude - FICC_PHASE = 9 // Complex images: use phase -}; - -// Metadata support --------------------------------------------------------- - -/** - Tag data type information (based on TIFF specifications) - - Note: RATIONALs are the ratio of two 32-bit integer values. -*/ -FI_ENUM(FREE_IMAGE_MDTYPE) { - FIDT_NOTYPE = 0, // placeholder - FIDT_BYTE = 1, // 8-bit unsigned integer - FIDT_ASCII = 2, // 8-bit bytes w/ last byte null - FIDT_SHORT = 3, // 16-bit unsigned integer - FIDT_LONG = 4, // 32-bit unsigned integer - FIDT_RATIONAL = 5, // 64-bit unsigned fraction - FIDT_SBYTE = 6, // 8-bit signed integer - FIDT_UNDEFINED = 7, // 8-bit untyped data - FIDT_SSHORT = 8, // 16-bit signed integer - FIDT_SLONG = 9, // 32-bit signed integer - FIDT_SRATIONAL = 10, // 64-bit signed fraction - FIDT_FLOAT = 11, // 32-bit IEEE floating point - FIDT_DOUBLE = 12, // 64-bit IEEE floating point - FIDT_IFD = 13, // 32-bit unsigned integer (offset) - FIDT_PALETTE = 14, // 32-bit RGBQUAD - FIDT_LONG8 = 16, // 64-bit unsigned integer - FIDT_SLONG8 = 17, // 64-bit signed integer - FIDT_IFD8 = 18 // 64-bit unsigned integer (offset) -}; - -/** - Metadata models supported by FreeImage -*/ -FI_ENUM(FREE_IMAGE_MDMODEL) { - FIMD_NODATA = -1, - FIMD_COMMENTS = 0, // single comment or keywords - FIMD_EXIF_MAIN = 1, // Exif-TIFF metadata - FIMD_EXIF_EXIF = 2, // Exif-specific metadata - FIMD_EXIF_GPS = 3, // Exif GPS metadata - FIMD_EXIF_MAKERNOTE = 4, // Exif maker note metadata - FIMD_EXIF_INTEROP = 5, // Exif interoperability metadata - FIMD_IPTC = 6, // IPTC/NAA metadata - FIMD_XMP = 7, // Abobe XMP metadata - FIMD_GEOTIFF = 8, // GeoTIFF metadata - FIMD_ANIMATION = 9, // Animation metadata - FIMD_CUSTOM = 10, // Used to attach other metadata types to a dib - FIMD_EXIF_RAW = 11 // Exif metadata as a raw buffer -}; - -/** - Handle to a metadata model -*/ -FI_STRUCT (FIMETADATA) { void *data; }; - -/** - Handle to a FreeImage tag -*/ -FI_STRUCT (FITAG) { void *data; }; - -// File IO routines --------------------------------------------------------- - -#ifndef FREEIMAGE_IO -#define FREEIMAGE_IO - -typedef void* fi_handle; -typedef unsigned (DLL_CALLCONV *FI_ReadProc) (void *buffer, unsigned size, unsigned count, fi_handle handle); -typedef unsigned (DLL_CALLCONV *FI_WriteProc) (void *buffer, unsigned size, unsigned count, fi_handle handle); -typedef int (DLL_CALLCONV *FI_SeekProc) (fi_handle handle, long offset, int origin); -typedef long (DLL_CALLCONV *FI_TellProc) (fi_handle handle); - -#if (defined(_WIN32) || defined(__WIN32__)) -#pragma pack(push, 1) -#else -#pragma pack(1) -#endif // WIN32 - -FI_STRUCT(FreeImageIO) { - FI_ReadProc read_proc; // pointer to the function used to read data - FI_WriteProc write_proc; // pointer to the function used to write data - FI_SeekProc seek_proc; // pointer to the function used to seek - FI_TellProc tell_proc; // pointer to the function used to aquire the current position -}; - -#if (defined(_WIN32) || defined(__WIN32__)) -#pragma pack(pop) -#else -#pragma pack() -#endif // WIN32 - -/** -Handle to a memory I/O stream -*/ -FI_STRUCT (FIMEMORY) { void *data; }; - -#endif // FREEIMAGE_IO - -// Plugin routines ---------------------------------------------------------- - -#ifndef PLUGINS -#define PLUGINS - -typedef const char *(DLL_CALLCONV *FI_FormatProc)(void); -typedef const char *(DLL_CALLCONV *FI_DescriptionProc)(void); -typedef const char *(DLL_CALLCONV *FI_ExtensionListProc)(void); -typedef const char *(DLL_CALLCONV *FI_RegExprProc)(void); -typedef void *(DLL_CALLCONV *FI_OpenProc)(FreeImageIO *io, fi_handle handle, BOOL read); -typedef void (DLL_CALLCONV *FI_CloseProc)(FreeImageIO *io, fi_handle handle, void *data); -typedef int (DLL_CALLCONV *FI_PageCountProc)(FreeImageIO *io, fi_handle handle, void *data); -typedef int (DLL_CALLCONV *FI_PageCapabilityProc)(FreeImageIO *io, fi_handle handle, void *data); -typedef FIBITMAP *(DLL_CALLCONV *FI_LoadProc)(FreeImageIO *io, fi_handle handle, int page, int flags, void *data); -typedef BOOL (DLL_CALLCONV *FI_SaveProc)(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data); -typedef BOOL (DLL_CALLCONV *FI_ValidateProc)(FreeImageIO *io, fi_handle handle); -typedef const char *(DLL_CALLCONV *FI_MimeProc)(void); -typedef BOOL (DLL_CALLCONV *FI_SupportsExportBPPProc)(int bpp); -typedef BOOL (DLL_CALLCONV *FI_SupportsExportTypeProc)(FREE_IMAGE_TYPE type); -typedef BOOL (DLL_CALLCONV *FI_SupportsICCProfilesProc)(void); -typedef BOOL (DLL_CALLCONV *FI_SupportsNoPixelsProc)(void); - -FI_STRUCT (Plugin) { - FI_FormatProc format_proc; - FI_DescriptionProc description_proc; - FI_ExtensionListProc extension_proc; - FI_RegExprProc regexpr_proc; - FI_OpenProc open_proc; - FI_CloseProc close_proc; - FI_PageCountProc pagecount_proc; - FI_PageCapabilityProc pagecapability_proc; - FI_LoadProc load_proc; - FI_SaveProc save_proc; - FI_ValidateProc validate_proc; - FI_MimeProc mime_proc; - FI_SupportsExportBPPProc supports_export_bpp_proc; - FI_SupportsExportTypeProc supports_export_type_proc; - FI_SupportsICCProfilesProc supports_icc_profiles_proc; - FI_SupportsNoPixelsProc supports_no_pixels_proc; -}; - -typedef void (DLL_CALLCONV *FI_InitProc)(Plugin *plugin, int format_id); - -#endif // PLUGINS - - -// Load / Save flag constants ----------------------------------------------- - -#define FIF_LOAD_NOPIXELS 0x8000 // loading: load the image header only (not supported by all plugins, default to full loading) - -#define BMP_DEFAULT 0 -#define BMP_SAVE_RLE 1 -#define CUT_DEFAULT 0 -#define DDS_DEFAULT 0 -#define EXR_DEFAULT 0 // save data as half with piz-based wavelet compression -#define EXR_FLOAT 0x0001 // save data as float instead of as half (not recommended) -#define EXR_NONE 0x0002 // save with no compression -#define EXR_ZIP 0x0004 // save with zlib compression, in blocks of 16 scan lines -#define EXR_PIZ 0x0008 // save with piz-based wavelet compression -#define EXR_PXR24 0x0010 // save with lossy 24-bit float compression -#define EXR_B44 0x0020 // save with lossy 44% float compression - goes to 22% when combined with EXR_LC -#define EXR_LC 0x0040 // save images with one luminance and two chroma channels, rather than as RGB (lossy compression) -#define FAXG3_DEFAULT 0 -#define GIF_DEFAULT 0 -#define GIF_LOAD256 1 // Load the image as a 256 color image with ununsed palette entries, if it's 16 or 2 color -#define GIF_PLAYBACK 2 // 'Play' the GIF to generate each frame (as 32bpp) instead of returning raw frame data when loading -#define HDR_DEFAULT 0 -#define ICO_DEFAULT 0 -#define ICO_MAKEALPHA 1 // convert to 32bpp and create an alpha channel from the AND-mask when loading -#define IFF_DEFAULT 0 -#define J2K_DEFAULT 0 // save with a 16:1 rate -#define JP2_DEFAULT 0 // save with a 16:1 rate -#define JPEG_DEFAULT 0 // loading (see JPEG_FAST); saving (see JPEG_QUALITYGOOD|JPEG_SUBSAMPLING_420) -#define JPEG_FAST 0x0001 // load the file as fast as possible, sacrificing some quality -#define JPEG_ACCURATE 0x0002 // load the file with the best quality, sacrificing some speed -#define JPEG_CMYK 0x0004 // load separated CMYK "as is" (use | to combine with other load flags) -#define JPEG_EXIFROTATE 0x0008 // load and rotate according to Exif 'Orientation' tag if available -#define JPEG_GREYSCALE 0x0010 // load and convert to a 8-bit greyscale image -#define JPEG_QUALITYSUPERB 0x80 // save with superb quality (100:1) -#define JPEG_QUALITYGOOD 0x0100 // save with good quality (75:1) -#define JPEG_QUALITYNORMAL 0x0200 // save with normal quality (50:1) -#define JPEG_QUALITYAVERAGE 0x0400 // save with average quality (25:1) -#define JPEG_QUALITYBAD 0x0800 // save with bad quality (10:1) -#define JPEG_PROGRESSIVE 0x2000 // save as a progressive-JPEG (use | to combine with other save flags) -#define JPEG_SUBSAMPLING_411 0x1000 // save with high 4x1 chroma subsampling (4:1:1) -#define JPEG_SUBSAMPLING_420 0x4000 // save with medium 2x2 medium chroma subsampling (4:2:0) - default value -#define JPEG_SUBSAMPLING_422 0x8000 // save with low 2x1 chroma subsampling (4:2:2) -#define JPEG_SUBSAMPLING_444 0x10000 // save with no chroma subsampling (4:4:4) -#define JPEG_OPTIMIZE 0x20000 // on saving, compute optimal Huffman coding tables (can reduce a few percent of file size) -#define JPEG_BASELINE 0x40000 // save basic JPEG, without metadata or any markers -#define KOALA_DEFAULT 0 -#define LBM_DEFAULT 0 -#define MNG_DEFAULT 0 -#define PCD_DEFAULT 0 -#define PCD_BASE 1 // load the bitmap sized 768 x 512 -#define PCD_BASEDIV4 2 // load the bitmap sized 384 x 256 -#define PCD_BASEDIV16 3 // load the bitmap sized 192 x 128 -#define PCX_DEFAULT 0 -#define PFM_DEFAULT 0 -#define PICT_DEFAULT 0 -#define PNG_DEFAULT 0 -#define PNG_IGNOREGAMMA 1 // loading: avoid gamma correction -#define PNG_Z_BEST_SPEED 0x0001 // save using ZLib level 1 compression flag (default value is 6) -#define PNG_Z_DEFAULT_COMPRESSION 0x0006 // save using ZLib level 6 compression flag (default recommended value) -#define PNG_Z_BEST_COMPRESSION 0x0009 // save using ZLib level 9 compression flag (default value is 6) -#define PNG_Z_NO_COMPRESSION 0x0100 // save without ZLib compression -#define PNG_INTERLACED 0x0200 // save using Adam7 interlacing (use | to combine with other save flags) -#define PNM_DEFAULT 0 -#define PNM_SAVE_RAW 0 // If set the writer saves in RAW format (i.e. P4, P5 or P6) -#define PNM_SAVE_ASCII 1 // If set the writer saves in ASCII format (i.e. P1, P2 or P3) -#define PSD_DEFAULT 0 -#define PSD_CMYK 1 // reads tags for separated CMYK (default is conversion to RGB) -#define PSD_LAB 2 // reads tags for CIELab (default is conversion to RGB) -#define RAS_DEFAULT 0 -#define RAW_DEFAULT 0 // load the file as linear RGB 48-bit -#define RAW_PREVIEW 1 // try to load the embedded JPEG preview with included Exif Data or default to RGB 24-bit -#define RAW_DISPLAY 2 // load the file as RGB 24-bit -#define RAW_HALFSIZE 4 // output a half-size color image -#define SGI_DEFAULT 0 -#define TARGA_DEFAULT 0 -#define TARGA_LOAD_RGB888 1 // If set the loader converts RGB555 and ARGB8888 -> RGB888. -#define TARGA_SAVE_RLE 2 // If set, the writer saves with RLE compression -#define TIFF_DEFAULT 0 -#define TIFF_CMYK 0x0001 // reads/stores tags for separated CMYK (use | to combine with compression flags) -#define TIFF_PACKBITS 0x0100 // save using PACKBITS compression -#define TIFF_DEFLATE 0x0200 // save using DEFLATE compression (a.k.a. ZLIB compression) -#define TIFF_ADOBE_DEFLATE 0x0400 // save using ADOBE DEFLATE compression -#define TIFF_NONE 0x0800 // save without any compression -#define TIFF_CCITTFAX3 0x1000 // save using CCITT Group 3 fax encoding -#define TIFF_CCITTFAX4 0x2000 // save using CCITT Group 4 fax encoding -#define TIFF_LZW 0x4000 // save using LZW compression -#define TIFF_JPEG 0x8000 // save using JPEG compression -#define TIFF_LOGLUV 0x10000 // save using LogLuv compression -#define WBMP_DEFAULT 0 -#define XBM_DEFAULT 0 -#define XPM_DEFAULT 0 - -// Background filling options --------------------------------------------------------- -// Constants used in FreeImage_FillBackground and FreeImage_EnlargeCanvas - -#define FI_COLOR_IS_RGB_COLOR 0x00 // RGBQUAD color is a RGB color (contains no valid alpha channel) -#define FI_COLOR_IS_RGBA_COLOR 0x01 // RGBQUAD color is a RGBA color (contains a valid alpha channel) -#define FI_COLOR_FIND_EQUAL_COLOR 0x02 // For palettized images: lookup equal RGB color from palette -#define FI_COLOR_ALPHA_IS_INDEX 0x04 // The color's rgbReserved member (alpha) contains the palette index to be used -#define FI_COLOR_PALETTE_SEARCH_MASK (FI_COLOR_FIND_EQUAL_COLOR | FI_COLOR_ALPHA_IS_INDEX) // No color lookup is performed - - -#ifdef __cplusplus -extern "C" { -#endif - -// Init / Error routines ---------------------------------------------------- - -DLL_API void DLL_CALLCONV FreeImage_Initialise(BOOL load_local_plugins_only FI_DEFAULT(FALSE)); -DLL_API void DLL_CALLCONV FreeImage_DeInitialise(void); - -// Version routines --------------------------------------------------------- - -DLL_API const char *DLL_CALLCONV FreeImage_GetVersion(void); -DLL_API const char *DLL_CALLCONV FreeImage_GetCopyrightMessage(void); - -// Message output functions ------------------------------------------------- - -typedef void (*FreeImage_OutputMessageFunction)(FREE_IMAGE_FORMAT fif, const char *msg); -typedef void (DLL_CALLCONV *FreeImage_OutputMessageFunctionStdCall)(FREE_IMAGE_FORMAT fif, const char *msg); - -DLL_API void DLL_CALLCONV FreeImage_SetOutputMessageStdCall(FreeImage_OutputMessageFunctionStdCall omf); -DLL_API void DLL_CALLCONV FreeImage_SetOutputMessage(FreeImage_OutputMessageFunction omf); -DLL_API void DLL_CALLCONV FreeImage_OutputMessageProc(int fif, const char *fmt, ...); - -// Allocate / Clone / Unload routines --------------------------------------- - -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Allocate(int width, int height, int bpp, unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_AllocateT(FREE_IMAGE_TYPE type, int width, int height, int bpp FI_DEFAULT(8), unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0)); -DLL_API FIBITMAP * DLL_CALLCONV FreeImage_Clone(FIBITMAP *dib); -DLL_API void DLL_CALLCONV FreeImage_Unload(FIBITMAP *dib); - -// Header loading routines -DLL_API BOOL DLL_CALLCONV FreeImage_HasPixels(FIBITMAP *dib); - -// Load / Save routines ----------------------------------------------------- - -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Load(FREE_IMAGE_FORMAT fif, const char *filename, int flags FI_DEFAULT(0)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadU(FREE_IMAGE_FORMAT fif, const wchar_t *filename, int flags FI_DEFAULT(0)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0)); -DLL_API BOOL DLL_CALLCONV FreeImage_Save(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, const char *filename, int flags FI_DEFAULT(0)); -DLL_API BOOL DLL_CALLCONV FreeImage_SaveU(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, const wchar_t *filename, int flags FI_DEFAULT(0)); -DLL_API BOOL DLL_CALLCONV FreeImage_SaveToHandle(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0)); - -// Memory I/O stream routines ----------------------------------------------- - -DLL_API FIMEMORY *DLL_CALLCONV FreeImage_OpenMemory(BYTE *data FI_DEFAULT(0), DWORD size_in_bytes FI_DEFAULT(0)); -DLL_API void DLL_CALLCONV FreeImage_CloseMemory(FIMEMORY *stream); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags FI_DEFAULT(0)); -DLL_API BOOL DLL_CALLCONV FreeImage_SaveToMemory(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FIMEMORY *stream, int flags FI_DEFAULT(0)); -DLL_API long DLL_CALLCONV FreeImage_TellMemory(FIMEMORY *stream); -DLL_API BOOL DLL_CALLCONV FreeImage_SeekMemory(FIMEMORY *stream, long offset, int origin); -DLL_API BOOL DLL_CALLCONV FreeImage_AcquireMemory(FIMEMORY *stream, BYTE **data, DWORD *size_in_bytes); -DLL_API unsigned DLL_CALLCONV FreeImage_ReadMemory(void *buffer, unsigned size, unsigned count, FIMEMORY *stream); -DLL_API unsigned DLL_CALLCONV FreeImage_WriteMemory(const void *buffer, unsigned size, unsigned count, FIMEMORY *stream); - -DLL_API FIMULTIBITMAP *DLL_CALLCONV FreeImage_LoadMultiBitmapFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags FI_DEFAULT(0)); -DLL_API BOOL DLL_CALLCONV FreeImage_SaveMultiBitmapToMemory(FREE_IMAGE_FORMAT fif, FIMULTIBITMAP *bitmap, FIMEMORY *stream, int flags); - -// Plugin Interface --------------------------------------------------------- - -DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_RegisterLocalPlugin(FI_InitProc proc_address, const char *format FI_DEFAULT(0), const char *description FI_DEFAULT(0), const char *extension FI_DEFAULT(0), const char *regexpr FI_DEFAULT(0)); -DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_RegisterExternalPlugin(const char *path, const char *format FI_DEFAULT(0), const char *description FI_DEFAULT(0), const char *extension FI_DEFAULT(0), const char *regexpr FI_DEFAULT(0)); -DLL_API int DLL_CALLCONV FreeImage_GetFIFCount(void); -DLL_API int DLL_CALLCONV FreeImage_SetPluginEnabled(FREE_IMAGE_FORMAT fif, BOOL enable); -DLL_API int DLL_CALLCONV FreeImage_IsPluginEnabled(FREE_IMAGE_FORMAT fif); -DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFormat(const char *format); -DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromMime(const char *mime); -DLL_API const char *DLL_CALLCONV FreeImage_GetFormatFromFIF(FREE_IMAGE_FORMAT fif); -DLL_API const char *DLL_CALLCONV FreeImage_GetFIFExtensionList(FREE_IMAGE_FORMAT fif); -DLL_API const char *DLL_CALLCONV FreeImage_GetFIFDescription(FREE_IMAGE_FORMAT fif); -DLL_API const char *DLL_CALLCONV FreeImage_GetFIFRegExpr(FREE_IMAGE_FORMAT fif); -DLL_API const char *DLL_CALLCONV FreeImage_GetFIFMimeType(FREE_IMAGE_FORMAT fif); -DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFilename(const char *filename); -DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFilenameU(const wchar_t *filename); -DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsReading(FREE_IMAGE_FORMAT fif); -DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsWriting(FREE_IMAGE_FORMAT fif); -DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsExportBPP(FREE_IMAGE_FORMAT fif, int bpp); -DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsExportType(FREE_IMAGE_FORMAT fif, FREE_IMAGE_TYPE type); -DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsICCProfiles(FREE_IMAGE_FORMAT fif); -DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsNoPixels(FREE_IMAGE_FORMAT fif); - -// Multipaging interface ---------------------------------------------------- - -DLL_API FIMULTIBITMAP * DLL_CALLCONV FreeImage_OpenMultiBitmap(FREE_IMAGE_FORMAT fif, const char *filename, BOOL create_new, BOOL read_only, BOOL keep_cache_in_memory FI_DEFAULT(FALSE), int flags FI_DEFAULT(0)); -DLL_API FIMULTIBITMAP * DLL_CALLCONV FreeImage_OpenMultiBitmapFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0)); -DLL_API BOOL DLL_CALLCONV FreeImage_SaveMultiBitmapToHandle(FREE_IMAGE_FORMAT fif, FIMULTIBITMAP *bitmap, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0)); -DLL_API BOOL DLL_CALLCONV FreeImage_CloseMultiBitmap(FIMULTIBITMAP *bitmap, int flags FI_DEFAULT(0)); -DLL_API int DLL_CALLCONV FreeImage_GetPageCount(FIMULTIBITMAP *bitmap); -DLL_API void DLL_CALLCONV FreeImage_AppendPage(FIMULTIBITMAP *bitmap, FIBITMAP *data); -DLL_API void DLL_CALLCONV FreeImage_InsertPage(FIMULTIBITMAP *bitmap, int page, FIBITMAP *data); -DLL_API void DLL_CALLCONV FreeImage_DeletePage(FIMULTIBITMAP *bitmap, int page); -DLL_API FIBITMAP * DLL_CALLCONV FreeImage_LockPage(FIMULTIBITMAP *bitmap, int page); -DLL_API void DLL_CALLCONV FreeImage_UnlockPage(FIMULTIBITMAP *bitmap, FIBITMAP *data, BOOL changed); -DLL_API BOOL DLL_CALLCONV FreeImage_MovePage(FIMULTIBITMAP *bitmap, int target, int source); -DLL_API BOOL DLL_CALLCONV FreeImage_GetLockedPageNumbers(FIMULTIBITMAP *bitmap, int *pages, int *count); - -// Filetype request routines ------------------------------------------------ - -DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileType(const char *filename, int size FI_DEFAULT(0)); -DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeU(const wchar_t *filename, int size FI_DEFAULT(0)); -DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeFromHandle(FreeImageIO *io, fi_handle handle, int size FI_DEFAULT(0)); -DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeFromMemory(FIMEMORY *stream, int size FI_DEFAULT(0)); - -// Image type request routine ----------------------------------------------- - -DLL_API FREE_IMAGE_TYPE DLL_CALLCONV FreeImage_GetImageType(FIBITMAP *dib); - -// FreeImage helper routines ------------------------------------------------ - -DLL_API BOOL DLL_CALLCONV FreeImage_IsLittleEndian(void); -DLL_API BOOL DLL_CALLCONV FreeImage_LookupX11Color(const char *szColor, BYTE *nRed, BYTE *nGreen, BYTE *nBlue); -DLL_API BOOL DLL_CALLCONV FreeImage_LookupSVGColor(const char *szColor, BYTE *nRed, BYTE *nGreen, BYTE *nBlue); - -// Pixel access routines ---------------------------------------------------- - -DLL_API BYTE *DLL_CALLCONV FreeImage_GetBits(FIBITMAP *dib); -DLL_API BYTE *DLL_CALLCONV FreeImage_GetScanLine(FIBITMAP *dib, int scanline); - -DLL_API BOOL DLL_CALLCONV FreeImage_GetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value); -DLL_API BOOL DLL_CALLCONV FreeImage_GetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value); -DLL_API BOOL DLL_CALLCONV FreeImage_SetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value); -DLL_API BOOL DLL_CALLCONV FreeImage_SetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value); - -// DIB info routines -------------------------------------------------------- - -DLL_API unsigned DLL_CALLCONV FreeImage_GetColorsUsed(FIBITMAP *dib); -DLL_API unsigned DLL_CALLCONV FreeImage_GetBPP(FIBITMAP *dib); -DLL_API unsigned DLL_CALLCONV FreeImage_GetWidth(FIBITMAP *dib); -DLL_API unsigned DLL_CALLCONV FreeImage_GetHeight(FIBITMAP *dib); -DLL_API unsigned DLL_CALLCONV FreeImage_GetLine(FIBITMAP *dib); -DLL_API unsigned DLL_CALLCONV FreeImage_GetPitch(FIBITMAP *dib); -DLL_API unsigned DLL_CALLCONV FreeImage_GetDIBSize(FIBITMAP *dib); -DLL_API RGBQUAD *DLL_CALLCONV FreeImage_GetPalette(FIBITMAP *dib); - -DLL_API unsigned DLL_CALLCONV FreeImage_GetDotsPerMeterX(FIBITMAP *dib); -DLL_API unsigned DLL_CALLCONV FreeImage_GetDotsPerMeterY(FIBITMAP *dib); -DLL_API void DLL_CALLCONV FreeImage_SetDotsPerMeterX(FIBITMAP *dib, unsigned res); -DLL_API void DLL_CALLCONV FreeImage_SetDotsPerMeterY(FIBITMAP *dib, unsigned res); - -DLL_API BITMAPINFOHEADER *DLL_CALLCONV FreeImage_GetInfoHeader(FIBITMAP *dib); -DLL_API BITMAPINFO *DLL_CALLCONV FreeImage_GetInfo(FIBITMAP *dib); -DLL_API FREE_IMAGE_COLOR_TYPE DLL_CALLCONV FreeImage_GetColorType(FIBITMAP *dib); - -DLL_API unsigned DLL_CALLCONV FreeImage_GetRedMask(FIBITMAP *dib); -DLL_API unsigned DLL_CALLCONV FreeImage_GetGreenMask(FIBITMAP *dib); -DLL_API unsigned DLL_CALLCONV FreeImage_GetBlueMask(FIBITMAP *dib); - -DLL_API unsigned DLL_CALLCONV FreeImage_GetTransparencyCount(FIBITMAP *dib); -DLL_API BYTE * DLL_CALLCONV FreeImage_GetTransparencyTable(FIBITMAP *dib); -DLL_API void DLL_CALLCONV FreeImage_SetTransparent(FIBITMAP *dib, BOOL enabled); -DLL_API void DLL_CALLCONV FreeImage_SetTransparencyTable(FIBITMAP *dib, BYTE *table, int count); -DLL_API BOOL DLL_CALLCONV FreeImage_IsTransparent(FIBITMAP *dib); -DLL_API void DLL_CALLCONV FreeImage_SetTransparentIndex(FIBITMAP *dib, int index); -DLL_API int DLL_CALLCONV FreeImage_GetTransparentIndex(FIBITMAP *dib); - -DLL_API BOOL DLL_CALLCONV FreeImage_HasBackgroundColor(FIBITMAP *dib); -DLL_API BOOL DLL_CALLCONV FreeImage_GetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor); -DLL_API BOOL DLL_CALLCONV FreeImage_SetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor); - -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetThumbnail(FIBITMAP *dib); -DLL_API BOOL DLL_CALLCONV FreeImage_SetThumbnail(FIBITMAP *dib, FIBITMAP *thumbnail); - -// ICC profile routines ----------------------------------------------------- - -DLL_API FIICCPROFILE *DLL_CALLCONV FreeImage_GetICCProfile(FIBITMAP *dib); -DLL_API FIICCPROFILE *DLL_CALLCONV FreeImage_CreateICCProfile(FIBITMAP *dib, void *data, long size); -DLL_API void DLL_CALLCONV FreeImage_DestroyICCProfile(FIBITMAP *dib); - -// Line conversion routines ------------------------------------------------- - -DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To4(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To4(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To4_555(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To4_565(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To4(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To4(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To8(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To8(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To8_555(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To8_565(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To8(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To8(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine16_565_To16_555(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To16_555(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To16_555(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine16_555_To16_565(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To16_565(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To16_565(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To24_555(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To24_565(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To24(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To32_555(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To32_565(BYTE *target, BYTE *source, int width_in_pixels); -DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To32(BYTE *target, BYTE *source, int width_in_pixels); - -// Smart conversion routines ------------------------------------------------ - -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo4Bits(FIBITMAP *dib); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo8Bits(FIBITMAP *dib); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToGreyscale(FIBITMAP *dib); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo16Bits555(FIBITMAP *dib); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo16Bits565(FIBITMAP *dib); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo24Bits(FIBITMAP *dib); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo32Bits(FIBITMAP *dib); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ColorQuantize(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ColorQuantizeEx(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize FI_DEFAULT(FIQ_WUQUANT), int PaletteSize FI_DEFAULT(256), int ReserveSize FI_DEFAULT(0), RGBQUAD *ReservePalette FI_DEFAULT(nullptr)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Threshold(FIBITMAP *dib, BYTE T); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Dither(FIBITMAP *dib, FREE_IMAGE_DITHER algorithm); - -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertFromRawBits(BYTE *bits, int width, int height, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown FI_DEFAULT(FALSE)); -DLL_API void DLL_CALLCONV FreeImage_ConvertToRawBits(BYTE *bits, FIBITMAP *dib, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown FI_DEFAULT(FALSE)); - -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToFloat(FIBITMAP *dib); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGBF(FIBITMAP *dib); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToUINT16(FIBITMAP *dib); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGB16(FIBITMAP *dib); - -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToStandardType(FIBITMAP *src, BOOL scale_linear FI_DEFAULT(TRUE)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToType(FIBITMAP *src, FREE_IMAGE_TYPE dst_type, BOOL scale_linear FI_DEFAULT(TRUE)); - -// tone mapping operators -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ToneMapping(FIBITMAP *dib, FREE_IMAGE_TMO tmo, double first_param FI_DEFAULT(0), double second_param FI_DEFAULT(0)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_TmoDrago03(FIBITMAP *src, double gamma FI_DEFAULT(2.2), double exposure FI_DEFAULT(0)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_TmoReinhard05(FIBITMAP *src, double intensity FI_DEFAULT(0), double contrast FI_DEFAULT(0)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_TmoReinhard05Ex(FIBITMAP *src, double intensity FI_DEFAULT(0), double contrast FI_DEFAULT(0), double adaptation FI_DEFAULT(1), double color_correction FI_DEFAULT(0)); - -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_TmoFattal02(FIBITMAP *src, double color_saturation FI_DEFAULT(0.5), double attenuation FI_DEFAULT(0.85)); - -// ZLib interface ----------------------------------------------------------- - -DLL_API DWORD DLL_CALLCONV FreeImage_ZLibCompress(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); -DLL_API DWORD DLL_CALLCONV FreeImage_ZLibUncompress(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); -DLL_API DWORD DLL_CALLCONV FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); -DLL_API DWORD DLL_CALLCONV FreeImage_ZLibGUnzip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); -DLL_API DWORD DLL_CALLCONV FreeImage_ZLibCRC32(DWORD crc, BYTE *source, DWORD source_size); - -// -------------------------------------------------------------------------- -// Metadata routines -------------------------------------------------------- -// -------------------------------------------------------------------------- - -// tag creation / destruction -DLL_API FITAG *DLL_CALLCONV FreeImage_CreateTag(void); -DLL_API void DLL_CALLCONV FreeImage_DeleteTag(FITAG *tag); -DLL_API FITAG *DLL_CALLCONV FreeImage_CloneTag(FITAG *tag); - -// tag getters and setters -DLL_API const char *DLL_CALLCONV FreeImage_GetTagKey(FITAG *tag); -DLL_API const char *DLL_CALLCONV FreeImage_GetTagDescription(FITAG *tag); -DLL_API WORD DLL_CALLCONV FreeImage_GetTagID(FITAG *tag); -DLL_API FREE_IMAGE_MDTYPE DLL_CALLCONV FreeImage_GetTagType(FITAG *tag); -DLL_API DWORD DLL_CALLCONV FreeImage_GetTagCount(FITAG *tag); -DLL_API DWORD DLL_CALLCONV FreeImage_GetTagLength(FITAG *tag); -DLL_API const void *DLL_CALLCONV FreeImage_GetTagValue(FITAG *tag); - -DLL_API BOOL DLL_CALLCONV FreeImage_SetTagKey(FITAG *tag, const char *key); -DLL_API BOOL DLL_CALLCONV FreeImage_SetTagDescription(FITAG *tag, const char *description); -DLL_API BOOL DLL_CALLCONV FreeImage_SetTagID(FITAG *tag, WORD id); -DLL_API BOOL DLL_CALLCONV FreeImage_SetTagType(FITAG *tag, FREE_IMAGE_MDTYPE type); -DLL_API BOOL DLL_CALLCONV FreeImage_SetTagCount(FITAG *tag, DWORD count); -DLL_API BOOL DLL_CALLCONV FreeImage_SetTagLength(FITAG *tag, DWORD length); -DLL_API BOOL DLL_CALLCONV FreeImage_SetTagValue(FITAG *tag, const void *value); - -// iterator -DLL_API FIMETADATA *DLL_CALLCONV FreeImage_FindFirstMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, FITAG **tag); -DLL_API BOOL DLL_CALLCONV FreeImage_FindNextMetadata(FIMETADATA *mdhandle, FITAG **tag); -DLL_API void DLL_CALLCONV FreeImage_FindCloseMetadata(FIMETADATA *mdhandle); - -// metadata setter and getter -DLL_API BOOL DLL_CALLCONV FreeImage_SetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG *tag); -DLL_API BOOL DLL_CALLCONV FreeImage_GetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG **tag); - -// helpers -DLL_API unsigned DLL_CALLCONV FreeImage_GetMetadataCount(FREE_IMAGE_MDMODEL model, FIBITMAP *dib); -DLL_API BOOL DLL_CALLCONV FreeImage_CloneMetadata(FIBITMAP *dst, FIBITMAP *src); - -// tag to C string conversion -DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model, FITAG *tag, char *Make FI_DEFAULT(nullptr)); - -// -------------------------------------------------------------------------- -// Image manipulation toolkit ----------------------------------------------- -// -------------------------------------------------------------------------- - -// rotation and flipping -/// @deprecated see FreeImage_Rotate -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateClassic(FIBITMAP *dib, double angle); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Rotate(FIBITMAP *dib, double angle, const void *bkcolor FI_DEFAULT(nullptr)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateEx(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x_origin, double y_origin, BOOL use_mask); -DLL_API BOOL DLL_CALLCONV FreeImage_FlipHorizontal(FIBITMAP *dib); -DLL_API BOOL DLL_CALLCONV FreeImage_FlipVertical(FIBITMAP *dib); -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(FALSE)); -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(FALSE)); - -// upsampling / downsampling -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Rescale(FIBITMAP *dib, int dst_width, int dst_height, FREE_IMAGE_FILTER filter); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_MakeThumbnail(FIBITMAP *dib, int max_pixel_size, BOOL convert FI_DEFAULT(TRUE)); - -// color manipulation routines (point operations) -DLL_API BOOL DLL_CALLCONV FreeImage_AdjustCurve(FIBITMAP *dib, BYTE *LUT, FREE_IMAGE_COLOR_CHANNEL channel); -DLL_API BOOL DLL_CALLCONV FreeImage_AdjustGamma(FIBITMAP *dib, double gamma); -DLL_API BOOL DLL_CALLCONV FreeImage_AdjustBrightness(FIBITMAP *dib, double percentage); -DLL_API BOOL DLL_CALLCONV FreeImage_AdjustContrast(FIBITMAP *dib, double percentage); -DLL_API BOOL DLL_CALLCONV FreeImage_Invert(FIBITMAP *dib); -DLL_API BOOL DLL_CALLCONV FreeImage_GetHistogram(FIBITMAP *dib, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL channel FI_DEFAULT(FICC_BLACK)); -DLL_API int DLL_CALLCONV FreeImage_GetAdjustColorsLookupTable(BYTE *LUT, double brightness, double contrast, double gamma, BOOL invert); -DLL_API BOOL DLL_CALLCONV FreeImage_AdjustColors(FIBITMAP *dib, double brightness, double contrast, double gamma, BOOL invert FI_DEFAULT(FALSE)); -DLL_API unsigned DLL_CALLCONV FreeImage_ApplyColorMapping(FIBITMAP *dib, RGBQUAD *srccolors, RGBQUAD *dstcolors, unsigned count, BOOL ignore_alpha, BOOL swap); -DLL_API unsigned DLL_CALLCONV FreeImage_SwapColors(FIBITMAP *dib, RGBQUAD *color_a, RGBQUAD *color_b, BOOL ignore_alpha); -DLL_API unsigned DLL_CALLCONV FreeImage_ApplyPaletteIndexMapping(FIBITMAP *dib, BYTE *srcindices, BYTE *dstindices, unsigned count, BOOL swap); -DLL_API unsigned DLL_CALLCONV FreeImage_SwapPaletteIndices(FIBITMAP *dib, BYTE *index_a, BYTE *index_b); - -// channel processing routines -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetChannel(FIBITMAP *dib, FREE_IMAGE_COLOR_CHANNEL channel); -DLL_API BOOL DLL_CALLCONV FreeImage_SetChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetComplexChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel); -DLL_API BOOL DLL_CALLCONV FreeImage_SetComplexChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel); - -// copy / paste / composite routines -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Copy(FIBITMAP *dib, int left, int top, int right, int bottom); -DLL_API BOOL DLL_CALLCONV FreeImage_Paste(FIBITMAP *dst, FIBITMAP *src, int left, int top, int alpha); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg FI_DEFAULT(FALSE), RGBQUAD *appBkColor FI_DEFAULT(nullptr), FIBITMAP *bg FI_DEFAULT(nullptr)); -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom); -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCropU(const wchar_t *src_file, const wchar_t *dst_file, int left, int top, int right, int bottom); -DLL_API BOOL DLL_CALLCONV FreeImage_PreMultiplyWithAlpha(FIBITMAP *dib); - -// background filling routines -DLL_API BOOL DLL_CALLCONV FreeImage_FillBackground(FIBITMAP *dib, const void *color, int options FI_DEFAULT(0)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_EnlargeCanvas(FIBITMAP *src, int left, int top, int right, int bottom, const void *color, int options FI_DEFAULT(0)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_AllocateEx(int width, int height, int bpp, const RGBQUAD *color, int options FI_DEFAULT(0), const RGBQUAD *palette FI_DEFAULT(nullptr), unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0)); -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_AllocateExT(FREE_IMAGE_TYPE type, int width, int height, int bpp, const void *color, int options FI_DEFAULT(0), const RGBQUAD *palette FI_DEFAULT(nullptr), unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0)); - -// miscellaneous algorithms -DLL_API FIBITMAP *DLL_CALLCONV FreeImage_MultigridPoissonSolver(FIBITMAP *Laplacian, int ncycle FI_DEFAULT(3)); - -// restore the borland-specific enum size option -#if defined(__BORLANDC__) -#pragma option pop -#endif - -#ifdef __cplusplus -} -#endif - -#endif // FREEIMAGE_H diff --git a/source/platform/renderers/OpenGL/OpenGL.cpp b/source/platform/renderers/OpenGL/OpenGL.cpp index c11a2f4b..dc22df99 100644 --- a/source/platform/renderers/OpenGL/OpenGL.cpp +++ b/source/platform/renderers/OpenGL/OpenGL.cpp @@ -1,14 +1,20 @@ +/* + * Gwork + * Copyright (c) 2010 Facepunch Studios + * Copyright (c) 2013-16 Billy Quith + * See license in Gwork.h + */ #include -#include -#include -#include -#include +#include +#include +//#include #include -#include "GL/glew.h" -#include "FreeImage/FreeImage.h" +//#define STBI_ASSERT(x) // comment in for no asserts +#define STB_IMAGE_IMPLEMENTATION +#include "stb_image.h" namespace Gwk @@ -19,7 +25,6 @@ namespace Gwk { m_vertNum = 0; m_context = nullptr; - ::FreeImage_Initialise(); for (int i = 0; i < MaxVerts; i++) { @@ -29,7 +34,6 @@ namespace Gwk OpenGL::~OpenGL() { - ::FreeImage_DeInitialise(); } void OpenGL::Init() @@ -115,7 +119,7 @@ namespace Gwk { GLint view[4]; glGetIntegerv(GL_VIEWPORT, &view[0]); - rect.y = view[3]-(rect.y+rect.h); + rect.y = view[3] - (rect.y + rect.h); } glScissor(rect.x*Scale(), rect.y*Scale(), rect.w*Scale(), rect.h*Scale()); glEnable(GL_SCISSOR_TEST); @@ -127,8 +131,8 @@ namespace Gwk glDisable(GL_SCISSOR_TEST); } - void OpenGL::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, float u1, float v1, - float u2, float v2) + void OpenGL::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, + float u1, float v1, float u2, float v2) { GLuint* tex = (GLuint*)texture->data; @@ -149,72 +153,62 @@ namespace Gwk glEnable(GL_TEXTURE_2D); } - AddVert(rect.x, rect.y, u1, v1); - AddVert(rect.x+rect.w, rect.y, u2, v1); - AddVert(rect.x, rect.y+rect.h, u1, v2); - AddVert(rect.x+rect.w, rect.y, u2, v1); + AddVert(rect.x, rect.y, u1, v1); + AddVert(rect.x+rect.w, rect.y, u2, v1); + AddVert(rect.x, rect.y+rect.h, u1, v2); + AddVert(rect.x+rect.w, rect.y, u2, v1); AddVert(rect.x+rect.w, rect.y+rect.h, u2, v2); - AddVert(rect.x, rect.y+rect.h, u1, v2); + AddVert(rect.x, rect.y+rect.h, u1, v2); } void OpenGL::LoadTexture(Gwk::Texture* texture) { const std::string &fileName = texture->name; - FREE_IMAGE_FORMAT imageFormat = FreeImage_GetFileType(fileName.c_str()); - - if (imageFormat == FIF_UNKNOWN) - imageFormat = FreeImage_GetFIFFromFilename(fileName.c_str()); - + + int x,y,n; + unsigned char *data = stbi_load(fileName.c_str(), &x, &y, &n, 0); + // Image failed to load.. - if (imageFormat == FIF_UNKNOWN) - { - texture->failed = true; - return; - } - - // Try to load the image.. - FIBITMAP* bits = FreeImage_Load(imageFormat, fileName.c_str()); - - if (!bits) + if (!data) { texture->failed = true; return; } // Convert to 32bit - FIBITMAP* bits32 = FreeImage_ConvertTo32Bits(bits); - FreeImage_Unload(bits); - - if (!bits32) - { - texture->failed = true; - return; - } +// FIBITMAP* bits32 = FreeImage_ConvertTo32Bits(bits); +// FreeImage_Unload(bits); +// +// if (!bits32) +// { +// texture->failed = true; +// return; +// } // Flip - ::FreeImage_FlipVertical(bits32); +// ::FreeImage_FlipVertical(bits32); // Create a little texture pointer.. GLuint* pglTexture = new GLuint; - // Sort out our Gwork texture texture->data = pglTexture; - texture->width = FreeImage_GetWidth(bits32); - texture->height = FreeImage_GetHeight(bits32); + texture->width = x; + texture->height = y; // Create the opengl texture glGenTextures(1, pglTexture); glBindTexture(GL_TEXTURE_2D, *pglTexture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -#ifdef FREEIMAGE_BIGENDIAN - GLenum format = GL_RGBA; -#else +//#ifdef FREEIMAGE_BIGENDIAN +// GLenum format = GL_RGBA; +//#else GLenum format = GL_BGRA; -#endif +//#endif glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->width, texture->height, 0, format, - GL_UNSIGNED_BYTE, (const GLvoid*)FreeImage_GetBits(bits32)); - FreeImage_Unload(bits32); + GL_UNSIGNED_BYTE, (const GLvoid*)data); + + stbi_image_free(data); } void OpenGL::FreeTexture(Gwk::Texture* texture) @@ -230,7 +224,7 @@ namespace Gwk } Gwk::Color OpenGL::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, - const Gwk::Color& col_default) + const Gwk::Color& col_default) { GLuint* tex = (GLuint*)texture->data; diff --git a/source/platform/renderers/OpenGL/stb_image.h b/source/platform/renderers/OpenGL/stb_image.h new file mode 100644 index 00000000..a3c11299 --- /dev/null +++ b/source/platform/renderers/OpenGL/stb_image.h @@ -0,0 +1,6755 @@ +/* stb_image - v2.12 - public domain image loader - http://nothings.org/stb_image.h + no warranty implied; use at your own risk + + Do this: + #define STB_IMAGE_IMPLEMENTATION + before you include this file in *one* C or C++ file to create the implementation. + + // i.e. it should look like this: + #include ... + #include ... + #include ... + #define STB_IMAGE_IMPLEMENTATION + #include "stb_image.h" + + You can #define STBI_ASSERT(x) before the #include to avoid using assert.h. + And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free + + + QUICK NOTES: + Primarily of interest to game developers and other people who can + avoid problematic images and only need the trivial interface + + JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib) + PNG 1/2/4/8-bit-per-channel (16 bpc not supported) + + TGA (not sure what subset, if a subset) + BMP non-1bpp, non-RLE + PSD (composited view only, no extra channels, 8/16 bit-per-channel) + + GIF (*comp always reports as 4-channel) + HDR (radiance rgbE format) + PIC (Softimage PIC) + PNM (PPM and PGM binary only) + + Animated GIF still needs a proper API, but here's one way to do it: + http://gist.github.com/urraka/685d9a6340b26b830d49 + + - decode from memory or through FILE (define STBI_NO_STDIO to remove code) + - decode from arbitrary I/O callbacks + - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON) + + Full documentation under "DOCUMENTATION" below. + + + Revision 2.00 release notes: + + - Progressive JPEG is now supported. + + - PPM and PGM binary formats are now supported, thanks to Ken Miller. + + - x86 platforms now make use of SSE2 SIMD instructions for + JPEG decoding, and ARM platforms can use NEON SIMD if requested. + This work was done by Fabian "ryg" Giesen. SSE2 is used by + default, but NEON must be enabled explicitly; see docs. + + With other JPEG optimizations included in this version, we see + 2x speedup on a JPEG on an x86 machine, and a 1.5x speedup + on a JPEG on an ARM machine, relative to previous versions of this + library. The same results will not obtain for all JPGs and for all + x86/ARM machines. (Note that progressive JPEGs are significantly + slower to decode than regular JPEGs.) This doesn't mean that this + is the fastest JPEG decoder in the land; rather, it brings it + closer to parity with standard libraries. If you want the fastest + decode, look elsewhere. (See "Philosophy" section of docs below.) + + See final bullet items below for more info on SIMD. + + - Added STBI_MALLOC, STBI_REALLOC, and STBI_FREE macros for replacing + the memory allocator. Unlike other STBI libraries, these macros don't + support a context parameter, so if you need to pass a context in to + the allocator, you'll have to store it in a global or a thread-local + variable. + + - Split existing STBI_NO_HDR flag into two flags, STBI_NO_HDR and + STBI_NO_LINEAR. + STBI_NO_HDR: suppress implementation of .hdr reader format + STBI_NO_LINEAR: suppress high-dynamic-range light-linear float API + + - You can suppress implementation of any of the decoders to reduce + your code footprint by #defining one or more of the following + symbols before creating the implementation. + + STBI_NO_JPEG + STBI_NO_PNG + STBI_NO_BMP + STBI_NO_PSD + STBI_NO_TGA + STBI_NO_GIF + STBI_NO_HDR + STBI_NO_PIC + STBI_NO_PNM (.ppm and .pgm) + + - You can request *only* certain decoders and suppress all other ones + (this will be more forward-compatible, as addition of new decoders + doesn't require you to disable them explicitly): + + STBI_ONLY_JPEG + STBI_ONLY_PNG + STBI_ONLY_BMP + STBI_ONLY_PSD + STBI_ONLY_TGA + STBI_ONLY_GIF + STBI_ONLY_HDR + STBI_ONLY_PIC + STBI_ONLY_PNM (.ppm and .pgm) + + Note that you can define multiples of these, and you will get all + of them ("only x" and "only y" is interpreted to mean "only x&y"). + + - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still + want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB + + - Compilation of all SIMD code can be suppressed with + #define STBI_NO_SIMD + It should not be necessary to disable SIMD unless you have issues + compiling (e.g. using an x86 compiler which doesn't support SSE + intrinsics or that doesn't support the method used to detect + SSE2 support at run-time), and even those can be reported as + bugs so I can refine the built-in compile-time checking to be + smarter. + + - The old STBI_SIMD system which allowed installing a user-defined + IDCT etc. has been removed. If you need this, don't upgrade. My + assumption is that almost nobody was doing this, and those who + were will find the built-in SIMD more satisfactory anyway. + + - RGB values computed for JPEG images are slightly different from + previous versions of stb_image. (This is due to using less + integer precision in SIMD.) The C code has been adjusted so + that the same RGB values will be computed regardless of whether + SIMD support is available, so your app should always produce + consistent results. But these results are slightly different from + previous versions. (Specifically, about 3% of available YCbCr values + will compute different RGB results from pre-1.49 versions by +-1; + most of the deviating values are one smaller in the G channel.) + + - If you must produce consistent results with previous versions of + stb_image, #define STBI_JPEG_OLD and you will get the same results + you used to; however, you will not get the SIMD speedups for + the YCbCr-to-RGB conversion step (although you should still see + significant JPEG speedup from the other changes). + + Please note that STBI_JPEG_OLD is a temporary feature; it will be + removed in future versions of the library. It is only intended for + near-term back-compatibility use. + + + Latest revision history: + 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes + 2.11 (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64 + RGB-format JPEG; remove white matting in PSD; + allocate large structures on the stack; + correct channel count for PNG & BMP + 2.10 (2016-01-22) avoid warning introduced in 2.09 + 2.09 (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED + 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA + 2.07 (2015-09-13) partial animated GIF support + limited 16-bit PSD support + minor bugs, code cleanup, and compiler warnings + 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value + 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning + 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit + 2.03 (2015-04-12) additional corruption checking + stbi_set_flip_vertically_on_load + fix NEON support; fix mingw support + 2.02 (2015-01-19) fix incorrect assert, fix warning + 2.01 (2015-01-17) fix various warnings + 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG + 2.00 (2014-12-25) optimize JPEG, including x86 SSE2 & ARM NEON SIMD + progressive JPEG + PGM/PPM support + STBI_MALLOC,STBI_REALLOC,STBI_FREE + STBI_NO_*, STBI_ONLY_* + GIF bugfix + + See end of file for full revision history. + + + ============================ Contributors ========================= + + Image formats Extensions, features + Sean Barrett (jpeg, png, bmp) Jetro Lauha (stbi_info) + Nicolas Schulz (hdr, psd) Martin "SpartanJ" Golini (stbi_info) + Jonathan Dummer (tga) James "moose2000" Brown (iPhone PNG) + Jean-Marc Lienher (gif) Ben "Disch" Wenger (io callbacks) + Tom Seddon (pic) Omar Cornut (1/2/4-bit PNG) + Thatcher Ulrich (psd) Nicolas Guillemot (vertical flip) + Ken Miller (pgm, ppm) Richard Mitton (16-bit PSD) + urraka@github (animated gif) Junggon Kim (PNM comments) + Daniel Gibson (16-bit TGA) + + Optimizations & bugfixes + Fabian "ryg" Giesen + Arseny Kapoulkine + + Bug & warning fixes + Marc LeBlanc David Woo Guillaume George Martins Mozeiko + Christpher Lloyd Martin Golini Jerry Jansson Joseph Thomson + Dave Moore Roy Eltham Hayaki Saito Phil Jordan + Won Chun Luke Graham Johan Duparc Nathan Reed + the Horde3D community Thomas Ruf Ronny Chevalier Nick Verigakis + Janez Zemva John Bartholomew Michal Cichon svdijk@github + Jonathan Blow Ken Hamada Tero Hanninen Baldur Karlsson + Laurent Gomila Cort Stratton Sergio Gonzalez romigrou@github + Aruelien Pocheville Thibault Reuille Cass Everitt Matthew Gregan + Ryamond Barbiero Paul Du Bois Engin Manap snagar@github + Michaelangel007@github Oriol Ferrer Mesia socks-the-fox + Blazej Dariusz Roszkowski + + +LICENSE + +This software is dual-licensed to the public domain and under the following +license: you are granted a perpetual, irrevocable license to copy, modify, +publish, and distribute this file as you see fit. + +*/ + +#ifndef STBI_INCLUDE_STB_IMAGE_H +#define STBI_INCLUDE_STB_IMAGE_H + +// DOCUMENTATION +// +// Limitations: +// - no 16-bit-per-channel PNG +// - no 12-bit-per-channel JPEG +// - no JPEGs with arithmetic coding +// - no 1-bit BMP +// - GIF always returns *comp=4 +// +// Basic usage (see HDR discussion below for HDR usage): +// int x,y,n; +// unsigned char *data = stbi_load(filename, &x, &y, &n, 0); +// // ... process data if not NULL ... +// // ... x = width, y = height, n = # 8-bit components per pixel ... +// // ... replace '0' with '1'..'4' to force that many components per pixel +// // ... but 'n' will always be the number that it would have been if you said 0 +// stbi_image_free(data) +// +// Standard parameters: +// int *x -- outputs image width in pixels +// int *y -- outputs image height in pixels +// int *comp -- outputs # of image components in image file +// int req_comp -- if non-zero, # of image components requested in result +// +// The return value from an image loader is an 'unsigned char *' which points +// to the pixel data, or NULL on an allocation failure or if the image is +// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels, +// with each pixel consisting of N interleaved 8-bit components; the first +// pixel pointed to is top-left-most in the image. There is no padding between +// image scanlines or between pixels, regardless of format. The number of +// components N is 'req_comp' if req_comp is non-zero, or *comp otherwise. +// If req_comp is non-zero, *comp has the number of components that _would_ +// have been output otherwise. E.g. if you set req_comp to 4, you will always +// get RGBA output, but you can check *comp to see if it's trivially opaque +// because e.g. there were only 3 channels in the source image. +// +// An output image with N components has the following components interleaved +// in this order in each pixel: +// +// N=#comp components +// 1 grey +// 2 grey, alpha +// 3 red, green, blue +// 4 red, green, blue, alpha +// +// If image loading fails for any reason, the return value will be NULL, +// and *x, *y, *comp will be unchanged. The function stbi_failure_reason() +// can be queried for an extremely brief, end-user unfriendly explanation +// of why the load failed. Define STBI_NO_FAILURE_STRINGS to avoid +// compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly +// more user-friendly ones. +// +// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized. +// +// =========================================================================== +// +// Philosophy +// +// stb libraries are designed with the following priorities: +// +// 1. easy to use +// 2. easy to maintain +// 3. good performance +// +// Sometimes I let "good performance" creep up in priority over "easy to maintain", +// and for best performance I may provide less-easy-to-use APIs that give higher +// performance, in addition to the easy to use ones. Nevertheless, it's important +// to keep in mind that from the standpoint of you, a client of this library, +// all you care about is #1 and #3, and stb libraries do not emphasize #3 above all. +// +// Some secondary priorities arise directly from the first two, some of which +// make more explicit reasons why performance can't be emphasized. +// +// - Portable ("ease of use") +// - Small footprint ("easy to maintain") +// - No dependencies ("ease of use") +// +// =========================================================================== +// +// I/O callbacks +// +// I/O callbacks allow you to read from arbitrary sources, like packaged +// files or some other source. Data read from callbacks are processed +// through a small internal buffer (currently 128 bytes) to try to reduce +// overhead. +// +// The three functions you must define are "read" (reads some bytes of data), +// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end). +// +// =========================================================================== +// +// SIMD support +// +// The JPEG decoder will try to automatically use SIMD kernels on x86 when +// supported by the compiler. For ARM Neon support, you must explicitly +// request it. +// +// (The old do-it-yourself SIMD API is no longer supported in the current +// code.) +// +// On x86, SSE2 will automatically be used when available based on a run-time +// test; if not, the generic C versions are used as a fall-back. On ARM targets, +// the typical path is to have separate builds for NEON and non-NEON devices +// (at least this is true for iOS and Android). Therefore, the NEON support is +// toggled by a build flag: define STBI_NEON to get NEON loops. +// +// The output of the JPEG decoder is slightly different from versions where +// SIMD support was introduced (that is, for versions before 1.49). The +// difference is only +-1 in the 8-bit RGB channels, and only on a small +// fraction of pixels. You can force the pre-1.49 behavior by defining +// STBI_JPEG_OLD, but this will disable some of the SIMD decoding path +// and hence cost some performance. +// +// If for some reason you do not want to use any of SIMD code, or if +// you have issues compiling it, you can disable it entirely by +// defining STBI_NO_SIMD. +// +// =========================================================================== +// +// HDR image support (disable by defining STBI_NO_HDR) +// +// stb_image now supports loading HDR images in general, and currently +// the Radiance .HDR file format, although the support is provided +// generically. You can still load any file through the existing interface; +// if you attempt to load an HDR file, it will be automatically remapped to +// LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1; +// both of these constants can be reconfigured through this interface: +// +// stbi_hdr_to_ldr_gamma(2.2f); +// stbi_hdr_to_ldr_scale(1.0f); +// +// (note, do not use _inverse_ constants; stbi_image will invert them +// appropriately). +// +// Additionally, there is a new, parallel interface for loading files as +// (linear) floats to preserve the full dynamic range: +// +// float *data = stbi_loadf(filename, &x, &y, &n, 0); +// +// If you load LDR images through this interface, those images will +// be promoted to floating point values, run through the inverse of +// constants corresponding to the above: +// +// stbi_ldr_to_hdr_scale(1.0f); +// stbi_ldr_to_hdr_gamma(2.2f); +// +// Finally, given a filename (or an open file or memory block--see header +// file for details) containing image data, you can query for the "most +// appropriate" interface to use (that is, whether the image is HDR or +// not), using: +// +// stbi_is_hdr(char *filename); +// +// =========================================================================== +// +// iPhone PNG support: +// +// By default we convert iphone-formatted PNGs back to RGB, even though +// they are internally encoded differently. You can disable this conversion +// by by calling stbi_convert_iphone_png_to_rgb(0), in which case +// you will always just get the native iphone "format" through (which +// is BGR stored in RGB). +// +// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per +// pixel to remove any premultiplied alpha *only* if the image file explicitly +// says there's premultiplied data (currently only happens in iPhone images, +// and only if iPhone convert-to-rgb processing is on). +// + + +#ifndef STBI_NO_STDIO +#include +#endif // STBI_NO_STDIO + +#define STBI_VERSION 1 + +enum +{ + STBI_default = 0, // only used for req_comp + + STBI_grey = 1, + STBI_grey_alpha = 2, + STBI_rgb = 3, + STBI_rgb_alpha = 4 +}; + +typedef unsigned char stbi_uc; + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef STB_IMAGE_STATIC +#define STBIDEF static +#else +#define STBIDEF extern +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// PRIMARY API - works on images of any type +// + +// +// load image by filename, open file, or memory buffer +// + +typedef struct +{ + int (*read) (void *user,char *data,int size); // fill 'data' with 'size' bytes. return number of bytes actually read + void (*skip) (void *user,int n); // skip the next 'n' bytes, or 'unget' the last -n bytes if negative + int (*eof) (void *user); // returns nonzero if we are at end of file/data +} stbi_io_callbacks; + +STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *comp, int req_comp); +STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *comp, int req_comp); +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *comp, int req_comp); + +#ifndef STBI_NO_STDIO +STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *comp, int req_comp); +// for stbi_load_from_file, file pointer is left pointing immediately after image +#endif + +#ifndef STBI_NO_LINEAR + STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *comp, int req_comp); + STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp); + STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp); + + #ifndef STBI_NO_STDIO + STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *comp, int req_comp); + #endif +#endif + +#ifndef STBI_NO_HDR + STBIDEF void stbi_hdr_to_ldr_gamma(float gamma); + STBIDEF void stbi_hdr_to_ldr_scale(float scale); +#endif // STBI_NO_HDR + +#ifndef STBI_NO_LINEAR + STBIDEF void stbi_ldr_to_hdr_gamma(float gamma); + STBIDEF void stbi_ldr_to_hdr_scale(float scale); +#endif // STBI_NO_LINEAR + +// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user); +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len); +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename); +STBIDEF int stbi_is_hdr_from_file(FILE *f); +#endif // STBI_NO_STDIO + + +// get a VERY brief reason for failure +// NOT THREADSAFE +STBIDEF const char *stbi_failure_reason (void); + +// free the loaded image -- this is just free() +STBIDEF void stbi_image_free (void *retval_from_stbi_load); + +// get image dimensions & components without fully decoding +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp); + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp); + +#endif + + + +// for image formats that explicitly notate that they have premultiplied alpha, +// we just return the colors as stored in the file. set this flag to force +// unpremultiplication. results are undefined if the unpremultiply overflow. +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply); + +// indicate whether we should process iphone images back to canonical format, +// or just pass them through "as-is" +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); + +// flip the image vertically, so the first pixel in the output array is the bottom left +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); + +// ZLIB client - used by PNG, available for other purposes + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header); +STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + +STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + + +#ifdef __cplusplus +} +#endif + +// +// +//// end header file ///////////////////////////////////////////////////// +#endif // STBI_INCLUDE_STB_IMAGE_H + +#ifdef STB_IMAGE_IMPLEMENTATION + +#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \ + || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \ + || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \ + || defined(STBI_ONLY_ZLIB) + #ifndef STBI_ONLY_JPEG + #define STBI_NO_JPEG + #endif + #ifndef STBI_ONLY_PNG + #define STBI_NO_PNG + #endif + #ifndef STBI_ONLY_BMP + #define STBI_NO_BMP + #endif + #ifndef STBI_ONLY_PSD + #define STBI_NO_PSD + #endif + #ifndef STBI_ONLY_TGA + #define STBI_NO_TGA + #endif + #ifndef STBI_ONLY_GIF + #define STBI_NO_GIF + #endif + #ifndef STBI_ONLY_HDR + #define STBI_NO_HDR + #endif + #ifndef STBI_ONLY_PIC + #define STBI_NO_PIC + #endif + #ifndef STBI_ONLY_PNM + #define STBI_NO_PNM + #endif +#endif + +#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB) +#define STBI_NO_ZLIB +#endif + + +#include +#include // ptrdiff_t on osx +#include +#include + +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) +#include // ldexp +#endif + +#ifndef STBI_NO_STDIO +#include +#endif + +#ifndef STBI_ASSERT +#include +#define STBI_ASSERT(x) assert(x) +#endif + + +#ifndef _MSC_VER + #ifdef __cplusplus + #define stbi_inline inline + #else + #define stbi_inline + #endif +#else + #define stbi_inline __forceinline +#endif + + +#ifdef _MSC_VER +typedef unsigned short stbi__uint16; +typedef signed short stbi__int16; +typedef unsigned int stbi__uint32; +typedef signed int stbi__int32; +#else +#include +typedef uint16_t stbi__uint16; +typedef int16_t stbi__int16; +typedef uint32_t stbi__uint32; +typedef int32_t stbi__int32; +#endif + +// should produce compiler error if size is wrong +typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1]; + +#ifdef _MSC_VER +#define STBI_NOTUSED(v) (void)(v) +#else +#define STBI_NOTUSED(v) (void)sizeof(v) +#endif + +#ifdef _MSC_VER +#define STBI_HAS_LROTL +#endif + +#ifdef STBI_HAS_LROTL + #define stbi_lrot(x,y) _lrotl(x,y) +#else + #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (32 - (y)))) +#endif + +#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED)) +// ok +#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED) +// ok +#else +#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)." +#endif + +#ifndef STBI_MALLOC +#define STBI_MALLOC(sz) malloc(sz) +#define STBI_REALLOC(p,newsz) realloc(p,newsz) +#define STBI_FREE(p) free(p) +#endif + +#ifndef STBI_REALLOC_SIZED +#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz) +#endif + +// x86/x64 detection +#if defined(__x86_64__) || defined(_M_X64) +#define STBI__X64_TARGET +#elif defined(__i386) || defined(_M_IX86) +#define STBI__X86_TARGET +#endif + +#if defined(__GNUC__) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) +// NOTE: not clear do we actually need this for the 64-bit path? +// gcc doesn't support sse2 intrinsics unless you compile with -msse2, +// (but compiling with -msse2 allows the compiler to use SSE2 everywhere; +// this is just broken and gcc are jerks for not fixing it properly +// http://www.virtualdub.org/blog/pivot/entry.php?id=363 ) +#define STBI_NO_SIMD +#endif + +#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD) +// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET +// +// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the +// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant. +// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not +// simultaneously enabling "-mstackrealign". +// +// See https://github.com/nothings/stb/issues/81 for more information. +// +// So default to no SSE2 on 32-bit MinGW. If you've read this far and added +// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2. +#define STBI_NO_SIMD +#endif + +#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) +#define STBI_SSE2 +#include + +#ifdef _MSC_VER + +#if _MSC_VER >= 1400 // not VC6 +#include // __cpuid +static int stbi__cpuid3(void) +{ + int info[4]; + __cpuid(info,1); + return info[3]; +} +#else +static int stbi__cpuid3(void) +{ + int res; + __asm { + mov eax,1 + cpuid + mov res,edx + } + return res; +} +#endif + +#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name + +static int stbi__sse2_available() +{ + int info3 = stbi__cpuid3(); + return ((info3 >> 26) & 1) != 0; +} +#else // assume GCC-style if not VC++ +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) + +static int stbi__sse2_available() +{ +#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 // GCC 4.8 or later + // GCC 4.8+ has a nice way to do this + return __builtin_cpu_supports("sse2"); +#else + // portable way to do this, preferably without using GCC inline ASM? + // just bail for now. + return 0; +#endif +} +#endif +#endif + +// ARM NEON +#if defined(STBI_NO_SIMD) && defined(STBI_NEON) +#undef STBI_NEON +#endif + +#ifdef STBI_NEON +#include +// assume GCC or Clang on ARM targets +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) +#endif + +#ifndef STBI_SIMD_ALIGN +#define STBI_SIMD_ALIGN(type, name) type name +#endif + +/////////////////////////////////////////////// +// +// stbi__context struct and start_xxx functions + +// stbi__context structure is our basic context used by all images, so it +// contains all the IO context, plus some basic image information +typedef struct +{ + stbi__uint32 img_x, img_y; + int img_n, img_out_n; + + stbi_io_callbacks io; + void *io_user_data; + + int read_from_callbacks; + int buflen; + stbi_uc buffer_start[128]; + + stbi_uc *img_buffer, *img_buffer_end; + stbi_uc *img_buffer_original, *img_buffer_original_end; +} stbi__context; + + +static void stbi__refill_buffer(stbi__context *s); + +// initialize a memory-decode context +static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len) +{ + s->io.read = NULL; + s->read_from_callbacks = 0; + s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer; + s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len; +} + +// initialize a callback-based context +static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user) +{ + s->io = *c; + s->io_user_data = user; + s->buflen = sizeof(s->buffer_start); + s->read_from_callbacks = 1; + s->img_buffer_original = s->buffer_start; + stbi__refill_buffer(s); + s->img_buffer_original_end = s->img_buffer_end; +} + +#ifndef STBI_NO_STDIO + +static int stbi__stdio_read(void *user, char *data, int size) +{ + return (int) fread(data,1,size,(FILE*) user); +} + +static void stbi__stdio_skip(void *user, int n) +{ + fseek((FILE*) user, n, SEEK_CUR); +} + +static int stbi__stdio_eof(void *user) +{ + return feof((FILE*) user); +} + +static stbi_io_callbacks stbi__stdio_callbacks = +{ + stbi__stdio_read, + stbi__stdio_skip, + stbi__stdio_eof, +}; + +static void stbi__start_file(stbi__context *s, FILE *f) +{ + stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f); +} + +//static void stop_file(stbi__context *s) { } + +#endif // !STBI_NO_STDIO + +static void stbi__rewind(stbi__context *s) +{ + // conceptually rewind SHOULD rewind to the beginning of the stream, + // but we just rewind to the beginning of the initial buffer, because + // we only use it after doing 'test', which only ever looks at at most 92 bytes + s->img_buffer = s->img_buffer_original; + s->img_buffer_end = s->img_buffer_original_end; +} + +#ifndef STBI_NO_JPEG +static int stbi__jpeg_test(stbi__context *s); +static stbi_uc *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNG +static int stbi__png_test(stbi__context *s); +static stbi_uc *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_BMP +static int stbi__bmp_test(stbi__context *s); +static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_TGA +static int stbi__tga_test(stbi__context *s); +static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s); +static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_HDR +static int stbi__hdr_test(stbi__context *s); +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_test(stbi__context *s); +static stbi_uc *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_GIF +static int stbi__gif_test(stbi__context *s); +static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNM +static int stbi__pnm_test(stbi__context *s); +static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +// this is not threadsafe +static const char *stbi__g_failure_reason; + +STBIDEF const char *stbi_failure_reason(void) +{ + return stbi__g_failure_reason; +} + +static int stbi__err(const char *str) +{ + stbi__g_failure_reason = str; + return 0; +} + +static void *stbi__malloc(size_t size) +{ + return STBI_MALLOC(size); +} + +// stbi__err - error +// stbi__errpf - error returning pointer to float +// stbi__errpuc - error returning pointer to unsigned char + +#ifdef STBI_NO_FAILURE_STRINGS + #define stbi__err(x,y) 0 +#elif defined(STBI_FAILURE_USERMSG) + #define stbi__err(x,y) stbi__err(y) +#else + #define stbi__err(x,y) stbi__err(x) +#endif + +#define stbi__errpf(x,y) ((float *)(size_t) (stbi__err(x,y)?NULL:NULL)) +#define stbi__errpuc(x,y) ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL)) + +STBIDEF void stbi_image_free(void *retval_from_stbi_load) +{ + STBI_FREE(retval_from_stbi_load); +} + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); +#endif + +#ifndef STBI_NO_HDR +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); +#endif + +static int stbi__vertically_flip_on_load = 0; + +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) +{ + stbi__vertically_flip_on_load = flag_true_if_should_flip; +} + +static unsigned char *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + #ifndef STBI_NO_JPEG + if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PNG + if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_BMP + if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_GIF + if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PSD + if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PIC + if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PNM + if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp); + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + float *hdr = stbi__hdr_load(s, x,y,comp,req_comp); + return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp); + } + #endif + + #ifndef STBI_NO_TGA + // test tga last because it's a crappy test! + if (stbi__tga_test(s)) + return stbi__tga_load(s,x,y,comp,req_comp); + #endif + + return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt"); +} + +static unsigned char *stbi__load_flip(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *result = stbi__load_main(s, x, y, comp, req_comp); + + if (stbi__vertically_flip_on_load && result != NULL) { + int w = *x, h = *y; + int depth = req_comp ? req_comp : *comp; + int row,col,z; + stbi_uc temp; + + // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once + for (row = 0; row < (h>>1); row++) { + for (col = 0; col < w; col++) { + for (z = 0; z < depth; z++) { + temp = result[(row * w + col) * depth + z]; + result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z]; + result[((h - row - 1) * w + col) * depth + z] = temp; + } + } + } + } + + return result; +} + +#ifndef STBI_NO_HDR +static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) +{ + if (stbi__vertically_flip_on_load && result != NULL) { + int w = *x, h = *y; + int depth = req_comp ? req_comp : *comp; + int row,col,z; + float temp; + + // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once + for (row = 0; row < (h>>1); row++) { + for (col = 0; col < w; col++) { + for (z = 0; z < depth; z++) { + temp = result[(row * w + col) * depth + z]; + result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z]; + result[((h - row - 1) * w + col) * depth + z] = temp; + } + } + } + } +} +#endif + +#ifndef STBI_NO_STDIO + +static FILE *stbi__fopen(char const *filename, char const *mode) +{ + FILE *f; +#if defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != fopen_s(&f, filename, mode)) + f=0; +#else + f = fopen(filename, mode); +#endif + return f; +} + + +STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + unsigned char *result; + if (!f) return stbi__errpuc("can't fopen", "Unable to open file"); + result = stbi_load_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *result; + stbi__context s; + stbi__start_file(&s,f); + result = stbi__load_flip(&s,x,y,comp,req_comp); + if (result) { + // need to 'unget' all the characters in the IO buffer + fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); + } + return result; +} +#endif //!STBI_NO_STDIO + +STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__load_flip(&s,x,y,comp,req_comp); +} + +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__load_flip(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_LINEAR +static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *data; + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp); + if (hdr_data) + stbi__float_postprocess(hdr_data,x,y,comp,req_comp); + return hdr_data; + } + #endif + data = stbi__load_flip(s, x, y, comp, req_comp); + if (data) + return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp); + return stbi__errpf("unknown image type", "Image not of any known type, or corrupt"); +} + +STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_STDIO +STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + float *result; + FILE *f = stbi__fopen(filename, "rb"); + if (!f) return stbi__errpf("can't fopen", "Unable to open file"); + result = stbi_loadf_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_file(&s,f); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} +#endif // !STBI_NO_STDIO + +#endif // !STBI_NO_LINEAR + +// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is +// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always +// reports false! + +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(buffer); + STBI_NOTUSED(len); + return 0; + #endif +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result=0; + if (f) { + result = stbi_is_hdr_from_file(f); + fclose(f); + } + return result; +} + +STBIDEF int stbi_is_hdr_from_file(FILE *f) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_file(&s,f); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(f); + return 0; + #endif +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(clbk); + STBI_NOTUSED(user); + return 0; + #endif +} + +#ifndef STBI_NO_LINEAR +static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f; + +STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; } +STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; } +#endif + +static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f; + +STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; } +STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; } + + +////////////////////////////////////////////////////////////////////////////// +// +// Common code used by all image loaders +// + +enum +{ + STBI__SCAN_load=0, + STBI__SCAN_type, + STBI__SCAN_header +}; + +static void stbi__refill_buffer(stbi__context *s) +{ + int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen); + if (n == 0) { + // at end of file, treat same as if from memory, but need to handle case + // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file + s->read_from_callbacks = 0; + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start+1; + *s->img_buffer = 0; + } else { + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start + n; + } +} + +stbi_inline static stbi_uc stbi__get8(stbi__context *s) +{ + if (s->img_buffer < s->img_buffer_end) + return *s->img_buffer++; + if (s->read_from_callbacks) { + stbi__refill_buffer(s); + return *s->img_buffer++; + } + return 0; +} + +stbi_inline static int stbi__at_eof(stbi__context *s) +{ + if (s->io.read) { + if (!(s->io.eof)(s->io_user_data)) return 0; + // if feof() is true, check if buffer = end + // special case: we've only got the special 0 character at the end + if (s->read_from_callbacks == 0) return 1; + } + + return s->img_buffer >= s->img_buffer_end; +} + +static void stbi__skip(stbi__context *s, int n) +{ + if (n < 0) { + s->img_buffer = s->img_buffer_end; + return; + } + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + s->img_buffer = s->img_buffer_end; + (s->io.skip)(s->io_user_data, n - blen); + return; + } + } + s->img_buffer += n; +} + +static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) +{ + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + int res, count; + + memcpy(buffer, s->img_buffer, blen); + + count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen); + res = (count == (n-blen)); + s->img_buffer = s->img_buffer_end; + return res; + } + } + + if (s->img_buffer+n <= s->img_buffer_end) { + memcpy(buffer, s->img_buffer, n); + s->img_buffer += n; + return 1; + } else + return 0; +} + +static int stbi__get16be(stbi__context *s) +{ + int z = stbi__get8(s); + return (z << 8) + stbi__get8(s); +} + +static stbi__uint32 stbi__get32be(stbi__context *s) +{ + stbi__uint32 z = stbi__get16be(s); + return (z << 16) + stbi__get16be(s); +} + +#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) +// nothing +#else +static int stbi__get16le(stbi__context *s) +{ + int z = stbi__get8(s); + return z + (stbi__get8(s) << 8); +} +#endif + +#ifndef STBI_NO_BMP +static stbi__uint32 stbi__get32le(stbi__context *s) +{ + stbi__uint32 z = stbi__get16le(s); + return z + (stbi__get16le(s) << 16); +} +#endif + +#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings + + +////////////////////////////////////////////////////////////////////////////// +// +// generic converter from built-in img_n to req_comp +// individual types do this automatically as much as possible (e.g. jpeg +// does all cases internally since it needs to colorspace convert anyway, +// and it never has alpha, so very few cases ). png can automatically +// interleave an alpha=255 channel, but falls back to this for other cases +// +// assume data buffer is malloced, so malloc a new one and free that one +// only failure mode is malloc failing + +static stbi_uc stbi__compute_y(int r, int g, int b) +{ + return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8); +} + +static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) +{ + int i,j; + unsigned char *good; + + if (req_comp == img_n) return data; + STBI_ASSERT(req_comp >= 1 && req_comp <= 4); + + good = (unsigned char *) stbi__malloc(req_comp * x * y); + if (good == NULL) { + STBI_FREE(data); + return stbi__errpuc("outofmem", "Out of memory"); + } + + for (j=0; j < (int) y; ++j) { + unsigned char *src = data + j * x * img_n ; + unsigned char *dest = good + j * x * req_comp; + + #define COMBO(a,b) ((a)*8+(b)) + #define CASE(a,b) case COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) + // convert source image with img_n components to one with req_comp components; + // avoid switch per pixel, so use switch per scanline and massive macros + switch (COMBO(img_n, req_comp)) { + CASE(1,2) dest[0]=src[0], dest[1]=255; break; + CASE(1,3) dest[0]=dest[1]=dest[2]=src[0]; break; + CASE(1,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=255; break; + CASE(2,1) dest[0]=src[0]; break; + CASE(2,3) dest[0]=dest[1]=dest[2]=src[0]; break; + CASE(2,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1]; break; + CASE(3,4) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255; break; + CASE(3,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break; + CASE(3,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = 255; break; + CASE(4,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break; + CASE(4,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = src[3]; break; + CASE(4,3) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2]; break; + default: STBI_ASSERT(0); + } + #undef CASE + } + + STBI_FREE(data); + return good; +} + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) +{ + int i,k,n; + float *output = (float *) stbi__malloc(x * y * comp * sizeof(float)); + if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale); + } + if (k < comp) output[i*comp + k] = data[i*comp+k]/255.0f; + } + STBI_FREE(data); + return output; +} +#endif + +#ifndef STBI_NO_HDR +#define stbi__float2int(x) ((int) (x)) +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp) +{ + int i,k,n; + stbi_uc *output = (stbi_uc *) stbi__malloc(x * y * comp); + if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + if (k < comp) { + float z = data[i*comp+k] * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + } + STBI_FREE(data); + return output; +} +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// "baseline" JPEG/JFIF decoder +// +// simple implementation +// - doesn't support delayed output of y-dimension +// - simple interface (only one output format: 8-bit interleaved RGB) +// - doesn't try to recover corrupt jpegs +// - doesn't allow partial loading, loading multiple at once +// - still fast on x86 (copying globals into locals doesn't help x86) +// - allocates lots of intermediate memory (full size of all components) +// - non-interleaved case requires this anyway +// - allows good upsampling (see next) +// high-quality +// - upsampled channels are bilinearly interpolated, even across blocks +// - quality integer IDCT derived from IJG's 'slow' +// performance +// - fast huffman; reasonable integer IDCT +// - some SIMD kernels for common paths on targets with SSE2/NEON +// - uses a lot of intermediate memory, could cache poorly + +#ifndef STBI_NO_JPEG + +// huffman decoding acceleration +#define FAST_BITS 9 // larger handles more cases; smaller stomps less cache + +typedef struct +{ + stbi_uc fast[1 << FAST_BITS]; + // weirdly, repacking this into AoS is a 10% speed loss, instead of a win + stbi__uint16 code[256]; + stbi_uc values[256]; + stbi_uc size[257]; + unsigned int maxcode[18]; + int delta[17]; // old 'firstsymbol' - old 'firstcode' +} stbi__huffman; + +typedef struct +{ + stbi__context *s; + stbi__huffman huff_dc[4]; + stbi__huffman huff_ac[4]; + stbi_uc dequant[4][64]; + stbi__int16 fast_ac[4][1 << FAST_BITS]; + +// sizes for components, interleaved MCUs + int img_h_max, img_v_max; + int img_mcu_x, img_mcu_y; + int img_mcu_w, img_mcu_h; + +// definition of jpeg image component + struct + { + int id; + int h,v; + int tq; + int hd,ha; + int dc_pred; + + int x,y,w2,h2; + stbi_uc *data; + void *raw_data, *raw_coeff; + stbi_uc *linebuf; + short *coeff; // progressive only + int coeff_w, coeff_h; // number of 8x8 coefficient blocks + } img_comp[4]; + + stbi__uint32 code_buffer; // jpeg entropy-coded buffer + int code_bits; // number of valid bits + unsigned char marker; // marker seen while filling entropy buffer + int nomore; // flag if we saw a marker so must stop + + int progressive; + int spec_start; + int spec_end; + int succ_high; + int succ_low; + int eob_run; + int rgb; + + int scan_n, order[4]; + int restart_interval, todo; + +// kernels + void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]); + void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step); + stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs); +} stbi__jpeg; + +static int stbi__build_huffman(stbi__huffman *h, int *count) +{ + int i,j,k=0,code; + // build size list for each symbol (from JPEG spec) + for (i=0; i < 16; ++i) + for (j=0; j < count[i]; ++j) + h->size[k++] = (stbi_uc) (i+1); + h->size[k] = 0; + + // compute actual symbols (from jpeg spec) + code = 0; + k = 0; + for(j=1; j <= 16; ++j) { + // compute delta to add to code to compute symbol id + h->delta[j] = k - code; + if (h->size[k] == j) { + while (h->size[k] == j) + h->code[k++] = (stbi__uint16) (code++); + if (code-1 >= (1 << j)) return stbi__err("bad code lengths","Corrupt JPEG"); + } + // compute largest code + 1 for this size, preshifted as needed later + h->maxcode[j] = code << (16-j); + code <<= 1; + } + h->maxcode[j] = 0xffffffff; + + // build non-spec acceleration table; 255 is flag for not-accelerated + memset(h->fast, 255, 1 << FAST_BITS); + for (i=0; i < k; ++i) { + int s = h->size[i]; + if (s <= FAST_BITS) { + int c = h->code[i] << (FAST_BITS-s); + int m = 1 << (FAST_BITS-s); + for (j=0; j < m; ++j) { + h->fast[c+j] = (stbi_uc) i; + } + } + } + return 1; +} + +// build a table that decodes both magnitude and value of small ACs in +// one go. +static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h) +{ + int i; + for (i=0; i < (1 << FAST_BITS); ++i) { + stbi_uc fast = h->fast[i]; + fast_ac[i] = 0; + if (fast < 255) { + int rs = h->values[fast]; + int run = (rs >> 4) & 15; + int magbits = rs & 15; + int len = h->size[fast]; + + if (magbits && len + magbits <= FAST_BITS) { + // magnitude code followed by receive_extend code + int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits); + int m = 1 << (magbits - 1); + if (k < m) k += (-1 << magbits) + 1; + // if the result is small enough, we can fit it in fast_ac table + if (k >= -128 && k <= 127) + fast_ac[i] = (stbi__int16) ((k << 8) + (run << 4) + (len + magbits)); + } + } + } +} + +static void stbi__grow_buffer_unsafe(stbi__jpeg *j) +{ + do { + int b = j->nomore ? 0 : stbi__get8(j->s); + if (b == 0xff) { + int c = stbi__get8(j->s); + if (c != 0) { + j->marker = (unsigned char) c; + j->nomore = 1; + return; + } + } + j->code_buffer |= b << (24 - j->code_bits); + j->code_bits += 8; + } while (j->code_bits <= 24); +} + +// (1 << n) - 1 +static stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535}; + +// decode a jpeg huffman value from the bitstream +stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) +{ + unsigned int temp; + int c,k; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + // look at the top FAST_BITS and determine what symbol ID it is, + // if the code is <= FAST_BITS + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + k = h->fast[c]; + if (k < 255) { + int s = h->size[k]; + if (s > j->code_bits) + return -1; + j->code_buffer <<= s; + j->code_bits -= s; + return h->values[k]; + } + + // naive test is to shift the code_buffer down so k bits are + // valid, then test against maxcode. To speed this up, we've + // preshifted maxcode left so that it has (16-k) 0s at the + // end; in other words, regardless of the number of bits, it + // wants to be compared against something shifted to have 16; + // that way we don't need to shift inside the loop. + temp = j->code_buffer >> 16; + for (k=FAST_BITS+1 ; ; ++k) + if (temp < h->maxcode[k]) + break; + if (k == 17) { + // error! code not found + j->code_bits -= 16; + return -1; + } + + if (k > j->code_bits) + return -1; + + // convert the huffman code to the symbol id + c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; + STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); + + // convert the id to a symbol + j->code_bits -= k; + j->code_buffer <<= k; + return h->values[c]; +} + +// bias[n] = (-1<code_bits < n) stbi__grow_buffer_unsafe(j); + + sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB + k = stbi_lrot(j->code_buffer, n); + STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask))); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k + (stbi__jbias[n] & ~sgn); +} + +// get some unsigned bits +stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) +{ + unsigned int k; + if (j->code_bits < n) stbi__grow_buffer_unsafe(j); + k = stbi_lrot(j->code_buffer, n); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k; +} + +stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) +{ + unsigned int k; + if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); + k = j->code_buffer; + j->code_buffer <<= 1; + --j->code_bits; + return k & 0x80000000; +} + +// given a value that's at position X in the zigzag stream, +// where does it appear in the 8x8 matrix coded as row-major? +static stbi_uc stbi__jpeg_dezigzag[64+15] = +{ + 0, 1, 8, 16, 9, 2, 3, 10, + 17, 24, 32, 25, 18, 11, 4, 5, + 12, 19, 26, 33, 40, 48, 41, 34, + 27, 20, 13, 6, 7, 14, 21, 28, + 35, 42, 49, 56, 57, 50, 43, 36, + 29, 22, 15, 23, 30, 37, 44, 51, + 58, 59, 52, 45, 38, 31, 39, 46, + 53, 60, 61, 54, 47, 55, 62, 63, + // let corrupt input sample past end + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63 +}; + +// decode one 64-entry block-- +static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi_uc *dequant) +{ + int diff,dc,k; + int t; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + t = stbi__jpeg_huff_decode(j, hdc); + if (t < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + + // 0 all the ac values now so we can do it 32-bits at a time + memset(data,0,64*sizeof(data[0])); + + diff = t ? stbi__extend_receive(j, t) : 0; + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + data[0] = (short) (dc * dequant[0]); + + // decode AC components, see JPEG spec + k = 1; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + j->code_buffer <<= s; + j->code_bits -= s; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) * dequant[zig]); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (rs != 0xf0) break; // end block + k += 16; + } else { + k += r; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]); + } + } + } while (k < 64); + return 1; +} + +static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b) +{ + int diff,dc; + int t; + if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + if (j->succ_high == 0) { + // first scan for DC coefficient, must be first + memset(data,0,64*sizeof(data[0])); // 0 all the ac values now + t = stbi__jpeg_huff_decode(j, hdc); + diff = t ? stbi__extend_receive(j, t) : 0; + + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + data[0] = (short) (dc << j->succ_low); + } else { + // refinement scan for DC coefficient + if (stbi__jpeg_get_bit(j)) + data[0] += (short) (1 << j->succ_low); + } + return 1; +} + +// @OPTIMIZE: store non-zigzagged during the decode passes, +// and only de-zigzag when dequantizing +static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac) +{ + int k; + if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->succ_high == 0) { + int shift = j->succ_low; + + if (j->eob_run) { + --j->eob_run; + return 1; + } + + k = j->spec_start; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + j->code_buffer <<= s; + j->code_bits -= s; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) << shift); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r); + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + --j->eob_run; + break; + } + k += 16; + } else { + k += r; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) << shift); + } + } + } while (k <= j->spec_end); + } else { + // refinement scan for these AC coefficients + + short bit = (short) (1 << j->succ_low); + + if (j->eob_run) { + --j->eob_run; + for (k = j->spec_start; k <= j->spec_end; ++k) { + short *p = &data[stbi__jpeg_dezigzag[k]]; + if (*p != 0) + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } + } else { + k = j->spec_start; + do { + int r,s; + int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r) - 1; + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + r = 64; // force end of block + } else { + // r=15 s=0 should write 16 0s, so we just do + // a run of 15 0s and then write s (which is 0), + // so we don't have to do anything special here + } + } else { + if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG"); + // sign bit + if (stbi__jpeg_get_bit(j)) + s = bit; + else + s = -bit; + } + + // advance by r + while (k <= j->spec_end) { + short *p = &data[stbi__jpeg_dezigzag[k++]]; + if (*p != 0) { + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } else { + if (r == 0) { + *p = (short) s; + break; + } + --r; + } + } + } while (k <= j->spec_end); + } + } + return 1; +} + +// take a -128..127 value and stbi__clamp it and convert to 0..255 +stbi_inline static stbi_uc stbi__clamp(int x) +{ + // trick to use a single test to catch both cases + if ((unsigned int) x > 255) { + if (x < 0) return 0; + if (x > 255) return 255; + } + return (stbi_uc) x; +} + +#define stbi__f2f(x) ((int) (((x) * 4096 + 0.5))) +#define stbi__fsh(x) ((x) << 12) + +// derived from jidctint -- DCT_ISLOW +#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \ + int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \ + p2 = s2; \ + p3 = s6; \ + p1 = (p2+p3) * stbi__f2f(0.5411961f); \ + t2 = p1 + p3*stbi__f2f(-1.847759065f); \ + t3 = p1 + p2*stbi__f2f( 0.765366865f); \ + p2 = s0; \ + p3 = s4; \ + t0 = stbi__fsh(p2+p3); \ + t1 = stbi__fsh(p2-p3); \ + x0 = t0+t3; \ + x3 = t0-t3; \ + x1 = t1+t2; \ + x2 = t1-t2; \ + t0 = s7; \ + t1 = s5; \ + t2 = s3; \ + t3 = s1; \ + p3 = t0+t2; \ + p4 = t1+t3; \ + p1 = t0+t3; \ + p2 = t1+t2; \ + p5 = (p3+p4)*stbi__f2f( 1.175875602f); \ + t0 = t0*stbi__f2f( 0.298631336f); \ + t1 = t1*stbi__f2f( 2.053119869f); \ + t2 = t2*stbi__f2f( 3.072711026f); \ + t3 = t3*stbi__f2f( 1.501321110f); \ + p1 = p5 + p1*stbi__f2f(-0.899976223f); \ + p2 = p5 + p2*stbi__f2f(-2.562915447f); \ + p3 = p3*stbi__f2f(-1.961570560f); \ + p4 = p4*stbi__f2f(-0.390180644f); \ + t3 += p1+p4; \ + t2 += p2+p3; \ + t1 += p2+p4; \ + t0 += p1+p3; + +static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64]) +{ + int i,val[64],*v=val; + stbi_uc *o; + short *d = data; + + // columns + for (i=0; i < 8; ++i,++d, ++v) { + // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing + if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0 + && d[40]==0 && d[48]==0 && d[56]==0) { + // no shortcut 0 seconds + // (1|2|3|4|5|6|7)==0 0 seconds + // all separate -0.047 seconds + // 1 && 2|3 && 4|5 && 6|7: -0.047 seconds + int dcterm = d[0] << 2; + v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm; + } else { + STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56]) + // constants scaled things up by 1<<12; let's bring them back + // down, but keep 2 extra bits of precision + x0 += 512; x1 += 512; x2 += 512; x3 += 512; + v[ 0] = (x0+t3) >> 10; + v[56] = (x0-t3) >> 10; + v[ 8] = (x1+t2) >> 10; + v[48] = (x1-t2) >> 10; + v[16] = (x2+t1) >> 10; + v[40] = (x2-t1) >> 10; + v[24] = (x3+t0) >> 10; + v[32] = (x3-t0) >> 10; + } + } + + for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) { + // no fast case since the first 1D IDCT spread components out + STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7]) + // constants scaled things up by 1<<12, plus we had 1<<2 from first + // loop, plus horizontal and vertical each scale by sqrt(8) so together + // we've got an extra 1<<3, so 1<<17 total we need to remove. + // so we want to round that, which means adding 0.5 * 1<<17, + // aka 65536. Also, we'll end up with -128 to 127 that we want + // to encode as 0..255 by adding 128, so we'll add that before the shift + x0 += 65536 + (128<<17); + x1 += 65536 + (128<<17); + x2 += 65536 + (128<<17); + x3 += 65536 + (128<<17); + // tried computing the shifts into temps, or'ing the temps to see + // if any were out of range, but that was slower + o[0] = stbi__clamp((x0+t3) >> 17); + o[7] = stbi__clamp((x0-t3) >> 17); + o[1] = stbi__clamp((x1+t2) >> 17); + o[6] = stbi__clamp((x1-t2) >> 17); + o[2] = stbi__clamp((x2+t1) >> 17); + o[5] = stbi__clamp((x2-t1) >> 17); + o[3] = stbi__clamp((x3+t0) >> 17); + o[4] = stbi__clamp((x3-t0) >> 17); + } +} + +#ifdef STBI_SSE2 +// sse2 integer IDCT. not the fastest possible implementation but it +// produces bit-identical results to the generic C version so it's +// fully "transparent". +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + // This is constructed to match our regular (generic) integer IDCT exactly. + __m128i row0, row1, row2, row3, row4, row5, row6, row7; + __m128i tmp; + + // dot product constant: even elems=x, odd elems=y + #define dct_const(x,y) _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y)) + + // out(0) = c0[even]*x + c0[odd]*y (c0, x, y 16-bit, out 32-bit) + // out(1) = c1[even]*x + c1[odd]*y + #define dct_rot(out0,out1, x,y,c0,c1) \ + __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \ + __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \ + __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \ + __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \ + __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \ + __m128i out1##_h = _mm_madd_epi16(c0##hi, c1) + + // out = in << 12 (in 16-bit, out 32-bit) + #define dct_widen(out, in) \ + __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \ + __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4) + + // wide add + #define dct_wadd(out, a, b) \ + __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_add_epi32(a##_h, b##_h) + + // wide sub + #define dct_wsub(out, a, b) \ + __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_sub_epi32(a##_h, b##_h) + + // butterfly a/b, add bias, then shift by "s" and pack + #define dct_bfly32o(out0, out1, a,b,bias,s) \ + { \ + __m128i abiased_l = _mm_add_epi32(a##_l, bias); \ + __m128i abiased_h = _mm_add_epi32(a##_h, bias); \ + dct_wadd(sum, abiased, b); \ + dct_wsub(dif, abiased, b); \ + out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \ + out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \ + } + + // 8-bit interleave step (for transposes) + #define dct_interleave8(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi8(a, b); \ + b = _mm_unpackhi_epi8(tmp, b) + + // 16-bit interleave step (for transposes) + #define dct_interleave16(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi16(a, b); \ + b = _mm_unpackhi_epi16(tmp, b) + + #define dct_pass(bias,shift) \ + { \ + /* even part */ \ + dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \ + __m128i sum04 = _mm_add_epi16(row0, row4); \ + __m128i dif04 = _mm_sub_epi16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \ + dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \ + __m128i sum17 = _mm_add_epi16(row1, row7); \ + __m128i sum35 = _mm_add_epi16(row3, row5); \ + dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \ + dct_wadd(x4, y0o, y4o); \ + dct_wadd(x5, y1o, y5o); \ + dct_wadd(x6, y2o, y5o); \ + dct_wadd(x7, y3o, y4o); \ + dct_bfly32o(row0,row7, x0,x7,bias,shift); \ + dct_bfly32o(row1,row6, x1,x6,bias,shift); \ + dct_bfly32o(row2,row5, x2,x5,bias,shift); \ + dct_bfly32o(row3,row4, x3,x4,bias,shift); \ + } + + __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f)); + __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f)); + __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f)); + __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f)); + __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f)); + __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f)); + __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f)); + __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f)); + + // rounding biases in column/row passes, see stbi__idct_block for explanation. + __m128i bias_0 = _mm_set1_epi32(512); + __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17)); + + // load + row0 = _mm_load_si128((const __m128i *) (data + 0*8)); + row1 = _mm_load_si128((const __m128i *) (data + 1*8)); + row2 = _mm_load_si128((const __m128i *) (data + 2*8)); + row3 = _mm_load_si128((const __m128i *) (data + 3*8)); + row4 = _mm_load_si128((const __m128i *) (data + 4*8)); + row5 = _mm_load_si128((const __m128i *) (data + 5*8)); + row6 = _mm_load_si128((const __m128i *) (data + 6*8)); + row7 = _mm_load_si128((const __m128i *) (data + 7*8)); + + // column pass + dct_pass(bias_0, 10); + + { + // 16bit 8x8 transpose pass 1 + dct_interleave16(row0, row4); + dct_interleave16(row1, row5); + dct_interleave16(row2, row6); + dct_interleave16(row3, row7); + + // transpose pass 2 + dct_interleave16(row0, row2); + dct_interleave16(row1, row3); + dct_interleave16(row4, row6); + dct_interleave16(row5, row7); + + // transpose pass 3 + dct_interleave16(row0, row1); + dct_interleave16(row2, row3); + dct_interleave16(row4, row5); + dct_interleave16(row6, row7); + } + + // row pass + dct_pass(bias_1, 17); + + { + // pack + __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7 + __m128i p1 = _mm_packus_epi16(row2, row3); + __m128i p2 = _mm_packus_epi16(row4, row5); + __m128i p3 = _mm_packus_epi16(row6, row7); + + // 8bit 8x8 transpose pass 1 + dct_interleave8(p0, p2); // a0e0a1e1... + dct_interleave8(p1, p3); // c0g0c1g1... + + // transpose pass 2 + dct_interleave8(p0, p1); // a0c0e0g0... + dct_interleave8(p2, p3); // b0d0f0h0... + + // transpose pass 3 + dct_interleave8(p0, p2); // a0b0c0d0... + dct_interleave8(p1, p3); // a4b4c4d4... + + // store + _mm_storel_epi64((__m128i *) out, p0); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p2); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p1); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p3); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e)); + } + +#undef dct_const +#undef dct_rot +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_interleave8 +#undef dct_interleave16 +#undef dct_pass +} + +#endif // STBI_SSE2 + +#ifdef STBI_NEON + +// NEON integer IDCT. should produce bit-identical +// results to the generic C version. +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + int16x8_t row0, row1, row2, row3, row4, row5, row6, row7; + + int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f)); + int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f)); + int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f)); + int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f)); + int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f)); + int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f)); + int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f)); + int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f)); + int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f)); + int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f)); + int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f)); + int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f)); + +#define dct_long_mul(out, inq, coeff) \ + int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff) + +#define dct_long_mac(out, acc, inq, coeff) \ + int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff) + +#define dct_widen(out, inq) \ + int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \ + int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12) + +// wide add +#define dct_wadd(out, a, b) \ + int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vaddq_s32(a##_h, b##_h) + +// wide sub +#define dct_wsub(out, a, b) \ + int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vsubq_s32(a##_h, b##_h) + +// butterfly a/b, then shift using "shiftop" by "s" and pack +#define dct_bfly32o(out0,out1, a,b,shiftop,s) \ + { \ + dct_wadd(sum, a, b); \ + dct_wsub(dif, a, b); \ + out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \ + out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \ + } + +#define dct_pass(shiftop, shift) \ + { \ + /* even part */ \ + int16x8_t sum26 = vaddq_s16(row2, row6); \ + dct_long_mul(p1e, sum26, rot0_0); \ + dct_long_mac(t2e, p1e, row6, rot0_1); \ + dct_long_mac(t3e, p1e, row2, rot0_2); \ + int16x8_t sum04 = vaddq_s16(row0, row4); \ + int16x8_t dif04 = vsubq_s16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + int16x8_t sum15 = vaddq_s16(row1, row5); \ + int16x8_t sum17 = vaddq_s16(row1, row7); \ + int16x8_t sum35 = vaddq_s16(row3, row5); \ + int16x8_t sum37 = vaddq_s16(row3, row7); \ + int16x8_t sumodd = vaddq_s16(sum17, sum35); \ + dct_long_mul(p5o, sumodd, rot1_0); \ + dct_long_mac(p1o, p5o, sum17, rot1_1); \ + dct_long_mac(p2o, p5o, sum35, rot1_2); \ + dct_long_mul(p3o, sum37, rot2_0); \ + dct_long_mul(p4o, sum15, rot2_1); \ + dct_wadd(sump13o, p1o, p3o); \ + dct_wadd(sump24o, p2o, p4o); \ + dct_wadd(sump23o, p2o, p3o); \ + dct_wadd(sump14o, p1o, p4o); \ + dct_long_mac(x4, sump13o, row7, rot3_0); \ + dct_long_mac(x5, sump24o, row5, rot3_1); \ + dct_long_mac(x6, sump23o, row3, rot3_2); \ + dct_long_mac(x7, sump14o, row1, rot3_3); \ + dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \ + dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \ + dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \ + dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \ + } + + // load + row0 = vld1q_s16(data + 0*8); + row1 = vld1q_s16(data + 1*8); + row2 = vld1q_s16(data + 2*8); + row3 = vld1q_s16(data + 3*8); + row4 = vld1q_s16(data + 4*8); + row5 = vld1q_s16(data + 5*8); + row6 = vld1q_s16(data + 6*8); + row7 = vld1q_s16(data + 7*8); + + // add DC bias + row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0)); + + // column pass + dct_pass(vrshrn_n_s32, 10); + + // 16bit 8x8 transpose + { +// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively. +// whether compilers actually get this is another story, sadly. +#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); } +#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); } + + // pass 1 + dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6 + dct_trn16(row2, row3); + dct_trn16(row4, row5); + dct_trn16(row6, row7); + + // pass 2 + dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4 + dct_trn32(row1, row3); + dct_trn32(row4, row6); + dct_trn32(row5, row7); + + // pass 3 + dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0 + dct_trn64(row1, row5); + dct_trn64(row2, row6); + dct_trn64(row3, row7); + +#undef dct_trn16 +#undef dct_trn32 +#undef dct_trn64 + } + + // row pass + // vrshrn_n_s32 only supports shifts up to 16, we need + // 17. so do a non-rounding shift of 16 first then follow + // up with a rounding shift by 1. + dct_pass(vshrn_n_s32, 16); + + { + // pack and round + uint8x8_t p0 = vqrshrun_n_s16(row0, 1); + uint8x8_t p1 = vqrshrun_n_s16(row1, 1); + uint8x8_t p2 = vqrshrun_n_s16(row2, 1); + uint8x8_t p3 = vqrshrun_n_s16(row3, 1); + uint8x8_t p4 = vqrshrun_n_s16(row4, 1); + uint8x8_t p5 = vqrshrun_n_s16(row5, 1); + uint8x8_t p6 = vqrshrun_n_s16(row6, 1); + uint8x8_t p7 = vqrshrun_n_s16(row7, 1); + + // again, these can translate into one instruction, but often don't. +#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); } +#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); } + + // sadly can't use interleaved stores here since we only write + // 8 bytes to each scan line! + + // 8x8 8-bit transpose pass 1 + dct_trn8_8(p0, p1); + dct_trn8_8(p2, p3); + dct_trn8_8(p4, p5); + dct_trn8_8(p6, p7); + + // pass 2 + dct_trn8_16(p0, p2); + dct_trn8_16(p1, p3); + dct_trn8_16(p4, p6); + dct_trn8_16(p5, p7); + + // pass 3 + dct_trn8_32(p0, p4); + dct_trn8_32(p1, p5); + dct_trn8_32(p2, p6); + dct_trn8_32(p3, p7); + + // store + vst1_u8(out, p0); out += out_stride; + vst1_u8(out, p1); out += out_stride; + vst1_u8(out, p2); out += out_stride; + vst1_u8(out, p3); out += out_stride; + vst1_u8(out, p4); out += out_stride; + vst1_u8(out, p5); out += out_stride; + vst1_u8(out, p6); out += out_stride; + vst1_u8(out, p7); + +#undef dct_trn8_8 +#undef dct_trn8_16 +#undef dct_trn8_32 + } + +#undef dct_long_mul +#undef dct_long_mac +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_pass +} + +#endif // STBI_NEON + +#define STBI__MARKER_none 0xff +// if there's a pending marker from the entropy stream, return that +// otherwise, fetch from the stream and get a marker. if there's no +// marker, return 0xff, which is never a valid marker value +static stbi_uc stbi__get_marker(stbi__jpeg *j) +{ + stbi_uc x; + if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; } + x = stbi__get8(j->s); + if (x != 0xff) return STBI__MARKER_none; + while (x == 0xff) + x = stbi__get8(j->s); + return x; +} + +// in each scan, we'll have scan_n components, and the order +// of the components is specified by order[] +#define STBI__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) + +// after a restart interval, stbi__jpeg_reset the entropy decoder and +// the dc prediction +static void stbi__jpeg_reset(stbi__jpeg *j) +{ + j->code_bits = 0; + j->code_buffer = 0; + j->nomore = 0; + j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = 0; + j->marker = STBI__MARKER_none; + j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff; + j->eob_run = 0; + // no more than 1<<31 MCUs if no restart_interal? that's plenty safe, + // since we don't even allow 1<<30 pixels +} + +static int stbi__parse_entropy_coded_data(stbi__jpeg *z) +{ + stbi__jpeg_reset(z); + if (!z->progressive) { + if (z->scan_n == 1) { + int i,j; + STBI_SIMD_ALIGN(short, data[64]); + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + // if it's NOT a restart, then just bail, so we get corrupt data + // rather than no data + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + STBI_SIMD_ALIGN(short, data[64]); + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x)*8; + int y2 = (j*z->img_comp[n].v + y)*8; + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data); + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } else { + if (z->scan_n == 1) { + int i,j; + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + if (z->spec_start == 0) { + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } else { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha])) + return 0; + } + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x); + int y2 = (j*z->img_comp[n].v + y); + short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w); + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } +} + +static void stbi__jpeg_dequantize(short *data, stbi_uc *dequant) +{ + int i; + for (i=0; i < 64; ++i) + data[i] *= dequant[i]; +} + +static void stbi__jpeg_finish(stbi__jpeg *z) +{ + if (z->progressive) { + // dequantize and idct the data + int i,j,n; + for (n=0; n < z->s->img_n; ++n) { + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]); + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + } + } + } + } +} + +static int stbi__process_marker(stbi__jpeg *z, int m) +{ + int L; + switch (m) { + case STBI__MARKER_none: // no marker found + return stbi__err("expected marker","Corrupt JPEG"); + + case 0xDD: // DRI - specify restart interval + if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG"); + z->restart_interval = stbi__get16be(z->s); + return 1; + + case 0xDB: // DQT - define quantization table + L = stbi__get16be(z->s)-2; + while (L > 0) { + int q = stbi__get8(z->s); + int p = q >> 4; + int t = q & 15,i; + if (p != 0) return stbi__err("bad DQT type","Corrupt JPEG"); + if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); + for (i=0; i < 64; ++i) + z->dequant[t][stbi__jpeg_dezigzag[i]] = stbi__get8(z->s); + L -= 65; + } + return L==0; + + case 0xC4: // DHT - define huffman table + L = stbi__get16be(z->s)-2; + while (L > 0) { + stbi_uc *v; + int sizes[16],i,n=0; + int q = stbi__get8(z->s); + int tc = q >> 4; + int th = q & 15; + if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG"); + for (i=0; i < 16; ++i) { + sizes[i] = stbi__get8(z->s); + n += sizes[i]; + } + L -= 17; + if (tc == 0) { + if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; + v = z->huff_dc[th].values; + } else { + if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0; + v = z->huff_ac[th].values; + } + for (i=0; i < n; ++i) + v[i] = stbi__get8(z->s); + if (tc != 0) + stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th); + L -= n; + } + return L==0; + } + // check for comment block or APP blocks + if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) { + stbi__skip(z->s, stbi__get16be(z->s)-2); + return 1; + } + return 0; +} + +// after we see SOS +static int stbi__process_scan_header(stbi__jpeg *z) +{ + int i; + int Ls = stbi__get16be(z->s); + z->scan_n = stbi__get8(z->s); + if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG"); + if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG"); + for (i=0; i < z->scan_n; ++i) { + int id = stbi__get8(z->s), which; + int q = stbi__get8(z->s); + for (which = 0; which < z->s->img_n; ++which) + if (z->img_comp[which].id == id) + break; + if (which == z->s->img_n) return 0; // no match + z->img_comp[which].hd = q >> 4; if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG"); + z->img_comp[which].ha = q & 15; if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG"); + z->order[i] = which; + } + + { + int aa; + z->spec_start = stbi__get8(z->s); + z->spec_end = stbi__get8(z->s); // should be 63, but might be 0 + aa = stbi__get8(z->s); + z->succ_high = (aa >> 4); + z->succ_low = (aa & 15); + if (z->progressive) { + if (z->spec_start > 63 || z->spec_end > 63 || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13) + return stbi__err("bad SOS", "Corrupt JPEG"); + } else { + if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG"); + if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG"); + z->spec_end = 63; + } + } + + return 1; +} + +static int stbi__process_frame_header(stbi__jpeg *z, int scan) +{ + stbi__context *s = z->s; + int Lf,p,i,q, h_max=1,v_max=1,c; + Lf = stbi__get16be(s); if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG + p = stbi__get8(s); if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline + s->img_y = stbi__get16be(s); if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG + s->img_x = stbi__get16be(s); if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires + c = stbi__get8(s); + if (c != 3 && c != 1) return stbi__err("bad component count","Corrupt JPEG"); // JFIF requires + s->img_n = c; + for (i=0; i < c; ++i) { + z->img_comp[i].data = NULL; + z->img_comp[i].linebuf = NULL; + } + + if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG"); + + z->rgb = 0; + for (i=0; i < s->img_n; ++i) { + static unsigned char rgb[3] = { 'R', 'G', 'B' }; + z->img_comp[i].id = stbi__get8(s); + if (z->img_comp[i].id != i+1) // JFIF requires + if (z->img_comp[i].id != i) { // some version of jpegtran outputs non-JFIF-compliant files! + // somethings output this (see http://fileformats.archiveteam.org/wiki/JPEG#Color_format) + if (z->img_comp[i].id != rgb[i]) + return stbi__err("bad component ID","Corrupt JPEG"); + ++z->rgb; + } + q = stbi__get8(s); + z->img_comp[i].h = (q >> 4); if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG"); + z->img_comp[i].v = q & 15; if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG"); + z->img_comp[i].tq = stbi__get8(s); if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG"); + } + + if (scan != STBI__SCAN_load) return 1; + + if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); + + for (i=0; i < s->img_n; ++i) { + if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h; + if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v; + } + + // compute interleaved mcu info + z->img_h_max = h_max; + z->img_v_max = v_max; + z->img_mcu_w = h_max * 8; + z->img_mcu_h = v_max * 8; + z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w; + z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h; + + for (i=0; i < s->img_n; ++i) { + // number of effective pixels (e.g. for non-interleaved MCU) + z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max; + z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max; + // to simplify generation, we'll allocate enough memory to decode + // the bogus oversized data from using interleaved MCUs and their + // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't + // discard the extra data until colorspace conversion + z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8; + z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8; + z->img_comp[i].raw_data = stbi__malloc(z->img_comp[i].w2 * z->img_comp[i].h2+15); + + if (z->img_comp[i].raw_data == NULL) { + for(--i; i >= 0; --i) { + STBI_FREE(z->img_comp[i].raw_data); + z->img_comp[i].raw_data = NULL; + } + return stbi__err("outofmem", "Out of memory"); + } + // align blocks for idct using mmx/sse + z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15); + z->img_comp[i].linebuf = NULL; + if (z->progressive) { + z->img_comp[i].coeff_w = (z->img_comp[i].w2 + 7) >> 3; + z->img_comp[i].coeff_h = (z->img_comp[i].h2 + 7) >> 3; + z->img_comp[i].raw_coeff = STBI_MALLOC(z->img_comp[i].coeff_w * z->img_comp[i].coeff_h * 64 * sizeof(short) + 15); + z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); + } else { + z->img_comp[i].coeff = 0; + z->img_comp[i].raw_coeff = 0; + } + } + + return 1; +} + +// use comparisons since in some cases we handle more than one case (e.g. SOF) +#define stbi__DNL(x) ((x) == 0xdc) +#define stbi__SOI(x) ((x) == 0xd8) +#define stbi__EOI(x) ((x) == 0xd9) +#define stbi__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) +#define stbi__SOS(x) ((x) == 0xda) + +#define stbi__SOF_progressive(x) ((x) == 0xc2) + +static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) +{ + int m; + z->marker = STBI__MARKER_none; // initialize cached marker to empty + m = stbi__get_marker(z); + if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG"); + if (scan == STBI__SCAN_type) return 1; + m = stbi__get_marker(z); + while (!stbi__SOF(m)) { + if (!stbi__process_marker(z,m)) return 0; + m = stbi__get_marker(z); + while (m == STBI__MARKER_none) { + // some files have extra padding after their blocks, so ok, we'll scan + if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG"); + m = stbi__get_marker(z); + } + } + z->progressive = stbi__SOF_progressive(m); + if (!stbi__process_frame_header(z, scan)) return 0; + return 1; +} + +// decode image to YCbCr format +static int stbi__decode_jpeg_image(stbi__jpeg *j) +{ + int m; + for (m = 0; m < 4; m++) { + j->img_comp[m].raw_data = NULL; + j->img_comp[m].raw_coeff = NULL; + } + j->restart_interval = 0; + if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0; + m = stbi__get_marker(j); + while (!stbi__EOI(m)) { + if (stbi__SOS(m)) { + if (!stbi__process_scan_header(j)) return 0; + if (!stbi__parse_entropy_coded_data(j)) return 0; + if (j->marker == STBI__MARKER_none ) { + // handle 0s at the end of image data from IP Kamera 9060 + while (!stbi__at_eof(j->s)) { + int x = stbi__get8(j->s); + if (x == 255) { + j->marker = stbi__get8(j->s); + break; + } else if (x != 0) { + return stbi__err("junk before marker", "Corrupt JPEG"); + } + } + // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 + } + } else { + if (!stbi__process_marker(j, m)) return 0; + } + m = stbi__get_marker(j); + } + if (j->progressive) + stbi__jpeg_finish(j); + return 1; +} + +// static jfif-centered resampling (across block boundaries) + +typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1, + int w, int hs); + +#define stbi__div4(x) ((stbi_uc) ((x) >> 2)) + +static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + STBI_NOTUSED(out); + STBI_NOTUSED(in_far); + STBI_NOTUSED(w); + STBI_NOTUSED(hs); + return in_near; +} + +static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples vertically for every one in input + int i; + STBI_NOTUSED(hs); + for (i=0; i < w; ++i) + out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2); + return out; +} + +static stbi_uc* stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples horizontally for every one in input + int i; + stbi_uc *input = in_near; + + if (w == 1) { + // if only one sample, can't do any interpolation + out[0] = out[1] = input[0]; + return out; + } + + out[0] = input[0]; + out[1] = stbi__div4(input[0]*3 + input[1] + 2); + for (i=1; i < w-1; ++i) { + int n = 3*input[i]+2; + out[i*2+0] = stbi__div4(n+input[i-1]); + out[i*2+1] = stbi__div4(n+input[i+1]); + } + out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2); + out[i*2+1] = input[w-1]; + + STBI_NOTUSED(in_far); + STBI_NOTUSED(hs); + + return out; +} + +#define stbi__div16(x) ((stbi_uc) ((x) >> 4)) + +static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i,t0,t1; + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + out[0] = stbi__div4(t1+2); + for (i=1; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i=0,t0,t1; + + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + // process groups of 8 pixels for as long as we can. + // note we can't handle the last pixel in a row in this loop + // because we need to handle the filter boundary conditions. + for (; i < ((w-1) & ~7); i += 8) { +#if defined(STBI_SSE2) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + __m128i zero = _mm_setzero_si128(); + __m128i farb = _mm_loadl_epi64((__m128i *) (in_far + i)); + __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i)); + __m128i farw = _mm_unpacklo_epi8(farb, zero); + __m128i nearw = _mm_unpacklo_epi8(nearb, zero); + __m128i diff = _mm_sub_epi16(farw, nearw); + __m128i nears = _mm_slli_epi16(nearw, 2); + __m128i curr = _mm_add_epi16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + __m128i prv0 = _mm_slli_si128(curr, 2); + __m128i nxt0 = _mm_srli_si128(curr, 2); + __m128i prev = _mm_insert_epi16(prv0, t1, 0); + __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + __m128i bias = _mm_set1_epi16(8); + __m128i curs = _mm_slli_epi16(curr, 2); + __m128i prvd = _mm_sub_epi16(prev, curr); + __m128i nxtd = _mm_sub_epi16(next, curr); + __m128i curb = _mm_add_epi16(curs, bias); + __m128i even = _mm_add_epi16(prvd, curb); + __m128i odd = _mm_add_epi16(nxtd, curb); + + // interleave even and odd pixels, then undo scaling. + __m128i int0 = _mm_unpacklo_epi16(even, odd); + __m128i int1 = _mm_unpackhi_epi16(even, odd); + __m128i de0 = _mm_srli_epi16(int0, 4); + __m128i de1 = _mm_srli_epi16(int1, 4); + + // pack and write output + __m128i outv = _mm_packus_epi16(de0, de1); + _mm_storeu_si128((__m128i *) (out + i*2), outv); +#elif defined(STBI_NEON) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + uint8x8_t farb = vld1_u8(in_far + i); + uint8x8_t nearb = vld1_u8(in_near + i); + int16x8_t diff = vreinterpretq_s16_u16(vsubl_u8(farb, nearb)); + int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2)); + int16x8_t curr = vaddq_s16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + int16x8_t prv0 = vextq_s16(curr, curr, 7); + int16x8_t nxt0 = vextq_s16(curr, curr, 1); + int16x8_t prev = vsetq_lane_s16(t1, prv0, 0); + int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + int16x8_t curs = vshlq_n_s16(curr, 2); + int16x8_t prvd = vsubq_s16(prev, curr); + int16x8_t nxtd = vsubq_s16(next, curr); + int16x8_t even = vaddq_s16(curs, prvd); + int16x8_t odd = vaddq_s16(curs, nxtd); + + // undo scaling and round, then store with even/odd phases interleaved + uint8x8x2_t o; + o.val[0] = vqrshrun_n_s16(even, 4); + o.val[1] = vqrshrun_n_s16(odd, 4); + vst2_u8(out + i*2, o); +#endif + + // "previous" value for next iter + t1 = 3*in_near[i+7] + in_far[i+7]; + } + + t0 = t1; + t1 = 3*in_near[i] + in_far[i]; + out[i*2] = stbi__div16(3*t1 + t0 + 8); + + for (++i; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} +#endif + +static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // resample with nearest-neighbor + int i,j; + STBI_NOTUSED(in_far); + for (i=0; i < w; ++i) + for (j=0; j < hs; ++j) + out[i*hs+j] = in_near[i]; + return out; +} + +#ifdef STBI_JPEG_OLD +// this is the same YCbCr-to-RGB calculation that stb_image has used +// historically before the algorithm changes in 1.49 +#define float2fixed(x) ((int) ((x) * 65536 + 0.5)) +static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) +{ + int i; + for (i=0; i < count; ++i) { + int y_fixed = (y[i] << 16) + 32768; // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr*float2fixed(1.40200f); + g = y_fixed - cr*float2fixed(0.71414f) - cb*float2fixed(0.34414f); + b = y_fixed + cb*float2fixed(1.77200f); + r >>= 16; + g >>= 16; + b >>= 16; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#else +// this is a reduced-precision calculation of YCbCr-to-RGB introduced +// to make sure the code produces the same results in both SIMD and scalar +#define float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8) +static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) +{ + int i; + for (i=0; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* float2fixed(1.40200f); + g = y_fixed + (cr*-float2fixed(0.71414f)) + ((cb*-float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#endif + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step) +{ + int i = 0; + +#ifdef STBI_SSE2 + // step == 3 is pretty ugly on the final interleave, and i'm not convinced + // it's useful in practice (you wouldn't use it for textures, for example). + // so just accelerate step == 4 case. + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + __m128i signflip = _mm_set1_epi8(-0x80); + __m128i cr_const0 = _mm_set1_epi16( (short) ( 1.40200f*4096.0f+0.5f)); + __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f)); + __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f)); + __m128i cb_const1 = _mm_set1_epi16( (short) ( 1.77200f*4096.0f+0.5f)); + __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128); + __m128i xw = _mm_set1_epi16(255); // alpha channel + + for (; i+7 < count; i += 8) { + // load + __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i)); + __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i)); + __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i)); + __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128 + __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128 + + // unpack to short (and left-shift cr, cb by 8) + __m128i yw = _mm_unpacklo_epi8(y_bias, y_bytes); + __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased); + __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased); + + // color transform + __m128i yws = _mm_srli_epi16(yw, 4); + __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw); + __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw); + __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1); + __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1); + __m128i rws = _mm_add_epi16(cr0, yws); + __m128i gwt = _mm_add_epi16(cb0, yws); + __m128i bws = _mm_add_epi16(yws, cb1); + __m128i gws = _mm_add_epi16(gwt, cr1); + + // descale + __m128i rw = _mm_srai_epi16(rws, 4); + __m128i bw = _mm_srai_epi16(bws, 4); + __m128i gw = _mm_srai_epi16(gws, 4); + + // back to byte, set up for transpose + __m128i brb = _mm_packus_epi16(rw, bw); + __m128i gxb = _mm_packus_epi16(gw, xw); + + // transpose to interleave channels + __m128i t0 = _mm_unpacklo_epi8(brb, gxb); + __m128i t1 = _mm_unpackhi_epi8(brb, gxb); + __m128i o0 = _mm_unpacklo_epi16(t0, t1); + __m128i o1 = _mm_unpackhi_epi16(t0, t1); + + // store + _mm_storeu_si128((__m128i *) (out + 0), o0); + _mm_storeu_si128((__m128i *) (out + 16), o1); + out += 32; + } + } +#endif + +#ifdef STBI_NEON + // in this version, step=3 support would be easy to add. but is there demand? + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + uint8x8_t signflip = vdup_n_u8(0x80); + int16x8_t cr_const0 = vdupq_n_s16( (short) ( 1.40200f*4096.0f+0.5f)); + int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f)); + int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f)); + int16x8_t cb_const1 = vdupq_n_s16( (short) ( 1.77200f*4096.0f+0.5f)); + + for (; i+7 < count; i += 8) { + // load + uint8x8_t y_bytes = vld1_u8(y + i); + uint8x8_t cr_bytes = vld1_u8(pcr + i); + uint8x8_t cb_bytes = vld1_u8(pcb + i); + int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip)); + int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip)); + + // expand to s16 + int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4)); + int16x8_t crw = vshll_n_s8(cr_biased, 7); + int16x8_t cbw = vshll_n_s8(cb_biased, 7); + + // color transform + int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0); + int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0); + int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1); + int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1); + int16x8_t rws = vaddq_s16(yws, cr0); + int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1); + int16x8_t bws = vaddq_s16(yws, cb1); + + // undo scaling, round, convert to byte + uint8x8x4_t o; + o.val[0] = vqrshrun_n_s16(rws, 4); + o.val[1] = vqrshrun_n_s16(gws, 4); + o.val[2] = vqrshrun_n_s16(bws, 4); + o.val[3] = vdup_n_u8(255); + + // store, interleaving r/g/b/a + vst4_u8(out, o); + out += 8*4; + } + } +#endif + + for (; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* float2fixed(1.40200f); + g = y_fixed + cr*-float2fixed(0.71414f) + ((cb*-float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#endif + +// set up the kernels +static void stbi__setup_jpeg(stbi__jpeg *j) +{ + j->idct_block_kernel = stbi__idct_block; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2; + +#ifdef STBI_SSE2 + if (stbi__sse2_available()) { + j->idct_block_kernel = stbi__idct_simd; + #ifndef STBI_JPEG_OLD + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + #endif + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; + } +#endif + +#ifdef STBI_NEON + j->idct_block_kernel = stbi__idct_simd; + #ifndef STBI_JPEG_OLD + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + #endif + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; +#endif +} + +// clean up the temporary component buffers +static void stbi__cleanup_jpeg(stbi__jpeg *j) +{ + int i; + for (i=0; i < j->s->img_n; ++i) { + if (j->img_comp[i].raw_data) { + STBI_FREE(j->img_comp[i].raw_data); + j->img_comp[i].raw_data = NULL; + j->img_comp[i].data = NULL; + } + if (j->img_comp[i].raw_coeff) { + STBI_FREE(j->img_comp[i].raw_coeff); + j->img_comp[i].raw_coeff = 0; + j->img_comp[i].coeff = 0; + } + if (j->img_comp[i].linebuf) { + STBI_FREE(j->img_comp[i].linebuf); + j->img_comp[i].linebuf = NULL; + } + } +} + +typedef struct +{ + resample_row_func resample; + stbi_uc *line0,*line1; + int hs,vs; // expansion factor in each axis + int w_lores; // horizontal pixels pre-expansion + int ystep; // how far through vertical expansion we are + int ypos; // which pre-expansion row we're on +} stbi__resample; + +static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) +{ + int n, decode_n; + z->s->img_n = 0; // make stbi__cleanup_jpeg safe + + // validate req_comp + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + + // load a jpeg image from whichever source, but leave in YCbCr format + if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; } + + // determine actual number of components to generate + n = req_comp ? req_comp : z->s->img_n; + + if (z->s->img_n == 3 && n < 3) + decode_n = 1; + else + decode_n = z->s->img_n; + + // resample and color-convert + { + int k; + unsigned int i,j; + stbi_uc *output; + stbi_uc *coutput[4]; + + stbi__resample res_comp[4]; + + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + + // allocate line buffer big enough for upsampling off the edges + // with upsample factor of 4 + z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3); + if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + r->hs = z->img_h_max / z->img_comp[k].h; + r->vs = z->img_v_max / z->img_comp[k].v; + r->ystep = r->vs >> 1; + r->w_lores = (z->s->img_x + r->hs-1) / r->hs; + r->ypos = 0; + r->line0 = r->line1 = z->img_comp[k].data; + + if (r->hs == 1 && r->vs == 1) r->resample = resample_row_1; + else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2; + else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2; + else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel; + else r->resample = stbi__resample_row_generic; + } + + // can't error after this so, this is safe + output = (stbi_uc *) stbi__malloc(n * z->s->img_x * z->s->img_y + 1); + if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + // now go ahead and resample + for (j=0; j < z->s->img_y; ++j) { + stbi_uc *out = output + n * z->s->img_x * j; + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + int y_bot = r->ystep >= (r->vs >> 1); + coutput[k] = r->resample(z->img_comp[k].linebuf, + y_bot ? r->line1 : r->line0, + y_bot ? r->line0 : r->line1, + r->w_lores, r->hs); + if (++r->ystep >= r->vs) { + r->ystep = 0; + r->line0 = r->line1; + if (++r->ypos < z->img_comp[k].y) + r->line1 += z->img_comp[k].w2; + } + } + if (n >= 3) { + stbi_uc *y = coutput[0]; + if (z->s->img_n == 3) { + if (z->rgb == 3) { + for (i=0; i < z->s->img_x; ++i) { + out[0] = y[i]; + out[1] = coutput[1][i]; + out[2] = coutput[2][i]; + out[3] = 255; + out += n; + } + } else { + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + } + } else + for (i=0; i < z->s->img_x; ++i) { + out[0] = out[1] = out[2] = y[i]; + out[3] = 255; // not used if n==3 + out += n; + } + } else { + stbi_uc *y = coutput[0]; + if (n == 1) + for (i=0; i < z->s->img_x; ++i) out[i] = y[i]; + else + for (i=0; i < z->s->img_x; ++i) *out++ = y[i], *out++ = 255; + } + } + stbi__cleanup_jpeg(z); + *out_x = z->s->img_x; + *out_y = z->s->img_y; + if (comp) *comp = z->s->img_n; // report original components, not output + return output; + } +} + +static unsigned char *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + unsigned char* result; + stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg)); + j->s = s; + stbi__setup_jpeg(j); + result = load_jpeg_image(j, x,y,comp,req_comp); + STBI_FREE(j); + return result; +} + +static int stbi__jpeg_test(stbi__context *s) +{ + int r; + stbi__jpeg j; + j.s = s; + stbi__setup_jpeg(&j); + r = stbi__decode_jpeg_header(&j, STBI__SCAN_type); + stbi__rewind(s); + return r; +} + +static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp) +{ + if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) { + stbi__rewind( j->s ); + return 0; + } + if (x) *x = j->s->img_x; + if (y) *y = j->s->img_y; + if (comp) *comp = j->s->img_n; + return 1; +} + +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) +{ + int result; + stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg))); + j->s = s; + result = stbi__jpeg_info_raw(j, x, y, comp); + STBI_FREE(j); + return result; +} +#endif + +// public domain zlib decode v0.2 Sean Barrett 2006-11-18 +// simple implementation +// - all input must be provided in an upfront buffer +// - all output is written to a single output buffer (can malloc/realloc) +// performance +// - fast huffman + +#ifndef STBI_NO_ZLIB + +// fast-way is faster to check than jpeg huffman, but slow way is slower +#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables +#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1) + +// zlib-style huffman encoding +// (jpegs packs from left, zlib from right, so can't share code) +typedef struct +{ + stbi__uint16 fast[1 << STBI__ZFAST_BITS]; + stbi__uint16 firstcode[16]; + int maxcode[17]; + stbi__uint16 firstsymbol[16]; + stbi_uc size[288]; + stbi__uint16 value[288]; +} stbi__zhuffman; + +stbi_inline static int stbi__bitreverse16(int n) +{ + n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1); + n = ((n & 0xCCCC) >> 2) | ((n & 0x3333) << 2); + n = ((n & 0xF0F0) >> 4) | ((n & 0x0F0F) << 4); + n = ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); + return n; +} + +stbi_inline static int stbi__bit_reverse(int v, int bits) +{ + STBI_ASSERT(bits <= 16); + // to bit reverse n bits, reverse 16 and shift + // e.g. 11 bits, bit reverse and shift away 5 + return stbi__bitreverse16(v) >> (16-bits); +} + +static int stbi__zbuild_huffman(stbi__zhuffman *z, stbi_uc *sizelist, int num) +{ + int i,k=0; + int code, next_code[16], sizes[17]; + + // DEFLATE spec for generating codes + memset(sizes, 0, sizeof(sizes)); + memset(z->fast, 0, sizeof(z->fast)); + for (i=0; i < num; ++i) + ++sizes[sizelist[i]]; + sizes[0] = 0; + for (i=1; i < 16; ++i) + if (sizes[i] > (1 << i)) + return stbi__err("bad sizes", "Corrupt PNG"); + code = 0; + for (i=1; i < 16; ++i) { + next_code[i] = code; + z->firstcode[i] = (stbi__uint16) code; + z->firstsymbol[i] = (stbi__uint16) k; + code = (code + sizes[i]); + if (sizes[i]) + if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG"); + z->maxcode[i] = code << (16-i); // preshift for inner loop + code <<= 1; + k += sizes[i]; + } + z->maxcode[16] = 0x10000; // sentinel + for (i=0; i < num; ++i) { + int s = sizelist[i]; + if (s) { + int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s]; + stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i); + z->size [c] = (stbi_uc ) s; + z->value[c] = (stbi__uint16) i; + if (s <= STBI__ZFAST_BITS) { + int j = stbi__bit_reverse(next_code[s],s); + while (j < (1 << STBI__ZFAST_BITS)) { + z->fast[j] = fastv; + j += (1 << s); + } + } + ++next_code[s]; + } + } + return 1; +} + +// zlib-from-memory implementation for PNG reading +// because PNG allows splitting the zlib stream arbitrarily, +// and it's annoying structurally to have PNG call ZLIB call PNG, +// we require PNG read all the IDATs and combine them into a single +// memory buffer + +typedef struct +{ + stbi_uc *zbuffer, *zbuffer_end; + int num_bits; + stbi__uint32 code_buffer; + + char *zout; + char *zout_start; + char *zout_end; + int z_expandable; + + stbi__zhuffman z_length, z_distance; +} stbi__zbuf; + +stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z) +{ + if (z->zbuffer >= z->zbuffer_end) return 0; + return *z->zbuffer++; +} + +static void stbi__fill_bits(stbi__zbuf *z) +{ + do { + STBI_ASSERT(z->code_buffer < (1U << z->num_bits)); + z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits; + z->num_bits += 8; + } while (z->num_bits <= 24); +} + +stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n) +{ + unsigned int k; + if (z->num_bits < n) stbi__fill_bits(z); + k = z->code_buffer & ((1 << n) - 1); + z->code_buffer >>= n; + z->num_bits -= n; + return k; +} + +static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s,k; + // not resolved by fast table, so compute it the slow way + // use jpeg approach, which requires MSbits at top + k = stbi__bit_reverse(a->code_buffer, 16); + for (s=STBI__ZFAST_BITS+1; ; ++s) + if (k < z->maxcode[s]) + break; + if (s == 16) return -1; // invalid code! + // code size is s, so: + b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s]; + STBI_ASSERT(z->size[b] == s); + a->code_buffer >>= s; + a->num_bits -= s; + return z->value[b]; +} + +stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s; + if (a->num_bits < 16) stbi__fill_bits(a); + b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; + if (b) { + s = b >> 9; + a->code_buffer >>= s; + a->num_bits -= s; + return b & 511; + } + return stbi__zhuffman_decode_slowpath(a, z); +} + +static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes +{ + char *q; + int cur, limit, old_limit; + z->zout = zout; + if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG"); + cur = (int) (z->zout - z->zout_start); + limit = old_limit = (int) (z->zout_end - z->zout_start); + while (cur + n > limit) + limit *= 2; + q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit); + STBI_NOTUSED(old_limit); + if (q == NULL) return stbi__err("outofmem", "Out of memory"); + z->zout_start = q; + z->zout = q + cur; + z->zout_end = q + limit; + return 1; +} + +static int stbi__zlength_base[31] = { + 3,4,5,6,7,8,9,10,11,13, + 15,17,19,23,27,31,35,43,51,59, + 67,83,99,115,131,163,195,227,258,0,0 }; + +static int stbi__zlength_extra[31]= +{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 }; + +static int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193, +257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0}; + +static int stbi__zdist_extra[32] = +{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; + +static int stbi__parse_huffman_block(stbi__zbuf *a) +{ + char *zout = a->zout; + for(;;) { + int z = stbi__zhuffman_decode(a, &a->z_length); + if (z < 256) { + if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes + if (zout >= a->zout_end) { + if (!stbi__zexpand(a, zout, 1)) return 0; + zout = a->zout; + } + *zout++ = (char) z; + } else { + stbi_uc *p; + int len,dist; + if (z == 256) { + a->zout = zout; + return 1; + } + z -= 257; + len = stbi__zlength_base[z]; + if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); + z = stbi__zhuffman_decode(a, &a->z_distance); + if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); + dist = stbi__zdist_base[z]; + if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); + if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); + if (zout + len > a->zout_end) { + if (!stbi__zexpand(a, zout, len)) return 0; + zout = a->zout; + } + p = (stbi_uc *) (zout - dist); + if (dist == 1) { // run of one byte; common in images. + stbi_uc v = *p; + if (len) { do *zout++ = v; while (--len); } + } else { + if (len) { do *zout++ = *p++; while (--len); } + } + } + } +} + +static int stbi__compute_huffman_codes(stbi__zbuf *a) +{ + static stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 }; + stbi__zhuffman z_codelength; + stbi_uc lencodes[286+32+137];//padding for maximum single op + stbi_uc codelength_sizes[19]; + int i,n; + + int hlit = stbi__zreceive(a,5) + 257; + int hdist = stbi__zreceive(a,5) + 1; + int hclen = stbi__zreceive(a,4) + 4; + + memset(codelength_sizes, 0, sizeof(codelength_sizes)); + for (i=0; i < hclen; ++i) { + int s = stbi__zreceive(a,3); + codelength_sizes[length_dezigzag[i]] = (stbi_uc) s; + } + if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0; + + n = 0; + while (n < hlit + hdist) { + int c = stbi__zhuffman_decode(a, &z_codelength); + if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG"); + if (c < 16) + lencodes[n++] = (stbi_uc) c; + else if (c == 16) { + c = stbi__zreceive(a,2)+3; + memset(lencodes+n, lencodes[n-1], c); + n += c; + } else if (c == 17) { + c = stbi__zreceive(a,3)+3; + memset(lencodes+n, 0, c); + n += c; + } else { + STBI_ASSERT(c == 18); + c = stbi__zreceive(a,7)+11; + memset(lencodes+n, 0, c); + n += c; + } + } + if (n != hlit+hdist) return stbi__err("bad codelengths","Corrupt PNG"); + if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0; + return 1; +} + +static int stbi__parse_uncompressed_block(stbi__zbuf *a) +{ + stbi_uc header[4]; + int len,nlen,k; + if (a->num_bits & 7) + stbi__zreceive(a, a->num_bits & 7); // discard + // drain the bit-packed data into header + k = 0; + while (a->num_bits > 0) { + header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check + a->code_buffer >>= 8; + a->num_bits -= 8; + } + STBI_ASSERT(a->num_bits == 0); + // now fill header the normal way + while (k < 4) + header[k++] = stbi__zget8(a); + len = header[1] * 256 + header[0]; + nlen = header[3] * 256 + header[2]; + if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG"); + if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG"); + if (a->zout + len > a->zout_end) + if (!stbi__zexpand(a, a->zout, len)) return 0; + memcpy(a->zout, a->zbuffer, len); + a->zbuffer += len; + a->zout += len; + return 1; +} + +static int stbi__parse_zlib_header(stbi__zbuf *a) +{ + int cmf = stbi__zget8(a); + int cm = cmf & 15; + /* int cinfo = cmf >> 4; */ + int flg = stbi__zget8(a); + if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec + if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png + if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png + // window = 1 << (8 + cinfo)... but who cares, we fully buffer output + return 1; +} + +// @TODO: should statically initialize these for optimal thread safety +static stbi_uc stbi__zdefault_length[288], stbi__zdefault_distance[32]; +static void stbi__init_zdefaults(void) +{ + int i; // use <= to match clearly with spec + for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8; + for ( ; i <= 255; ++i) stbi__zdefault_length[i] = 9; + for ( ; i <= 279; ++i) stbi__zdefault_length[i] = 7; + for ( ; i <= 287; ++i) stbi__zdefault_length[i] = 8; + + for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5; +} + +static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) +{ + int final, type; + if (parse_header) + if (!stbi__parse_zlib_header(a)) return 0; + a->num_bits = 0; + a->code_buffer = 0; + do { + final = stbi__zreceive(a,1); + type = stbi__zreceive(a,2); + if (type == 0) { + if (!stbi__parse_uncompressed_block(a)) return 0; + } else if (type == 3) { + return 0; + } else { + if (type == 1) { + // use fixed code lengths + if (!stbi__zdefault_distance[31]) stbi__init_zdefaults(); + if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , 288)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) return 0; + } else { + if (!stbi__compute_huffman_codes(a)) return 0; + } + if (!stbi__parse_huffman_block(a)) return 0; + } + } while (!final); + return 1; +} + +static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header) +{ + a->zout_start = obuf; + a->zout = obuf; + a->zout_end = obuf + olen; + a->z_expandable = exp; + + return stbi__parse_zlib(a, parse_header); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, 1)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen) +{ + return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 1)) + return (int) (a.zout - a.zout_start); + else + return -1; +} + +STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(16384); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer+len; + if (stbi__do_zlib(&a, p, 16384, 1, 0)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 0)) + return (int) (a.zout - a.zout_start); + else + return -1; +} +#endif + +// public domain "baseline" PNG decoder v0.10 Sean Barrett 2006-11-18 +// simple implementation +// - only 8-bit samples +// - no CRC checking +// - allocates lots of intermediate memory +// - avoids problem of streaming data between subsystems +// - avoids explicit window management +// performance +// - uses stb_zlib, a PD zlib implementation with fast huffman decoding + +#ifndef STBI_NO_PNG +typedef struct +{ + stbi__uint32 length; + stbi__uint32 type; +} stbi__pngchunk; + +static stbi__pngchunk stbi__get_chunk_header(stbi__context *s) +{ + stbi__pngchunk c; + c.length = stbi__get32be(s); + c.type = stbi__get32be(s); + return c; +} + +static int stbi__check_png_header(stbi__context *s) +{ + static stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 }; + int i; + for (i=0; i < 8; ++i) + if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG"); + return 1; +} + +typedef struct +{ + stbi__context *s; + stbi_uc *idata, *expanded, *out; + int depth; +} stbi__png; + + +enum { + STBI__F_none=0, + STBI__F_sub=1, + STBI__F_up=2, + STBI__F_avg=3, + STBI__F_paeth=4, + // synthetic filters used for first scanline to avoid needing a dummy row of 0s + STBI__F_avg_first, + STBI__F_paeth_first +}; + +static stbi_uc first_row_filter[5] = +{ + STBI__F_none, + STBI__F_sub, + STBI__F_none, + STBI__F_avg_first, + STBI__F_paeth_first +}; + +static int stbi__paeth(int a, int b, int c) +{ + int p = a + b - c; + int pa = abs(p-a); + int pb = abs(p-b); + int pc = abs(p-c); + if (pa <= pb && pa <= pc) return a; + if (pb <= pc) return b; + return c; +} + +static stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 }; + +// create the png data from post-deflated data +static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) +{ + int bytes = (depth == 16? 2 : 1); + stbi__context *s = a->s; + stbi__uint32 i,j,stride = x*out_n*bytes; + stbi__uint32 img_len, img_width_bytes; + int k; + int img_n = s->img_n; // copy it into a local for later + + int output_bytes = out_n*bytes; + int filter_bytes = img_n*bytes; + int width = x; + + STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1); + a->out = (stbi_uc *) stbi__malloc(x * y * output_bytes); // extra bytes to write off the end into + if (!a->out) return stbi__err("outofmem", "Out of memory"); + + img_width_bytes = (((img_n * x * depth) + 7) >> 3); + img_len = (img_width_bytes + 1) * y; + if (s->img_x == x && s->img_y == y) { + if (raw_len != img_len) return stbi__err("not enough pixels","Corrupt PNG"); + } else { // interlaced: + if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG"); + } + + for (j=0; j < y; ++j) { + stbi_uc *cur = a->out + stride*j; + stbi_uc *prior = cur - stride; + int filter = *raw++; + + if (filter > 4) + return stbi__err("invalid filter","Corrupt PNG"); + + if (depth < 8) { + STBI_ASSERT(img_width_bytes <= x); + cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place + filter_bytes = 1; + width = img_width_bytes; + } + + // if first row, use special filter that doesn't sample previous row + if (j == 0) filter = first_row_filter[filter]; + + // handle first byte explicitly + for (k=0; k < filter_bytes; ++k) { + switch (filter) { + case STBI__F_none : cur[k] = raw[k]; break; + case STBI__F_sub : cur[k] = raw[k]; break; + case STBI__F_up : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; + case STBI__F_avg : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break; + case STBI__F_paeth : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break; + case STBI__F_avg_first : cur[k] = raw[k]; break; + case STBI__F_paeth_first: cur[k] = raw[k]; break; + } + } + + if (depth == 8) { + if (img_n != out_n) + cur[img_n] = 255; // first pixel + raw += img_n; + cur += out_n; + prior += out_n; + } else if (depth == 16) { + if (img_n != out_n) { + cur[filter_bytes] = 255; // first pixel top byte + cur[filter_bytes+1] = 255; // first pixel bottom byte + } + raw += filter_bytes; + cur += output_bytes; + prior += output_bytes; + } else { + raw += 1; + cur += 1; + prior += 1; + } + + // this is a little gross, so that we don't switch per-pixel or per-component + if (depth < 8 || img_n == out_n) { + int nk = (width - 1)*filter_bytes; + #define CASE(f) \ + case f: \ + for (k=0; k < nk; ++k) + switch (filter) { + // "none" filter turns into a memcpy here; make that explicit. + case STBI__F_none: memcpy(cur, raw, nk); break; + CASE(STBI__F_sub) cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); break; + CASE(STBI__F_up) cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; + CASE(STBI__F_avg) cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); break; + CASE(STBI__F_paeth) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); break; + CASE(STBI__F_avg_first) cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); break; + CASE(STBI__F_paeth_first) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); break; + } + #undef CASE + raw += nk; + } else { + STBI_ASSERT(img_n+1 == out_n); + #define CASE(f) \ + case f: \ + for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \ + for (k=0; k < filter_bytes; ++k) + switch (filter) { + CASE(STBI__F_none) cur[k] = raw[k]; break; + CASE(STBI__F_sub) cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); break; + CASE(STBI__F_up) cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; + CASE(STBI__F_avg) cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); break; + CASE(STBI__F_paeth) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); break; + CASE(STBI__F_avg_first) cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); break; + CASE(STBI__F_paeth_first) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); break; + } + #undef CASE + + // the loop above sets the high byte of the pixels' alpha, but for + // 16 bit png files we also need the low byte set. we'll do that here. + if (depth == 16) { + cur = a->out + stride*j; // start at the beginning of the row again + for (i=0; i < x; ++i,cur+=output_bytes) { + cur[filter_bytes+1] = 255; + } + } + } + } + + // we make a separate pass to expand bits to pixels; for performance, + // this could run two scanlines behind the above code, so it won't + // intefere with filtering but will still be in the cache. + if (depth < 8) { + for (j=0; j < y; ++j) { + stbi_uc *cur = a->out + stride*j; + stbi_uc *in = a->out + stride*j + x*out_n - img_width_bytes; + // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit + // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop + stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range + + // note that the final byte might overshoot and write more data than desired. + // we can allocate enough data that this never writes out of memory, but it + // could also overwrite the next scanline. can it overwrite non-empty data + // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel. + // so we need to explicitly clamp the final ones + + if (depth == 4) { + for (k=x*img_n; k >= 2; k-=2, ++in) { + *cur++ = scale * ((*in >> 4) ); + *cur++ = scale * ((*in ) & 0x0f); + } + if (k > 0) *cur++ = scale * ((*in >> 4) ); + } else if (depth == 2) { + for (k=x*img_n; k >= 4; k-=4, ++in) { + *cur++ = scale * ((*in >> 6) ); + *cur++ = scale * ((*in >> 4) & 0x03); + *cur++ = scale * ((*in >> 2) & 0x03); + *cur++ = scale * ((*in ) & 0x03); + } + if (k > 0) *cur++ = scale * ((*in >> 6) ); + if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03); + if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03); + } else if (depth == 1) { + for (k=x*img_n; k >= 8; k-=8, ++in) { + *cur++ = scale * ((*in >> 7) ); + *cur++ = scale * ((*in >> 6) & 0x01); + *cur++ = scale * ((*in >> 5) & 0x01); + *cur++ = scale * ((*in >> 4) & 0x01); + *cur++ = scale * ((*in >> 3) & 0x01); + *cur++ = scale * ((*in >> 2) & 0x01); + *cur++ = scale * ((*in >> 1) & 0x01); + *cur++ = scale * ((*in ) & 0x01); + } + if (k > 0) *cur++ = scale * ((*in >> 7) ); + if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01); + if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01); + if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01); + if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01); + if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01); + if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01); + } + if (img_n != out_n) { + int q; + // insert alpha = 255 + cur = a->out + stride*j; + if (img_n == 1) { + for (q=x-1; q >= 0; --q) { + cur[q*2+1] = 255; + cur[q*2+0] = cur[q]; + } + } else { + STBI_ASSERT(img_n == 3); + for (q=x-1; q >= 0; --q) { + cur[q*4+3] = 255; + cur[q*4+2] = cur[q*3+2]; + cur[q*4+1] = cur[q*3+1]; + cur[q*4+0] = cur[q*3+0]; + } + } + } + } + } else if (depth == 16) { + // force the image data from big-endian to platform-native. + // this is done in a separate pass due to the decoding relying + // on the data being untouched, but could probably be done + // per-line during decode if care is taken. + stbi_uc *cur = a->out; + stbi__uint16 *cur16 = (stbi__uint16*)cur; + + for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) { + *cur16 = (cur[0] << 8) | cur[1]; + } + } + + return 1; +} + +static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced) +{ + stbi_uc *final; + int p; + if (!interlaced) + return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color); + + // de-interlacing + final = (stbi_uc *) stbi__malloc(a->s->img_x * a->s->img_y * out_n); + for (p=0; p < 7; ++p) { + int xorig[] = { 0,4,0,2,0,1,0 }; + int yorig[] = { 0,0,4,0,2,0,1 }; + int xspc[] = { 8,8,4,4,2,2,1 }; + int yspc[] = { 8,8,8,4,4,2,2 }; + int i,j,x,y; + // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1 + x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p]; + y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p]; + if (x && y) { + stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y; + if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) { + STBI_FREE(final); + return 0; + } + for (j=0; j < y; ++j) { + for (i=0; i < x; ++i) { + int out_y = j*yspc[p]+yorig[p]; + int out_x = i*xspc[p]+xorig[p]; + memcpy(final + out_y*a->s->img_x*out_n + out_x*out_n, + a->out + (j*x+i)*out_n, out_n); + } + } + STBI_FREE(a->out); + image_data += img_len; + image_data_len -= img_len; + } + } + a->out = final; + + return 1; +} + +static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + // compute color-based transparency, assuming we've + // already got 255 as the alpha value in the output + STBI_ASSERT(out_n == 2 || out_n == 4); + + if (out_n == 2) { + for (i=0; i < pixel_count; ++i) { + p[1] = (p[0] == tc[0] ? 0 : 255); + p += 2; + } + } else { + for (i=0; i < pixel_count; ++i) { + if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) + p[3] = 0; + p += 4; + } + } + return 1; +} + +static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi__uint16 *p = (stbi__uint16*) z->out; + + // compute color-based transparency, assuming we've + // already got 65535 as the alpha value in the output + STBI_ASSERT(out_n == 2 || out_n == 4); + + if (out_n == 2) { + for (i = 0; i < pixel_count; ++i) { + p[1] = (p[0] == tc[0] ? 0 : 65535); + p += 2; + } + } else { + for (i = 0; i < pixel_count; ++i) { + if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) + p[3] = 0; + p += 4; + } + } + return 1; +} + +static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n) +{ + stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y; + stbi_uc *p, *temp_out, *orig = a->out; + + p = (stbi_uc *) stbi__malloc(pixel_count * pal_img_n); + if (p == NULL) return stbi__err("outofmem", "Out of memory"); + + // between here and free(out) below, exitting would leak + temp_out = p; + + if (pal_img_n == 3) { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p += 3; + } + } else { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p[3] = palette[n+3]; + p += 4; + } + } + STBI_FREE(a->out); + a->out = temp_out; + + STBI_NOTUSED(len); + + return 1; +} + +static int stbi__reduce_png(stbi__png *p) +{ + int i; + int img_len = p->s->img_x * p->s->img_y * p->s->img_out_n; + stbi_uc *reduced; + stbi__uint16 *orig = (stbi__uint16*)p->out; + + if (p->depth != 16) return 1; // don't need to do anything if not 16-bit data + + reduced = (stbi_uc *)stbi__malloc(img_len); + if (p == NULL) return stbi__err("outofmem", "Out of memory"); + + for (i = 0; i < img_len; ++i) reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is a decent approx of 16->8 bit scaling + + p->out = reduced; + STBI_FREE(orig); + + return 1; +} + +static int stbi__unpremultiply_on_load = 0; +static int stbi__de_iphone_flag = 0; + +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply) +{ + stbi__unpremultiply_on_load = flag_true_if_should_unpremultiply; +} + +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) +{ + stbi__de_iphone_flag = flag_true_if_should_convert; +} + +static void stbi__de_iphone(stbi__png *z) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + if (s->img_out_n == 3) { // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 3; + } + } else { + STBI_ASSERT(s->img_out_n == 4); + if (stbi__unpremultiply_on_load) { + // convert bgr to rgb and unpremultiply + for (i=0; i < pixel_count; ++i) { + stbi_uc a = p[3]; + stbi_uc t = p[0]; + if (a) { + p[0] = p[2] * 255 / a; + p[1] = p[1] * 255 / a; + p[2] = t * 255 / a; + } else { + p[0] = p[2]; + p[2] = t; + } + p += 4; + } + } else { + // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 4; + } + } + } +} + +#define STBI__PNG_TYPE(a,b,c,d) (((a) << 24) + ((b) << 16) + ((c) << 8) + (d)) + +static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) +{ + stbi_uc palette[1024], pal_img_n=0; + stbi_uc has_trans=0, tc[3]; + stbi__uint16 tc16[3]; + stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0; + int first=1,k,interlace=0, color=0, is_iphone=0; + stbi__context *s = z->s; + + z->expanded = NULL; + z->idata = NULL; + z->out = NULL; + + if (!stbi__check_png_header(s)) return 0; + + if (scan == STBI__SCAN_type) return 1; + + for (;;) { + stbi__pngchunk c = stbi__get_chunk_header(s); + switch (c.type) { + case STBI__PNG_TYPE('C','g','B','I'): + is_iphone = 1; + stbi__skip(s, c.length); + break; + case STBI__PNG_TYPE('I','H','D','R'): { + int comp,filter; + if (!first) return stbi__err("multiple IHDR","Corrupt PNG"); + first = 0; + if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG"); + s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)"); + s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)"); + z->depth = stbi__get8(s); if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16) return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only"); + color = stbi__get8(s); if (color > 6) return stbi__err("bad ctype","Corrupt PNG"); + if (color == 3 && z->depth == 16) return stbi__err("bad ctype","Corrupt PNG"); + if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG"); + comp = stbi__get8(s); if (comp) return stbi__err("bad comp method","Corrupt PNG"); + filter= stbi__get8(s); if (filter) return stbi__err("bad filter method","Corrupt PNG"); + interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG"); + if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG"); + if (!pal_img_n) { + s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); + if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); + if (scan == STBI__SCAN_header) return 1; + } else { + // if paletted, then pal_n is our final components, and + // img_n is # components to decompress/filter. + s->img_n = 1; + if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); + // if SCAN_header, have to scan to see if we have a tRNS + } + break; + } + + case STBI__PNG_TYPE('P','L','T','E'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG"); + pal_len = c.length / 3; + if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG"); + for (i=0; i < pal_len; ++i) { + palette[i*4+0] = stbi__get8(s); + palette[i*4+1] = stbi__get8(s); + palette[i*4+2] = stbi__get8(s); + palette[i*4+3] = 255; + } + break; + } + + case STBI__PNG_TYPE('t','R','N','S'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG"); + if (pal_img_n) { + if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; } + if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG"); + if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG"); + pal_img_n = 4; + for (i=0; i < c.length; ++i) + palette[i*4+3] = stbi__get8(s); + } else { + if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); + if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); + has_trans = 1; + if (z->depth == 16) { + for (k = 0; k < s->img_n; ++k) tc16[k] = stbi__get16be(s); // copy the values as-is + } else { + for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger + } + } + break; + } + + case STBI__PNG_TYPE('I','D','A','T'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); + if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; } + if ((int)(ioff + c.length) < (int)ioff) return 0; + if (ioff + c.length > idata_limit) { + stbi__uint32 idata_limit_old = idata_limit; + stbi_uc *p; + if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096; + while (ioff + c.length > idata_limit) + idata_limit *= 2; + STBI_NOTUSED(idata_limit_old); + p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory"); + z->idata = p; + } + if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG"); + ioff += c.length; + break; + } + + case STBI__PNG_TYPE('I','E','N','D'): { + stbi__uint32 raw_len, bpl; + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (scan != STBI__SCAN_load) return 1; + if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG"); + // initial guess for decoded data size to avoid unnecessary reallocs + bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component + raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */; + z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone); + if (z->expanded == NULL) return 0; // zlib should set error + STBI_FREE(z->idata); z->idata = NULL; + if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans) + s->img_out_n = s->img_n+1; + else + s->img_out_n = s->img_n; + if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0; + if (has_trans) { + if (z->depth == 16) { + if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0; + } else { + if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0; + } + } + if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2) + stbi__de_iphone(z); + if (pal_img_n) { + // pal_img_n == 3 or 4 + s->img_n = pal_img_n; // record the actual colors we had + s->img_out_n = pal_img_n; + if (req_comp >= 3) s->img_out_n = req_comp; + if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n)) + return 0; + } + STBI_FREE(z->expanded); z->expanded = NULL; + return 1; + } + + default: + // if critical, fail + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if ((c.type & (1 << 29)) == 0) { + #ifndef STBI_NO_FAILURE_STRINGS + // not threadsafe + static char invalid_chunk[] = "XXXX PNG chunk not known"; + invalid_chunk[0] = STBI__BYTECAST(c.type >> 24); + invalid_chunk[1] = STBI__BYTECAST(c.type >> 16); + invalid_chunk[2] = STBI__BYTECAST(c.type >> 8); + invalid_chunk[3] = STBI__BYTECAST(c.type >> 0); + #endif + return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type"); + } + stbi__skip(s, c.length); + break; + } + // end of PNG chunk, read and skip CRC + stbi__get32be(s); + } +} + +static unsigned char *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp) +{ + unsigned char *result=NULL; + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) { + if (p->depth == 16) { + if (!stbi__reduce_png(p)) { + return result; + } + } + result = p->out; + p->out = NULL; + if (req_comp && req_comp != p->s->img_out_n) { + result = stbi__convert_format(result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); + p->s->img_out_n = req_comp; + if (result == NULL) return result; + } + *x = p->s->img_x; + *y = p->s->img_y; + if (n) *n = p->s->img_n; + } + STBI_FREE(p->out); p->out = NULL; + STBI_FREE(p->expanded); p->expanded = NULL; + STBI_FREE(p->idata); p->idata = NULL; + + return result; +} + +static unsigned char *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__png p; + p.s = s; + return stbi__do_png(&p, x,y,comp,req_comp); +} + +static int stbi__png_test(stbi__context *s) +{ + int r; + r = stbi__check_png_header(s); + stbi__rewind(s); + return r; +} + +static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp) +{ + if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) { + stbi__rewind( p->s ); + return 0; + } + if (x) *x = p->s->img_x; + if (y) *y = p->s->img_y; + if (comp) *comp = p->s->img_n; + return 1; +} + +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__png p; + p.s = s; + return stbi__png_info_raw(&p, x, y, comp); +} +#endif + +// Microsoft/Windows BMP image + +#ifndef STBI_NO_BMP +static int stbi__bmp_test_raw(stbi__context *s) +{ + int r; + int sz; + if (stbi__get8(s) != 'B') return 0; + if (stbi__get8(s) != 'M') return 0; + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + stbi__get32le(s); // discard data offset + sz = stbi__get32le(s); + r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124); + return r; +} + +static int stbi__bmp_test(stbi__context *s) +{ + int r = stbi__bmp_test_raw(s); + stbi__rewind(s); + return r; +} + + +// returns 0..31 for the highest set bit +static int stbi__high_bit(unsigned int z) +{ + int n=0; + if (z == 0) return -1; + if (z >= 0x10000) n += 16, z >>= 16; + if (z >= 0x00100) n += 8, z >>= 8; + if (z >= 0x00010) n += 4, z >>= 4; + if (z >= 0x00004) n += 2, z >>= 2; + if (z >= 0x00002) n += 1, z >>= 1; + return n; +} + +static int stbi__bitcount(unsigned int a) +{ + a = (a & 0x55555555) + ((a >> 1) & 0x55555555); // max 2 + a = (a & 0x33333333) + ((a >> 2) & 0x33333333); // max 4 + a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits + a = (a + (a >> 8)); // max 16 per 8 bits + a = (a + (a >> 16)); // max 32 per 8 bits + return a & 0xff; +} + +static int stbi__shiftsigned(int v, int shift, int bits) +{ + int result; + int z=0; + + if (shift < 0) v <<= -shift; + else v >>= shift; + result = v; + + z = bits; + while (z < 8) { + result += v >> z; + z += bits; + } + return result; +} + +typedef struct +{ + int bpp, offset, hsz; + unsigned int mr,mg,mb,ma, all_a; +} stbi__bmp_data; + +static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info) +{ + int hsz; + if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP"); + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + info->offset = stbi__get32le(s); + info->hsz = hsz = stbi__get32le(s); + info->mr = info->mg = info->mb = info->ma = 0; + + if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); + if (hsz == 12) { + s->img_x = stbi__get16le(s); + s->img_y = stbi__get16le(s); + } else { + s->img_x = stbi__get32le(s); + s->img_y = stbi__get32le(s); + } + if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP"); + info->bpp = stbi__get16le(s); + if (info->bpp == 1) return stbi__errpuc("monochrome", "BMP type not supported: 1-bit"); + if (hsz != 12) { + int compress = stbi__get32le(s); + if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE"); + stbi__get32le(s); // discard sizeof + stbi__get32le(s); // discard hres + stbi__get32le(s); // discard vres + stbi__get32le(s); // discard colorsused + stbi__get32le(s); // discard max important + if (hsz == 40 || hsz == 56) { + if (hsz == 56) { + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + } + if (info->bpp == 16 || info->bpp == 32) { + if (compress == 0) { + if (info->bpp == 32) { + info->mr = 0xffu << 16; + info->mg = 0xffu << 8; + info->mb = 0xffu << 0; + info->ma = 0xffu << 24; + info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0 + } else { + info->mr = 31u << 10; + info->mg = 31u << 5; + info->mb = 31u << 0; + } + } else if (compress == 3) { + info->mr = stbi__get32le(s); + info->mg = stbi__get32le(s); + info->mb = stbi__get32le(s); + // not documented, but generated by photoshop and handled by mspaint + if (info->mr == info->mg && info->mg == info->mb) { + // ?!?!? + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else { + int i; + if (hsz != 108 && hsz != 124) + return stbi__errpuc("bad BMP", "bad BMP"); + info->mr = stbi__get32le(s); + info->mg = stbi__get32le(s); + info->mb = stbi__get32le(s); + info->ma = stbi__get32le(s); + stbi__get32le(s); // discard color space + for (i=0; i < 12; ++i) + stbi__get32le(s); // discard color space parameters + if (hsz == 124) { + stbi__get32le(s); // discard rendering intent + stbi__get32le(s); // discard offset of profile data + stbi__get32le(s); // discard size of profile data + stbi__get32le(s); // discard reserved + } + } + } + return (void *) 1; +} + + +static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi_uc *out; + unsigned int mr=0,mg=0,mb=0,ma=0, all_a; + stbi_uc pal[256][4]; + int psize=0,i,j,width; + int flip_vertically, pad, target; + stbi__bmp_data info; + + info.all_a = 255; + if (stbi__bmp_parse_header(s, &info) == NULL) + return NULL; // error code already set + + flip_vertically = ((int) s->img_y) > 0; + s->img_y = abs((int) s->img_y); + + mr = info.mr; + mg = info.mg; + mb = info.mb; + ma = info.ma; + all_a = info.all_a; + + if (info.hsz == 12) { + if (info.bpp < 24) + psize = (info.offset - 14 - 24) / 3; + } else { + if (info.bpp < 16) + psize = (info.offset - 14 - info.hsz) >> 2; + } + + s->img_n = ma ? 4 : 3; + if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 + target = req_comp; + else + target = s->img_n; // if they want monochrome, we'll post-convert + + out = (stbi_uc *) stbi__malloc(target * s->img_x * s->img_y); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + if (info.bpp < 16) { + int z=0; + if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); } + for (i=0; i < psize; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + if (info.hsz != 12) stbi__get8(s); + pal[i][3] = 255; + } + stbi__skip(s, info.offset - 14 - info.hsz - psize * (info.hsz == 12 ? 3 : 4)); + if (info.bpp == 4) width = (s->img_x + 1) >> 1; + else if (info.bpp == 8) width = s->img_x; + else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); } + pad = (-width)&3; + for (j=0; j < (int) s->img_y; ++j) { + for (i=0; i < (int) s->img_x; i += 2) { + int v=stbi__get8(s),v2=0; + if (info.bpp == 4) { + v2 = v & 15; + v >>= 4; + } + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + if (i+1 == (int) s->img_x) break; + v = (info.bpp == 8) ? stbi__get8(s) : v2; + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + } + stbi__skip(s, pad); + } + } else { + int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0; + int z = 0; + int easy=0; + stbi__skip(s, info.offset - 14 - info.hsz); + if (info.bpp == 24) width = 3 * s->img_x; + else if (info.bpp == 16) width = 2*s->img_x; + else /* bpp = 32 and pad = 0 */ width=0; + pad = (-width) & 3; + if (info.bpp == 24) { + easy = 1; + } else if (info.bpp == 32) { + if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000) + easy = 2; + } + if (!easy) { + if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } + // right shift amt to put high bit in position #7 + rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr); + gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg); + bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb); + ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma); + } + for (j=0; j < (int) s->img_y; ++j) { + if (easy) { + for (i=0; i < (int) s->img_x; ++i) { + unsigned char a; + out[z+2] = stbi__get8(s); + out[z+1] = stbi__get8(s); + out[z+0] = stbi__get8(s); + z += 3; + a = (easy == 2 ? stbi__get8(s) : 255); + all_a |= a; + if (target == 4) out[z++] = a; + } + } else { + int bpp = info.bpp; + for (i=0; i < (int) s->img_x; ++i) { + stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s)); + int a; + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount)); + a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255); + all_a |= a; + if (target == 4) out[z++] = STBI__BYTECAST(a); + } + } + stbi__skip(s, pad); + } + } + + // if alpha channel is all 0s, replace with all 255s + if (target == 4 && all_a == 0) + for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4) + out[i] = 255; + + if (flip_vertically) { + stbi_uc t; + for (j=0; j < (int) s->img_y>>1; ++j) { + stbi_uc *p1 = out + j *s->img_x*target; + stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target; + for (i=0; i < (int) s->img_x*target; ++i) { + t = p1[i], p1[i] = p2[i], p2[i] = t; + } + } + } + + if (req_comp && req_comp != target) { + out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + *x = s->img_x; + *y = s->img_y; + if (comp) *comp = s->img_n; + return out; +} +#endif + +// Targa Truevision - TGA +// by Jonathan Dummer +#ifndef STBI_NO_TGA +// returns STBI_rgb or whatever, 0 on error +static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16) +{ + // only RGB or RGBA (incl. 16bit) or grey allowed + if(is_rgb16) *is_rgb16 = 0; + switch(bits_per_pixel) { + case 8: return STBI_grey; + case 16: if(is_grey) return STBI_grey_alpha; + // else: fall-through + case 15: if(is_rgb16) *is_rgb16 = 1; + return STBI_rgb; + case 24: // fall-through + case 32: return bits_per_pixel/8; + default: return 0; + } +} + +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp) +{ + int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp; + int sz, tga_colormap_type; + stbi__get8(s); // discard Offset + tga_colormap_type = stbi__get8(s); // colormap type + if( tga_colormap_type > 1 ) { + stbi__rewind(s); + return 0; // only RGB or indexed allowed + } + tga_image_type = stbi__get8(s); // image type + if ( tga_colormap_type == 1 ) { // colormapped (paletted) image + if (tga_image_type != 1 && tga_image_type != 9) { + stbi__rewind(s); + return 0; + } + stbi__skip(s,4); // skip index of first colormap entry and number of entries + sz = stbi__get8(s); // check bits per palette color entry + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) { + stbi__rewind(s); + return 0; + } + stbi__skip(s,4); // skip image x and y origin + tga_colormap_bpp = sz; + } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE + if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) { + stbi__rewind(s); + return 0; // only RGB or grey allowed, +/- RLE + } + stbi__skip(s,9); // skip colormap specification and image x/y origin + tga_colormap_bpp = 0; + } + tga_w = stbi__get16le(s); + if( tga_w < 1 ) { + stbi__rewind(s); + return 0; // test width + } + tga_h = stbi__get16le(s); + if( tga_h < 1 ) { + stbi__rewind(s); + return 0; // test height + } + tga_bits_per_pixel = stbi__get8(s); // bits per pixel + stbi__get8(s); // ignore alpha bits + if (tga_colormap_bpp != 0) { + if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) { + // when using a colormap, tga_bits_per_pixel is the size of the indexes + // I don't think anything but 8 or 16bit indexes makes sense + stbi__rewind(s); + return 0; + } + tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL); + } else { + tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL); + } + if(!tga_comp) { + stbi__rewind(s); + return 0; + } + if (x) *x = tga_w; + if (y) *y = tga_h; + if (comp) *comp = tga_comp; + return 1; // seems to have passed everything +} + +static int stbi__tga_test(stbi__context *s) +{ + int res = 0; + int sz, tga_color_type; + stbi__get8(s); // discard Offset + tga_color_type = stbi__get8(s); // color type + if ( tga_color_type > 1 ) goto errorEnd; // only RGB or indexed allowed + sz = stbi__get8(s); // image type + if ( tga_color_type == 1 ) { // colormapped (paletted) image + if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9 + stbi__skip(s,4); // skip index of first colormap entry and number of entries + sz = stbi__get8(s); // check bits per palette color entry + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; + stbi__skip(s,4); // skip image x and y origin + } else { // "normal" image w/o colormap + if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE + stbi__skip(s,9); // skip colormap specification and image x/y origin + } + if ( stbi__get16le(s) < 1 ) goto errorEnd; // test width + if ( stbi__get16le(s) < 1 ) goto errorEnd; // test height + sz = stbi__get8(s); // bits per pixel + if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; + + res = 1; // if we got this far, everything's good and we can return 1 instead of 0 + +errorEnd: + stbi__rewind(s); + return res; +} + +// read 16bit value and convert to 24bit RGB +void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out) +{ + stbi__uint16 px = stbi__get16le(s); + stbi__uint16 fiveBitMask = 31; + // we have 3 channels with 5bits each + int r = (px >> 10) & fiveBitMask; + int g = (px >> 5) & fiveBitMask; + int b = px & fiveBitMask; + // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later + out[0] = (r * 255)/31; + out[1] = (g * 255)/31; + out[2] = (b * 255)/31; + + // some people claim that the most significant bit might be used for alpha + // (possibly if an alpha-bit is set in the "image descriptor byte") + // but that only made 16bit test images completely translucent.. + // so let's treat all 15 and 16bit TGAs as RGB with no alpha. +} + +static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + // read in the TGA header stuff + int tga_offset = stbi__get8(s); + int tga_indexed = stbi__get8(s); + int tga_image_type = stbi__get8(s); + int tga_is_RLE = 0; + int tga_palette_start = stbi__get16le(s); + int tga_palette_len = stbi__get16le(s); + int tga_palette_bits = stbi__get8(s); + int tga_x_origin = stbi__get16le(s); + int tga_y_origin = stbi__get16le(s); + int tga_width = stbi__get16le(s); + int tga_height = stbi__get16le(s); + int tga_bits_per_pixel = stbi__get8(s); + int tga_comp, tga_rgb16=0; + int tga_inverted = stbi__get8(s); + // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?) + // image data + unsigned char *tga_data; + unsigned char *tga_palette = NULL; + int i, j; + unsigned char raw_data[4]; + int RLE_count = 0; + int RLE_repeating = 0; + int read_next_pixel = 1; + + // do a tiny bit of precessing + if ( tga_image_type >= 8 ) + { + tga_image_type -= 8; + tga_is_RLE = 1; + } + tga_inverted = 1 - ((tga_inverted >> 5) & 1); + + // If I'm paletted, then I'll use the number of bits from the palette + if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16); + else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16); + + if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency + return stbi__errpuc("bad format", "Can't find out TGA pixelformat"); + + // tga info + *x = tga_width; + *y = tga_height; + if (comp) *comp = tga_comp; + + tga_data = (unsigned char*)stbi__malloc( (size_t)tga_width * tga_height * tga_comp ); + if (!tga_data) return stbi__errpuc("outofmem", "Out of memory"); + + // skip to the data's starting position (offset usually = 0) + stbi__skip(s, tga_offset ); + + if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) { + for (i=0; i < tga_height; ++i) { + int row = tga_inverted ? tga_height -i - 1 : i; + stbi_uc *tga_row = tga_data + row*tga_width*tga_comp; + stbi__getn(s, tga_row, tga_width * tga_comp); + } + } else { + // do I need to load a palette? + if ( tga_indexed) + { + // any data to skip? (offset usually = 0) + stbi__skip(s, tga_palette_start ); + // load the palette + tga_palette = (unsigned char*)stbi__malloc( tga_palette_len * tga_comp ); + if (!tga_palette) { + STBI_FREE(tga_data); + return stbi__errpuc("outofmem", "Out of memory"); + } + if (tga_rgb16) { + stbi_uc *pal_entry = tga_palette; + STBI_ASSERT(tga_comp == STBI_rgb); + for (i=0; i < tga_palette_len; ++i) { + stbi__tga_read_rgb16(s, pal_entry); + pal_entry += tga_comp; + } + } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) { + STBI_FREE(tga_data); + STBI_FREE(tga_palette); + return stbi__errpuc("bad palette", "Corrupt TGA"); + } + } + // load the data + for (i=0; i < tga_width * tga_height; ++i) + { + // if I'm in RLE mode, do I need to get a RLE stbi__pngchunk? + if ( tga_is_RLE ) + { + if ( RLE_count == 0 ) + { + // yep, get the next byte as a RLE command + int RLE_cmd = stbi__get8(s); + RLE_count = 1 + (RLE_cmd & 127); + RLE_repeating = RLE_cmd >> 7; + read_next_pixel = 1; + } else if ( !RLE_repeating ) + { + read_next_pixel = 1; + } + } else + { + read_next_pixel = 1; + } + // OK, if I need to read a pixel, do it now + if ( read_next_pixel ) + { + // load however much data we did have + if ( tga_indexed ) + { + // read in index, then perform the lookup + int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s); + if ( pal_idx >= tga_palette_len ) { + // invalid index + pal_idx = 0; + } + pal_idx *= tga_comp; + for (j = 0; j < tga_comp; ++j) { + raw_data[j] = tga_palette[pal_idx+j]; + } + } else if(tga_rgb16) { + STBI_ASSERT(tga_comp == STBI_rgb); + stbi__tga_read_rgb16(s, raw_data); + } else { + // read in the data raw + for (j = 0; j < tga_comp; ++j) { + raw_data[j] = stbi__get8(s); + } + } + // clear the reading flag for the next pixel + read_next_pixel = 0; + } // end of reading a pixel + + // copy data + for (j = 0; j < tga_comp; ++j) + tga_data[i*tga_comp+j] = raw_data[j]; + + // in case we're in RLE mode, keep counting down + --RLE_count; + } + // do I need to invert the image? + if ( tga_inverted ) + { + for (j = 0; j*2 < tga_height; ++j) + { + int index1 = j * tga_width * tga_comp; + int index2 = (tga_height - 1 - j) * tga_width * tga_comp; + for (i = tga_width * tga_comp; i > 0; --i) + { + unsigned char temp = tga_data[index1]; + tga_data[index1] = tga_data[index2]; + tga_data[index2] = temp; + ++index1; + ++index2; + } + } + } + // clear my palette, if I had one + if ( tga_palette != NULL ) + { + STBI_FREE( tga_palette ); + } + } + + // swap RGB - if the source data was RGB16, it already is in the right order + if (tga_comp >= 3 && !tga_rgb16) + { + unsigned char* tga_pixel = tga_data; + for (i=0; i < tga_width * tga_height; ++i) + { + unsigned char temp = tga_pixel[0]; + tga_pixel[0] = tga_pixel[2]; + tga_pixel[2] = temp; + tga_pixel += tga_comp; + } + } + + // convert to target component count + if (req_comp && req_comp != tga_comp) + tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height); + + // the things I do to get rid of an error message, and yet keep + // Microsoft's C compilers happy... [8^( + tga_palette_start = tga_palette_len = tga_palette_bits = + tga_x_origin = tga_y_origin = 0; + // OK, done + return tga_data; +} +#endif + +// ************************************************************************************************* +// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s) +{ + int r = (stbi__get32be(s) == 0x38425053); + stbi__rewind(s); + return r; +} + +static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + int pixelCount; + int channelCount, compression; + int channel, i, count, len; + int bitdepth; + int w,h; + stbi_uc *out; + + // Check identifier + if (stbi__get32be(s) != 0x38425053) // "8BPS" + return stbi__errpuc("not PSD", "Corrupt PSD image"); + + // Check file type version. + if (stbi__get16be(s) != 1) + return stbi__errpuc("wrong version", "Unsupported version of PSD image"); + + // Skip 6 reserved bytes. + stbi__skip(s, 6 ); + + // Read the number of channels (R, G, B, A, etc). + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) + return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image"); + + // Read the rows and columns of the image. + h = stbi__get32be(s); + w = stbi__get32be(s); + + // Make sure the depth is 8 bits. + bitdepth = stbi__get16be(s); + if (bitdepth != 8 && bitdepth != 16) + return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit"); + + // Make sure the color mode is RGB. + // Valid options are: + // 0: Bitmap + // 1: Grayscale + // 2: Indexed color + // 3: RGB color + // 4: CMYK color + // 7: Multichannel + // 8: Duotone + // 9: Lab color + if (stbi__get16be(s) != 3) + return stbi__errpuc("wrong color format", "PSD is not in RGB color format"); + + // Skip the Mode Data. (It's the palette for indexed color; other info for other modes.) + stbi__skip(s,stbi__get32be(s) ); + + // Skip the image resources. (resolution, pen tool paths, etc) + stbi__skip(s, stbi__get32be(s) ); + + // Skip the reserved data. + stbi__skip(s, stbi__get32be(s) ); + + // Find out if the data is compressed. + // Known values: + // 0: no compression + // 1: RLE compressed + compression = stbi__get16be(s); + if (compression > 1) + return stbi__errpuc("bad compression", "PSD has an unknown compression format"); + + // Create the destination image. + out = (stbi_uc *) stbi__malloc(4 * w*h); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + pixelCount = w*h; + + // Initialize the data to zero. + //memset( out, 0, pixelCount * 4 ); + + // Finally, the image data. + if (compression) { + // RLE as used by .PSD and .TIFF + // Loop until you get the number of unpacked bytes you are expecting: + // Read the next source byte into n. + // If n is between 0 and 127 inclusive, copy the next n+1 bytes literally. + // Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times. + // Else if n is 128, noop. + // Endloop + + // The RLE-compressed data is preceeded by a 2-byte data count for each row in the data, + // which we're going to just skip. + stbi__skip(s, h * channelCount * 2 ); + + // Read the RLE data by channel. + for (channel = 0; channel < 4; channel++) { + stbi_uc *p; + + p = out+channel; + if (channel >= channelCount) { + // Fill this channel with default data. + for (i = 0; i < pixelCount; i++, p += 4) + *p = (channel == 3 ? 255 : 0); + } else { + // Read the RLE data. + count = 0; + while (count < pixelCount) { + len = stbi__get8(s); + if (len == 128) { + // No-op. + } else if (len < 128) { + // Copy next len+1 bytes literally. + len++; + count += len; + while (len) { + *p = stbi__get8(s); + p += 4; + len--; + } + } else if (len > 128) { + stbi_uc val; + // Next -len+1 bytes in the dest are replicated from next source byte. + // (Interpret len as a negative 8-bit int.) + len ^= 0x0FF; + len += 2; + val = stbi__get8(s); + count += len; + while (len) { + *p = val; + p += 4; + len--; + } + } + } + } + } + + } else { + // We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...) + // where each channel consists of an 8-bit value for each pixel in the image. + + // Read the data by channel. + for (channel = 0; channel < 4; channel++) { + stbi_uc *p; + + p = out + channel; + if (channel >= channelCount) { + // Fill this channel with default data. + stbi_uc val = channel == 3 ? 255 : 0; + for (i = 0; i < pixelCount; i++, p += 4) + *p = val; + } else { + // Read the data. + if (bitdepth == 16) { + for (i = 0; i < pixelCount; i++, p += 4) + *p = (stbi_uc) (stbi__get16be(s) >> 8); + } else { + for (i = 0; i < pixelCount; i++, p += 4) + *p = stbi__get8(s); + } + } + } + } + + if (channelCount >= 4) { + for (i=0; i < w*h; ++i) { + unsigned char *pixel = out + 4*i; + if (pixel[3] != 0 && pixel[3] != 255) { + // remove weird white matte from PSD + float a = pixel[3] / 255.0f; + float ra = 1.0f / a; + float inv_a = 255.0f * (1 - ra); + pixel[0] = (unsigned char) (pixel[0]*ra + inv_a); + pixel[1] = (unsigned char) (pixel[1]*ra + inv_a); + pixel[2] = (unsigned char) (pixel[2]*ra + inv_a); + } + } + } + + if (req_comp && req_comp != 4) { + out = stbi__convert_format(out, 4, req_comp, w, h); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + if (comp) *comp = 4; + *y = h; + *x = w; + + return out; +} +#endif + +// ************************************************************************************************* +// Softimage PIC loader +// by Tom Seddon +// +// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format +// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/ + +#ifndef STBI_NO_PIC +static int stbi__pic_is4(stbi__context *s,const char *str) +{ + int i; + for (i=0; i<4; ++i) + if (stbi__get8(s) != (stbi_uc)str[i]) + return 0; + + return 1; +} + +static int stbi__pic_test_core(stbi__context *s) +{ + int i; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) + return 0; + + for(i=0;i<84;++i) + stbi__get8(s); + + if (!stbi__pic_is4(s,"PICT")) + return 0; + + return 1; +} + +typedef struct +{ + stbi_uc size,type,channel; +} stbi__pic_packet; + +static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest) +{ + int mask=0x80, i; + + for (i=0; i<4; ++i, mask>>=1) { + if (channel & mask) { + if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short"); + dest[i]=stbi__get8(s); + } + } + + return dest; +} + +static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src) +{ + int mask=0x80,i; + + for (i=0;i<4; ++i, mask>>=1) + if (channel&mask) + dest[i]=src[i]; +} + +static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result) +{ + int act_comp=0,num_packets=0,y,chained; + stbi__pic_packet packets[10]; + + // this will (should...) cater for even some bizarre stuff like having data + // for the same channel in multiple packets. + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return stbi__errpuc("bad format","too many packets"); + + packet = &packets[num_packets++]; + + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + + act_comp |= packet->channel; + + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (reading packets)"); + if (packet->size != 8) return stbi__errpuc("bad format","packet isn't 8bpp"); + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel? + + for(y=0; ytype) { + default: + return stbi__errpuc("bad format","packet has bad compression type"); + + case 0: {//uncompressed + int x; + + for(x=0;xchannel,dest)) + return 0; + break; + } + + case 1://Pure RLE + { + int left=width, i; + + while (left>0) { + stbi_uc count,value[4]; + + count=stbi__get8(s); + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pure read count)"); + + if (count > left) + count = (stbi_uc) left; + + if (!stbi__readval(s,packet->channel,value)) return 0; + + for(i=0; ichannel,dest,value); + left -= count; + } + } + break; + + case 2: {//Mixed RLE + int left=width; + while (left>0) { + int count = stbi__get8(s), i; + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (mixed read count)"); + + if (count >= 128) { // Repeated + stbi_uc value[4]; + + if (count==128) + count = stbi__get16be(s); + else + count -= 127; + if (count > left) + return stbi__errpuc("bad file","scanline overrun"); + + if (!stbi__readval(s,packet->channel,value)) + return 0; + + for(i=0;ichannel,dest,value); + } else { // Raw + ++count; + if (count>left) return stbi__errpuc("bad file","scanline overrun"); + + for(i=0;ichannel,dest)) + return 0; + } + left-=count; + } + break; + } + } + } + } + + return result; +} + +static stbi_uc *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp) +{ + stbi_uc *result; + int i, x,y; + + for (i=0; i<92; ++i) + stbi__get8(s); + + x = stbi__get16be(s); + y = stbi__get16be(s); + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pic header)"); + if ((1 << 28) / x < y) return stbi__errpuc("too large", "Image too large to decode"); + + stbi__get32be(s); //skip `ratio' + stbi__get16be(s); //skip `fields' + stbi__get16be(s); //skip `pad' + + // intermediate buffer is RGBA + result = (stbi_uc *) stbi__malloc(x*y*4); + memset(result, 0xff, x*y*4); + + if (!stbi__pic_load_core(s,x,y,comp, result)) { + STBI_FREE(result); + result=0; + } + *px = x; + *py = y; + if (req_comp == 0) req_comp = *comp; + result=stbi__convert_format(result,4,req_comp,x,y); + + return result; +} + +static int stbi__pic_test(stbi__context *s) +{ + int r = stbi__pic_test_core(s); + stbi__rewind(s); + return r; +} +#endif + +// ************************************************************************************************* +// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb + +#ifndef STBI_NO_GIF +typedef struct +{ + stbi__int16 prefix; + stbi_uc first; + stbi_uc suffix; +} stbi__gif_lzw; + +typedef struct +{ + int w,h; + stbi_uc *out, *old_out; // output buffer (always 4 components) + int flags, bgindex, ratio, transparent, eflags, delay; + stbi_uc pal[256][4]; + stbi_uc lpal[256][4]; + stbi__gif_lzw codes[4096]; + stbi_uc *color_table; + int parse, step; + int lflags; + int start_x, start_y; + int max_x, max_y; + int cur_x, cur_y; + int line_size; +} stbi__gif; + +static int stbi__gif_test_raw(stbi__context *s) +{ + int sz; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0; + sz = stbi__get8(s); + if (sz != '9' && sz != '7') return 0; + if (stbi__get8(s) != 'a') return 0; + return 1; +} + +static int stbi__gif_test(stbi__context *s) +{ + int r = stbi__gif_test_raw(s); + stbi__rewind(s); + return r; +} + +static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp) +{ + int i; + for (i=0; i < num_entries; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + pal[i][3] = transp == i ? 0 : 255; + } +} + +static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info) +{ + stbi_uc version; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') + return stbi__err("not GIF", "Corrupt GIF"); + + version = stbi__get8(s); + if (version != '7' && version != '9') return stbi__err("not GIF", "Corrupt GIF"); + if (stbi__get8(s) != 'a') return stbi__err("not GIF", "Corrupt GIF"); + + stbi__g_failure_reason = ""; + g->w = stbi__get16le(s); + g->h = stbi__get16le(s); + g->flags = stbi__get8(s); + g->bgindex = stbi__get8(s); + g->ratio = stbi__get8(s); + g->transparent = -1; + + if (comp != 0) *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments + + if (is_info) return 1; + + if (g->flags & 0x80) + stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1); + + return 1; +} + +static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif)); + if (!stbi__gif_header(s, g, comp, 1)) { + STBI_FREE(g); + stbi__rewind( s ); + return 0; + } + if (x) *x = g->w; + if (y) *y = g->h; + STBI_FREE(g); + return 1; +} + +static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) +{ + stbi_uc *p, *c; + + // recurse to decode the prefixes, since the linked-list is backwards, + // and working backwards through an interleaved image would be nasty + if (g->codes[code].prefix >= 0) + stbi__out_gif_code(g, g->codes[code].prefix); + + if (g->cur_y >= g->max_y) return; + + p = &g->out[g->cur_x + g->cur_y]; + c = &g->color_table[g->codes[code].suffix * 4]; + + if (c[3] >= 128) { + p[0] = c[2]; + p[1] = c[1]; + p[2] = c[0]; + p[3] = c[3]; + } + g->cur_x += 4; + + if (g->cur_x >= g->max_x) { + g->cur_x = g->start_x; + g->cur_y += g->step; + + while (g->cur_y >= g->max_y && g->parse > 0) { + g->step = (1 << g->parse) * g->line_size; + g->cur_y = g->start_y + (g->step >> 1); + --g->parse; + } + } +} + +static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) +{ + stbi_uc lzw_cs; + stbi__int32 len, init_code; + stbi__uint32 first; + stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear; + stbi__gif_lzw *p; + + lzw_cs = stbi__get8(s); + if (lzw_cs > 12) return NULL; + clear = 1 << lzw_cs; + first = 1; + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + bits = 0; + valid_bits = 0; + for (init_code = 0; init_code < clear; init_code++) { + g->codes[init_code].prefix = -1; + g->codes[init_code].first = (stbi_uc) init_code; + g->codes[init_code].suffix = (stbi_uc) init_code; + } + + // support no starting clear code + avail = clear+2; + oldcode = -1; + + len = 0; + for(;;) { + if (valid_bits < codesize) { + if (len == 0) { + len = stbi__get8(s); // start new block + if (len == 0) + return g->out; + } + --len; + bits |= (stbi__int32) stbi__get8(s) << valid_bits; + valid_bits += 8; + } else { + stbi__int32 code = bits & codemask; + bits >>= codesize; + valid_bits -= codesize; + // @OPTIMIZE: is there some way we can accelerate the non-clear path? + if (code == clear) { // clear code + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + avail = clear + 2; + oldcode = -1; + first = 0; + } else if (code == clear + 1) { // end of stream code + stbi__skip(s, len); + while ((len = stbi__get8(s)) > 0) + stbi__skip(s,len); + return g->out; + } else if (code <= avail) { + if (first) return stbi__errpuc("no clear code", "Corrupt GIF"); + + if (oldcode >= 0) { + p = &g->codes[avail++]; + if (avail > 4096) return stbi__errpuc("too many codes", "Corrupt GIF"); + p->prefix = (stbi__int16) oldcode; + p->first = g->codes[oldcode].first; + p->suffix = (code == avail) ? p->first : g->codes[code].first; + } else if (code == avail) + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + + stbi__out_gif_code(g, (stbi__uint16) code); + + if ((avail & codemask) == 0 && avail <= 0x0FFF) { + codesize++; + codemask = (1 << codesize) - 1; + } + + oldcode = code; + } else { + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + } + } + } +} + +static void stbi__fill_gif_background(stbi__gif *g, int x0, int y0, int x1, int y1) +{ + int x, y; + stbi_uc *c = g->pal[g->bgindex]; + for (y = y0; y < y1; y += 4 * g->w) { + for (x = x0; x < x1; x += 4) { + stbi_uc *p = &g->out[y + x]; + p[0] = c[2]; + p[1] = c[1]; + p[2] = c[0]; + p[3] = 0; + } + } +} + +// this function is designed to support animated gifs, although stb_image doesn't support it +static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp) +{ + int i; + stbi_uc *prev_out = 0; + + if (g->out == 0 && !stbi__gif_header(s, g, comp,0)) + return 0; // stbi__g_failure_reason set by stbi__gif_header + + prev_out = g->out; + g->out = (stbi_uc *) stbi__malloc(4 * g->w * g->h); + if (g->out == 0) return stbi__errpuc("outofmem", "Out of memory"); + + switch ((g->eflags & 0x1C) >> 2) { + case 0: // unspecified (also always used on 1st frame) + stbi__fill_gif_background(g, 0, 0, 4 * g->w, 4 * g->w * g->h); + break; + case 1: // do not dispose + if (prev_out) memcpy(g->out, prev_out, 4 * g->w * g->h); + g->old_out = prev_out; + break; + case 2: // dispose to background + if (prev_out) memcpy(g->out, prev_out, 4 * g->w * g->h); + stbi__fill_gif_background(g, g->start_x, g->start_y, g->max_x, g->max_y); + break; + case 3: // dispose to previous + if (g->old_out) { + for (i = g->start_y; i < g->max_y; i += 4 * g->w) + memcpy(&g->out[i + g->start_x], &g->old_out[i + g->start_x], g->max_x - g->start_x); + } + break; + } + + for (;;) { + switch (stbi__get8(s)) { + case 0x2C: /* Image Descriptor */ + { + int prev_trans = -1; + stbi__int32 x, y, w, h; + stbi_uc *o; + + x = stbi__get16le(s); + y = stbi__get16le(s); + w = stbi__get16le(s); + h = stbi__get16le(s); + if (((x + w) > (g->w)) || ((y + h) > (g->h))) + return stbi__errpuc("bad Image Descriptor", "Corrupt GIF"); + + g->line_size = g->w * 4; + g->start_x = x * 4; + g->start_y = y * g->line_size; + g->max_x = g->start_x + w * 4; + g->max_y = g->start_y + h * g->line_size; + g->cur_x = g->start_x; + g->cur_y = g->start_y; + + g->lflags = stbi__get8(s); + + if (g->lflags & 0x40) { + g->step = 8 * g->line_size; // first interlaced spacing + g->parse = 3; + } else { + g->step = g->line_size; + g->parse = 0; + } + + if (g->lflags & 0x80) { + stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1); + g->color_table = (stbi_uc *) g->lpal; + } else if (g->flags & 0x80) { + if (g->transparent >= 0 && (g->eflags & 0x01)) { + prev_trans = g->pal[g->transparent][3]; + g->pal[g->transparent][3] = 0; + } + g->color_table = (stbi_uc *) g->pal; + } else + return stbi__errpuc("missing color table", "Corrupt GIF"); + + o = stbi__process_gif_raster(s, g); + if (o == NULL) return NULL; + + if (prev_trans != -1) + g->pal[g->transparent][3] = (stbi_uc) prev_trans; + + return o; + } + + case 0x21: // Comment Extension. + { + int len; + if (stbi__get8(s) == 0xF9) { // Graphic Control Extension. + len = stbi__get8(s); + if (len == 4) { + g->eflags = stbi__get8(s); + g->delay = stbi__get16le(s); + g->transparent = stbi__get8(s); + } else { + stbi__skip(s, len); + break; + } + } + while ((len = stbi__get8(s)) != 0) + stbi__skip(s, len); + break; + } + + case 0x3B: // gif stream termination code + return (stbi_uc *) s; // using '1' causes warning on some compilers + + default: + return stbi__errpuc("unknown code", "Corrupt GIF"); + } + } + + STBI_NOTUSED(req_comp); +} + +static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi_uc *u = 0; + stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif)); + memset(g, 0, sizeof(*g)); + + u = stbi__gif_load_next(s, g, comp, req_comp); + if (u == (stbi_uc *) s) u = 0; // end of animated gif marker + if (u) { + *x = g->w; + *y = g->h; + if (req_comp && req_comp != 4) + u = stbi__convert_format(u, 4, req_comp, g->w, g->h); + } + else if (g->out) + STBI_FREE(g->out); + STBI_FREE(g); + return u; +} + +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp) +{ + return stbi__gif_info_raw(s,x,y,comp); +} +#endif + +// ************************************************************************************************* +// Radiance RGBE HDR loader +// originally by Nicolas Schulz +#ifndef STBI_NO_HDR +static int stbi__hdr_test_core(stbi__context *s) +{ + const char *signature = "#?RADIANCE\n"; + int i; + for (i=0; signature[i]; ++i) + if (stbi__get8(s) != signature[i]) + return 0; + return 1; +} + +static int stbi__hdr_test(stbi__context* s) +{ + int r = stbi__hdr_test_core(s); + stbi__rewind(s); + return r; +} + +#define STBI__HDR_BUFLEN 1024 +static char *stbi__hdr_gettoken(stbi__context *z, char *buffer) +{ + int len=0; + char c = '\0'; + + c = (char) stbi__get8(z); + + while (!stbi__at_eof(z) && c != '\n') { + buffer[len++] = c; + if (len == STBI__HDR_BUFLEN-1) { + // flush to end of line + while (!stbi__at_eof(z) && stbi__get8(z) != '\n') + ; + break; + } + c = (char) stbi__get8(z); + } + + buffer[len] = 0; + return buffer; +} + +static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp) +{ + if ( input[3] != 0 ) { + float f1; + // Exponent + f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8)); + if (req_comp <= 2) + output[0] = (input[0] + input[1] + input[2]) * f1 / 3; + else { + output[0] = input[0] * f1; + output[1] = input[1] * f1; + output[2] = input[2] * f1; + } + if (req_comp == 2) output[1] = 1; + if (req_comp == 4) output[3] = 1; + } else { + switch (req_comp) { + case 4: output[3] = 1; /* fallthrough */ + case 3: output[0] = output[1] = output[2] = 0; + break; + case 2: output[1] = 1; /* fallthrough */ + case 1: output[0] = 0; + break; + } + } +} + +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + int width, height; + stbi_uc *scanline; + float *hdr_data; + int len; + unsigned char count, value; + int i, j, k, c1,c2, z; + + + // Check identifier + if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0) + return stbi__errpf("not HDR", "Corrupt HDR image"); + + // Parse header + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) return stbi__errpf("unsupported format", "Unsupported HDR format"); + + // Parse width and height + // can't use sscanf() if we're not using stdio! + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + height = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + width = (int) strtol(token, NULL, 10); + + *x = width; + *y = height; + + if (comp) *comp = 3; + if (req_comp == 0) req_comp = 3; + + // Read data + hdr_data = (float *) stbi__malloc(height * width * req_comp * sizeof(float)); + + // Load image data + // image data is stored as some number of sca + if ( width < 8 || width >= 32768) { + // Read flat data + for (j=0; j < height; ++j) { + for (i=0; i < width; ++i) { + stbi_uc rgbe[4]; + main_decode_loop: + stbi__getn(s, rgbe, 4); + stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp); + } + } + } else { + // Read RLE-encoded data + scanline = NULL; + + for (j = 0; j < height; ++j) { + c1 = stbi__get8(s); + c2 = stbi__get8(s); + len = stbi__get8(s); + if (c1 != 2 || c2 != 2 || (len & 0x80)) { + // not run-length encoded, so we have to actually use THIS data as a decoded + // pixel (note this can't be a valid pixel--one of RGB must be >= 128) + stbi_uc rgbe[4]; + rgbe[0] = (stbi_uc) c1; + rgbe[1] = (stbi_uc) c2; + rgbe[2] = (stbi_uc) len; + rgbe[3] = (stbi_uc) stbi__get8(s); + stbi__hdr_convert(hdr_data, rgbe, req_comp); + i = 1; + j = 0; + STBI_FREE(scanline); + goto main_decode_loop; // yes, this makes no sense + } + len <<= 8; + len |= stbi__get8(s); + if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); } + if (scanline == NULL) scanline = (stbi_uc *) stbi__malloc(width * 4); + + for (k = 0; k < 4; ++k) { + i = 0; + while (i < width) { + count = stbi__get8(s); + if (count > 128) { + // Run + value = stbi__get8(s); + count -= 128; + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = value; + } else { + // Dump + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = stbi__get8(s); + } + } + } + for (i=0; i < width; ++i) + stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp); + } + STBI_FREE(scanline); + } + + return hdr_data; +} + +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + + if (stbi__hdr_test(s) == 0) { + stbi__rewind( s ); + return 0; + } + + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) { + stbi__rewind( s ); + return 0; + } + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *y = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *x = (int) strtol(token, NULL, 10); + *comp = 3; + return 1; +} +#endif // STBI_NO_HDR + +#ifndef STBI_NO_BMP +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) +{ + void *p; + stbi__bmp_data info; + + info.all_a = 255; + p = stbi__bmp_parse_header(s, &info); + stbi__rewind( s ); + if (p == NULL) + return 0; + *x = s->img_x; + *y = s->img_y; + *comp = info.ma ? 4 : 3; + return 1; +} +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp) +{ + int channelCount; + if (stbi__get32be(s) != 0x38425053) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 1) { + stbi__rewind( s ); + return 0; + } + stbi__skip(s, 6); + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) { + stbi__rewind( s ); + return 0; + } + *y = stbi__get32be(s); + *x = stbi__get32be(s); + if (stbi__get16be(s) != 8) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 3) { + stbi__rewind( s ); + return 0; + } + *comp = 4; + return 1; +} +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp) +{ + int act_comp=0,num_packets=0,chained; + stbi__pic_packet packets[10]; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) { + stbi__rewind(s); + return 0; + } + + stbi__skip(s, 88); + + *x = stbi__get16be(s); + *y = stbi__get16be(s); + if (stbi__at_eof(s)) { + stbi__rewind( s); + return 0; + } + if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) { + stbi__rewind( s ); + return 0; + } + + stbi__skip(s, 8); + + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return 0; + + packet = &packets[num_packets++]; + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + act_comp |= packet->channel; + + if (stbi__at_eof(s)) { + stbi__rewind( s ); + return 0; + } + if (packet->size != 8) { + stbi__rewind( s ); + return 0; + } + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); + + return 1; +} +#endif + +// ************************************************************************************************* +// Portable Gray Map and Portable Pixel Map loader +// by Ken Miller +// +// PGM: http://netpbm.sourceforge.net/doc/pgm.html +// PPM: http://netpbm.sourceforge.net/doc/ppm.html +// +// Known limitations: +// Does not support comments in the header section +// Does not support ASCII image data (formats P2 and P3) +// Does not support 16-bit-per-channel + +#ifndef STBI_NO_PNM + +static int stbi__pnm_test(stbi__context *s) +{ + char p, t; + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind( s ); + return 0; + } + return 1; +} + +static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi_uc *out; + if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n)) + return 0; + *x = s->img_x; + *y = s->img_y; + *comp = s->img_n; + + out = (stbi_uc *) stbi__malloc(s->img_n * s->img_x * s->img_y); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + stbi__getn(s, out, s->img_n * s->img_x * s->img_y); + + if (req_comp && req_comp != s->img_n) { + out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + return out; +} + +static int stbi__pnm_isspace(char c) +{ + return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r'; +} + +static void stbi__pnm_skip_whitespace(stbi__context *s, char *c) +{ + for (;;) { + while (!stbi__at_eof(s) && stbi__pnm_isspace(*c)) + *c = (char) stbi__get8(s); + + if (stbi__at_eof(s) || *c != '#') + break; + + while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' ) + *c = (char) stbi__get8(s); + } +} + +static int stbi__pnm_isdigit(char c) +{ + return c >= '0' && c <= '9'; +} + +static int stbi__pnm_getinteger(stbi__context *s, char *c) +{ + int value = 0; + + while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { + value = value*10 + (*c - '0'); + *c = (char) stbi__get8(s); + } + + return value; +} + +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) +{ + int maxv; + char c, p, t; + + stbi__rewind( s ); + + // Get identifier + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind( s ); + return 0; + } + + *comp = (t == '6') ? 3 : 1; // '5' is 1-component .pgm; '6' is 3-component .ppm + + c = (char) stbi__get8(s); + stbi__pnm_skip_whitespace(s, &c); + + *x = stbi__pnm_getinteger(s, &c); // read width + stbi__pnm_skip_whitespace(s, &c); + + *y = stbi__pnm_getinteger(s, &c); // read height + stbi__pnm_skip_whitespace(s, &c); + + maxv = stbi__pnm_getinteger(s, &c); // read max value + + if (maxv > 255) + return stbi__err("max value > 255", "PPM image not 8-bit"); + else + return 1; +} +#endif + +static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp) +{ + #ifndef STBI_NO_JPEG + if (stbi__jpeg_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNG + if (stbi__png_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_GIF + if (stbi__gif_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_BMP + if (stbi__bmp_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PSD + if (stbi__psd_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PIC + if (stbi__pic_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNM + if (stbi__pnm_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_info(s, x, y, comp)) return 1; + #endif + + // test tga last because it's a crappy test! + #ifndef STBI_NO_TGA + if (stbi__tga_info(s, x, y, comp)) + return 1; + #endif + return stbi__err("unknown image type", "Image not of any known type, or corrupt"); +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result; + if (!f) return stbi__err("can't fopen", "Unable to open file"); + result = stbi_info_from_file(f, x, y, comp); + fclose(f); + return result; +} + +STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp) +{ + int r; + stbi__context s; + long pos = ftell(f); + stbi__start_file(&s, f); + r = stbi__info_main(&s,x,y,comp); + fseek(f,pos,SEEK_SET); + return r; +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__info_main(&s,x,y,comp); +} + +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); + return stbi__info_main(&s,x,y,comp); +} + +#endif // STB_IMAGE_IMPLEMENTATION + +/* + revision history: + 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes + 2.11 (2016-04-02) allocate large structures on the stack + remove white matting for transparent PSD + fix reported channel count for PNG & BMP + re-enable SSE2 in non-gcc 64-bit + support RGB-formatted JPEG + read 16-bit PNGs (only as 8-bit) + 2.10 (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED + 2.09 (2016-01-16) allow comments in PNM files + 16-bit-per-pixel TGA (not bit-per-component) + info() for TGA could break due to .hdr handling + info() for BMP to shares code instead of sloppy parse + can use STBI_REALLOC_SIZED if allocator doesn't support realloc + code cleanup + 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA + 2.07 (2015-09-13) fix compiler warnings + partial animated GIF support + limited 16-bpc PSD support + #ifdef unused functions + bug with < 92 byte PIC,PNM,HDR,TGA + 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value + 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning + 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit + 2.03 (2015-04-12) extra corruption checking (mmozeiko) + stbi_set_flip_vertically_on_load (nguillemot) + fix NEON support; fix mingw support + 2.02 (2015-01-19) fix incorrect assert, fix warning + 2.01 (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2 + 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG + 2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) + progressive JPEG (stb) + PGM/PPM support (Ken Miller) + STBI_MALLOC,STBI_REALLOC,STBI_FREE + GIF bugfix -- seemingly never worked + STBI_NO_*, STBI_ONLY_* + 1.48 (2014-12-14) fix incorrectly-named assert() + 1.47 (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb) + optimize PNG (ryg) + fix bug in interlaced PNG with user-specified channel count (stb) + 1.46 (2014-08-26) + fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG + 1.45 (2014-08-16) + fix MSVC-ARM internal compiler error by wrapping malloc + 1.44 (2014-08-07) + various warning fixes from Ronny Chevalier + 1.43 (2014-07-15) + fix MSVC-only compiler problem in code changed in 1.42 + 1.42 (2014-07-09) + don't define _CRT_SECURE_NO_WARNINGS (affects user code) + fixes to stbi__cleanup_jpeg path + added STBI_ASSERT to avoid requiring assert.h + 1.41 (2014-06-25) + fix search&replace from 1.36 that messed up comments/error messages + 1.40 (2014-06-22) + fix gcc struct-initialization warning + 1.39 (2014-06-15) + fix to TGA optimization when req_comp != number of components in TGA; + fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite) + add support for BMP version 5 (more ignored fields) + 1.38 (2014-06-06) + suppress MSVC warnings on integer casts truncating values + fix accidental rename of 'skip' field of I/O + 1.37 (2014-06-04) + remove duplicate typedef + 1.36 (2014-06-03) + convert to header file single-file library + if de-iphone isn't set, load iphone images color-swapped instead of returning NULL + 1.35 (2014-05-27) + various warnings + fix broken STBI_SIMD path + fix bug where stbi_load_from_file no longer left file pointer in correct place + fix broken non-easy path for 32-bit BMP (possibly never used) + TGA optimization by Arseny Kapoulkine + 1.34 (unknown) + use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case + 1.33 (2011-07-14) + make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements + 1.32 (2011-07-13) + support for "info" function for all supported filetypes (SpartanJ) + 1.31 (2011-06-20) + a few more leak fixes, bug in PNG handling (SpartanJ) + 1.30 (2011-06-11) + added ability to load files via callbacks to accomidate custom input streams (Ben Wenger) + removed deprecated format-specific test/load functions + removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway + error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) + fix inefficiency in decoding 32-bit BMP (David Woo) + 1.29 (2010-08-16) + various warning fixes from Aurelien Pocheville + 1.28 (2010-08-01) + fix bug in GIF palette transparency (SpartanJ) + 1.27 (2010-08-01) + cast-to-stbi_uc to fix warnings + 1.26 (2010-07-24) + fix bug in file buffering for PNG reported by SpartanJ + 1.25 (2010-07-17) + refix trans_data warning (Won Chun) + 1.24 (2010-07-12) + perf improvements reading from files on platforms with lock-heavy fgetc() + minor perf improvements for jpeg + deprecated type-specific functions so we'll get feedback if they're needed + attempt to fix trans_data warning (Won Chun) + 1.23 fixed bug in iPhone support + 1.22 (2010-07-10) + removed image *writing* support + stbi_info support from Jetro Lauha + GIF support from Jean-Marc Lienher + iPhone PNG-extensions from James Brown + warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva) + 1.21 fix use of 'stbi_uc' in header (reported by jon blow) + 1.20 added support for Softimage PIC, by Tom Seddon + 1.19 bug in interlaced PNG corruption check (found by ryg) + 1.18 (2008-08-02) + fix a threading bug (local mutable static) + 1.17 support interlaced PNG + 1.16 major bugfix - stbi__convert_format converted one too many pixels + 1.15 initialize some fields for thread safety + 1.14 fix threadsafe conversion bug + header-file-only version (#define STBI_HEADER_FILE_ONLY before including) + 1.13 threadsafe + 1.12 const qualifiers in the API + 1.11 Support installable IDCT, colorspace conversion routines + 1.10 Fixes for 64-bit (don't use "unsigned long") + optimized upsampling by Fabian "ryg" Giesen + 1.09 Fix format-conversion for PSD code (bad global variables!) + 1.08 Thatcher Ulrich's PSD code integrated by Nicolas Schulz + 1.07 attempt to fix C++ warning/errors again + 1.06 attempt to fix C++ warning/errors again + 1.05 fix TGA loading to return correct *comp and use good luminance calc + 1.04 default float alpha is 1, not 255; use 'void *' for stbi_image_free + 1.03 bugfixes to STBI_NO_STDIO, STBI_NO_HDR + 1.02 support for (subset of) HDR files, float interface for preferred access to them + 1.01 fix bug: possible bug in handling right-side up bmps... not sure + fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all + 1.00 interface to zlib that skips zlib header + 0.99 correct handling of alpha in palette + 0.98 TGA loader by lonesock; dynamically add loaders (untested) + 0.97 jpeg errors on too large a file; also catch another malloc failure + 0.96 fix detection of invalid v value - particleman@mollyrocket forum + 0.95 during header scan, seek to markers in case of padding + 0.94 STBI_NO_STDIO to disable stdio usage; rename all #defines the same + 0.93 handle jpegtran output; verbose errors + 0.92 read 4,8,16,24,32-bit BMP files of several formats + 0.91 output 24-bit Windows 3.0 BMP files + 0.90 fix a few more warnings; bump version number to approach 1.0 + 0.61 bugfixes due to Marc LeBlanc, Christopher Lloyd + 0.60 fix compiling as c++ + 0.59 fix warnings: merge Dave Moore's -Wall fixes + 0.58 fix bug: zlib uncompressed mode len/nlen was wrong endian + 0.57 fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available + 0.56 fix bug: zlib uncompressed mode len vs. nlen + 0.55 fix bug: restart_interval not initialized to 0 + 0.54 allow NULL for 'int *comp' + 0.53 fix bug in png 3->4; speedup png decoding + 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments + 0.51 obey req_comp requests, 1-component jpegs return as 1-component, + on 'test' only check type, not whether we support this variant + 0.50 (2006-11-19) + first released version +*/ diff --git a/source/samples/OpenGL/OpenGLSample.cpp b/source/samples/OpenGL/OpenGLSample.cpp index c9190352..7996ee13 100644 --- a/source/samples/OpenGL/OpenGLSample.cpp +++ b/source/samples/OpenGL/OpenGLSample.cpp @@ -5,171 +5,109 @@ * See license in Gwork.h */ -#define WIN32_LEAN_AND_MEAN -#include - #include +#include #include #include #include -#include - +#include #ifdef USE_DEBUG_FONT -#include +# include #else -#include +# include #endif -#include "gl/glew.h" +#include +//#include + -HWND CreateGameWindow(void) +static Gwk::Input::GLFW GworkInput; + +static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) { - WNDCLASSW wc; - ZeroMemory(&wc, sizeof(wc)); - wc.style = CS_HREDRAW|CS_VREDRAW|CS_OWNDC; - wc.lpfnWndProc = DefWindowProc; - wc.hInstance = GetModuleHandle(nullptr); - wc.lpszClassName = L"GworkWindow"; - wc.hCursor = LoadCursor(nullptr, IDC_ARROW); - RegisterClassW(&wc); -#ifdef USE_DEBUG_FONT - HWND hWindow = CreateWindowExW((WS_EX_APPWINDOW|WS_EX_WINDOWEDGE), wc.lpszClassName, - L"Gwork - OpenGL Sample (Using embedded debug font renderer)", - (WS_OVERLAPPEDWINDOW|WS_CLIPSIBLINGS| - WS_CLIPCHILDREN)&~(WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_THICKFRAME), - -1, -1, 1004, 650, nullptr, nullptr, GetModuleHandle( - nullptr), nullptr); -#else - HWND hWindow = CreateWindowExW((WS_EX_APPWINDOW|WS_EX_WINDOWEDGE), wc.lpszClassName, - L"Gwork - OpenGL Sample (No cross platform way to render fonts in OpenGL)", - (WS_OVERLAPPEDWINDOW|WS_CLIPSIBLINGS| - WS_CLIPCHILDREN)&~(WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_THICKFRAME), -1, -1, 1004, 650, nullptr, nullptr, - GetModuleHandle(nullptr), nullptr); -#endif // ifdef USE_DEBUG_FONT - ShowWindow(hWindow, SW_SHOW); - SetForegroundWindow(hWindow); - SetFocus(hWindow); - return hWindow; + const Gwk::Input::GLFW::KeyEvent evt = { key, scancode, action, mods }; + GworkInput.ProcessKeyEvent(evt); } -HWND g_hWND = nullptr; +static void cursor_pos_callback(GLFWwindow* window, double xpos, double ypos) +{ + GworkInput.ProcessMouseMove(xpos, ypos); +} -HGLRC CreateOpenGLDeviceContext() +static void mouse_button_callback(GLFWwindow* window, int button, int action, int mods) { - PIXELFORMATDESCRIPTOR pfd = { 0 }; - pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR); // just its size - pfd.nVersion = 1; // always 1 - pfd.dwFlags = PFD_SUPPORT_OPENGL| // OpenGL support - not DirectDraw - PFD_DOUBLEBUFFER| // double buffering support - PFD_DRAW_TO_WINDOW; // draw to the app window, not to a - // bitmap image - pfd.iPixelType = PFD_TYPE_RGBA; // red, green, blue, alpha for each - // pixel - pfd.cColorBits = 24; // 24 bit == 8 bits for red, 8 for - // green, 8 for blue. - // This count of color bits EXCLUDES alpha. - pfd.cDepthBits = 32; // 32 bits to measure pixel depth. - int pixelFormat = ChoosePixelFormat(GetDC(g_hWND), &pfd); - - if (pixelFormat == 0) - FatalAppExit(nullptr, TEXT("ChoosePixelFormat() failed!")); - - SetPixelFormat(GetDC(g_hWND), pixelFormat, &pfd); - HGLRC OpenGLContext = wglCreateContext(GetDC(g_hWND)); - wglMakeCurrent(GetDC(g_hWND), OpenGLContext); - RECT r; - - if (GetClientRect(g_hWND, &r)) - { - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(r.left, r.right, r.bottom, r.top, -1.0, 1.0); - glMatrixMode(GL_MODELVIEW); - glViewport(0, 0, r.right-r.left, r.bottom-r.top); - } + GworkInput.ProcessMouseButtons(button, action, mods); +} - return OpenGLContext; +static void scroll_callback(GLFWwindow* window, double xoffset, double yoffset) +{ + GworkInput.ProcessScroll(xoffset, yoffset); } + int main() { - // + if (!glfwInit()) + return -1; + // Create a new window - // - g_hWND = CreateGameWindow(); - // - // Create OpenGL Device - // - HGLRC OpenGLContext = CreateOpenGLDeviceContext(); - // + GLFWwindow* window = glfwCreateWindow(1024, 768, "Gwork: OpenGL", NULL, NULL); + if (!window) + { + glfwTerminate(); + return -1; + } + glfwMakeContextCurrent(window); + + Gwk::Rect r(0,0, 1024,768); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(r.x, r.x + r.w, r.y, r.y + r.h, -1.0, 1.0); + glMatrixMode(GL_MODELVIEW); + glViewport(0, 0, r.w, r.h); + // Create a Gwork OpenGL Renderer - // #ifdef USE_DEBUG_FONT Gwk::Renderer::OpenGL* renderer = new Gwk::Renderer::OpenGL_DebugFont(); #else Gwk::Renderer::OpenGL* renderer = new Gwk::Renderer::OpenGL(); #endif renderer->Init(); - // + // Create a Gwork skin - // Gwk::Skin::TexturedBase* skin = new Gwk::Skin::TexturedBase(renderer); skin->Init("DefaultSkin.png"); - // + // Create a Canvas (it's root, on which all other Gwork panels are created) - // Gwk::Controls::Canvas* canvas = new Gwk::Controls::Canvas(skin); - canvas->SetSize(998, 650-24); + canvas->SetSize(r.w, r.h); canvas->SetDrawBackground(true); canvas->SetBackgroundColor(Gwk::Color(150, 170, 170, 255)); - // + // Create our unittest control (which is a Window with controls in it) - // - UnitTest* unit = new UnitTest(canvas); - unit->SetPos(10, 10); - // - // Create a Windows Control helper - // (Processes Windows MSG's and fires input at Gwork) - // - Gwk::Input::Windows GworkInput; + new TestFrame(canvas); GworkInput.Initialize(canvas); - // + + glfwSetKeyCallback(window, key_callback); + glfwSetCursorPosCallback(window, cursor_pos_callback); + glfwSetMouseButtonCallback(window, mouse_button_callback); + glfwSetScrollCallback(window, scroll_callback); + // Begin the main game loop - // - MSG msg; - - while (true) + while (!glfwWindowShouldClose(window)) { - // Skip out if the window is closed - if (!IsWindowVisible(g_hWND)) - break; - - // If we have a message from windows.. - if (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) - { - // .. give it to the input handler to process - GworkInput.ProcessMessage(msg); - - // if it's QUIT then quit.. - if (msg.message == WM_QUIT) - break; - - // Handle the regular window stuff.. - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - // Main OpenGL Render Loop - { - glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); - canvas->RenderCanvas(); - SwapBuffers(GetDC(g_hWND)); - } + glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); + canvas->RenderCanvas(); + glfwSwapBuffers(window); + + glfwPollEvents(); + + Gwk::Platform::Sleep(0); } // Clean up OpenGL - wglMakeCurrent(nullptr, nullptr); - wglDeleteContext(OpenGLContext); + glfwTerminate(); delete canvas; delete skin; delete renderer; } + From a3ab20c6351b61298a40efdecb6046816a79528b Mon Sep 17 00:00:00 2001 From: BQ Date: Tue, 17 May 2016 14:49:48 +0100 Subject: [PATCH 12/54] OpenGL renders using GLFW. - No font renderering. --- source/platform/include/Gwork/PlatformTypes.h | 4 ++ .../platform/include/Gwork/Renderers/OpenGL.h | 30 ++++----- source/platform/renderers/OpenGL/OpenGL.cpp | 64 +++++++++---------- source/samples/OpenGL/OpenGLSample.cpp | 15 ++--- 4 files changed, 54 insertions(+), 59 deletions(-) diff --git a/source/platform/include/Gwork/PlatformTypes.h b/source/platform/include/Gwork/PlatformTypes.h index f8740323..4c8533f1 100644 --- a/source/platform/include/Gwork/PlatformTypes.h +++ b/source/platform/include/Gwork/PlatformTypes.h @@ -94,6 +94,10 @@ namespace Gwk : x(x_), y(y_), w(w_), h(h_) {} + Rect(const Point& o, const Point& sz) + : x(o.x), y(o.y), w(sz.x), h(sz.y) + {} + bool operator == (const Rect &other) const { return x == other.x && y == other.y && w == other.w && h == other.h; diff --git a/source/platform/include/Gwork/Renderers/OpenGL.h b/source/platform/include/Gwork/Renderers/OpenGL.h index 743425da..80ba8d79 100644 --- a/source/platform/include/Gwork/Renderers/OpenGL.h +++ b/source/platform/include/Gwork/Renderers/OpenGL.h @@ -18,15 +18,7 @@ namespace Gwk { public: - struct Vertex - { - float x, y, z; - float u, v; - unsigned char r, g, b, a; - }; - - - OpenGL(); + OpenGL(const Gwk::Rect& viewRect); virtual ~OpenGL(); void Init() override; @@ -42,8 +34,8 @@ namespace Gwk void DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect targetRect, float u1 = 0.0f, float v1 = 0.0f, float u2 = 1.0f, float v2 = 1.0f) override; - void LoadTexture(Gwk::Texture* texture) override; - void FreeTexture(Gwk::Texture* texture) override; + void LoadTexture(Gwk::Texture* texture) override; + void FreeTexture(Gwk::Texture* texture) override; Gwk::Color PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, @@ -51,15 +43,23 @@ namespace Gwk protected: + Rect m_viewRect; + Color m_color; + static const int MaxVerts = 1024; + struct Vertex + { + float x, y, z; + float u, v; + unsigned char r, g, b, a; + }; + + int m_vertNum; + Vertex m_vertices[ MaxVerts ]; void Flush(); void AddVert(int x, int y, float u = 0.0f, float v = 0.0f); - Gwk::Color m_color; - int m_vertNum; - Vertex m_vertices[ MaxVerts ]; - public: bool InitializeContext(Gwk::WindowProvider* window) override; diff --git a/source/platform/renderers/OpenGL/OpenGL.cpp b/source/platform/renderers/OpenGL/OpenGL.cpp index dc22df99..57738bae 100644 --- a/source/platform/renderers/OpenGL/OpenGL.cpp +++ b/source/platform/renderers/OpenGL/OpenGL.cpp @@ -21,11 +21,12 @@ namespace Gwk { namespace Renderer { - OpenGL::OpenGL() + + OpenGL::OpenGL(const Rect& viewRect) + : m_viewRect(viewRect) + , m_vertNum(0) + , m_context(nullptr) { - m_vertNum = 0; - m_context = nullptr; - for (int i = 0; i < MaxVerts; i++) { m_vertices[ i ].z = 0.5f; @@ -38,6 +39,13 @@ namespace Gwk void OpenGL::Init() { + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(m_viewRect.x, m_viewRect.x + m_viewRect.w, + m_viewRect.y, m_viewRect.y + m_viewRect.h, + -1.0, 1.0); + glMatrixMode(GL_MODELVIEW); + glViewport(m_viewRect.x, m_viewRect.y, m_viewRect.w, m_viewRect.h); } void OpenGL::Begin() @@ -73,8 +81,9 @@ namespace Gwk if (m_vertNum >= MaxVerts-1) Flush(); - m_vertices[ m_vertNum ].x = (float)x; - m_vertices[ m_vertNum ].y = (float)y; + // OpenGL origin is bottom-left. Gwork origin is top-left. + m_vertices[ m_vertNum ].x = float(x); + m_vertices[ m_vertNum ].y = m_viewRect.h - float(y); m_vertices[ m_vertNum ].u = u; m_vertices[ m_vertNum ].v = v; m_vertices[ m_vertNum ].r = m_color.r; @@ -113,22 +122,22 @@ namespace Gwk void OpenGL::StartClip() { Flush(); - Gwk::Rect rect = ClipRegion(); - // OpenGL's coords are from the bottom left - // so we need to translate them here. - { - GLint view[4]; - glGetIntegerv(GL_VIEWPORT, &view[0]); - rect.y = view[3] - (rect.y + rect.h); - } - glScissor(rect.x*Scale(), rect.y*Scale(), rect.w*Scale(), rect.h*Scale()); - glEnable(GL_SCISSOR_TEST); +// Gwk::Rect rect = ClipRegion(); +// // OpenGL's coords are from the bottom left +// // so we need to translate them here. +// { +// GLint view[4]; +// glGetIntegerv(GL_VIEWPORT, &view[0]); +// rect.y = view[3] - (rect.y + rect.h); +// } +// glScissor(rect.x*Scale(), rect.y*Scale(), rect.w*Scale(), rect.h*Scale()); +// glEnable(GL_SCISSOR_TEST); } void OpenGL::EndClip() { Flush(); - glDisable(GL_SCISSOR_TEST); +// glDisable(GL_SCISSOR_TEST); } void OpenGL::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, @@ -152,7 +161,7 @@ namespace Gwk glBindTexture(GL_TEXTURE_2D, *tex); glEnable(GL_TEXTURE_2D); } - + AddVert(rect.x, rect.y, u1, v1); AddVert(rect.x+rect.w, rect.y, u2, v1); AddVert(rect.x, rect.y+rect.h, u1, v2); @@ -166,7 +175,7 @@ namespace Gwk const std::string &fileName = texture->name; int x,y,n; - unsigned char *data = stbi_load(fileName.c_str(), &x, &y, &n, 0); + unsigned char *data = stbi_load(fileName.c_str(), &x, &y, &n, 4); // Image failed to load.. if (!data) @@ -175,19 +184,6 @@ namespace Gwk return; } - // Convert to 32bit -// FIBITMAP* bits32 = FreeImage_ConvertTo32Bits(bits); -// FreeImage_Unload(bits); -// -// if (!bits32) -// { -// texture->failed = true; -// return; -// } - - // Flip -// ::FreeImage_FlipVertical(bits32); - // Create a little texture pointer.. GLuint* pglTexture = new GLuint; @@ -201,9 +197,9 @@ namespace Gwk glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); //#ifdef FREEIMAGE_BIGENDIAN -// GLenum format = GL_RGBA; + GLenum format = GL_RGBA; //#else - GLenum format = GL_BGRA; +// GLenum format = GL_BGRA; //#endif glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->width, texture->height, 0, format, GL_UNSIGNED_BYTE, (const GLvoid*)data); diff --git a/source/samples/OpenGL/OpenGLSample.cpp b/source/samples/OpenGL/OpenGLSample.cpp index 7996ee13..4b984598 100644 --- a/source/samples/OpenGL/OpenGLSample.cpp +++ b/source/samples/OpenGL/OpenGLSample.cpp @@ -50,7 +50,8 @@ int main() return -1; // Create a new window - GLFWwindow* window = glfwCreateWindow(1024, 768, "Gwork: OpenGL", NULL, NULL); + const Gwk::Point winsz(1024,768); + GLFWwindow* window = glfwCreateWindow(winsz.x, winsz.y, "Gwork: OpenGL", NULL, NULL); if (!window) { glfwTerminate(); @@ -58,18 +59,12 @@ int main() } glfwMakeContextCurrent(window); - Gwk::Rect r(0,0, 1024,768); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(r.x, r.x + r.w, r.y, r.y + r.h, -1.0, 1.0); - glMatrixMode(GL_MODELVIEW); - glViewport(0, 0, r.w, r.h); - // Create a Gwork OpenGL Renderer #ifdef USE_DEBUG_FONT Gwk::Renderer::OpenGL* renderer = new Gwk::Renderer::OpenGL_DebugFont(); #else - Gwk::Renderer::OpenGL* renderer = new Gwk::Renderer::OpenGL(); + Gwk::Renderer::OpenGL* renderer = + new Gwk::Renderer::OpenGL(Gwk::Rect(Gwk::Point(0,0), winsz)); #endif renderer->Init(); @@ -79,7 +74,7 @@ int main() // Create a Canvas (it's root, on which all other Gwork panels are created) Gwk::Controls::Canvas* canvas = new Gwk::Controls::Canvas(skin); - canvas->SetSize(r.w, r.h); + canvas->SetSize(winsz.x, winsz.y); canvas->SetDrawBackground(true); canvas->SetBackgroundColor(Gwk::Color(150, 170, 170, 255)); From 8b71d6ddcc5d5712d5d0d9be6dafac0e85904f28 Mon Sep 17 00:00:00 2001 From: BQ Date: Tue, 17 May 2016 14:52:27 +0100 Subject: [PATCH 13/54] Put scissoring back in. Tidy up. --- source/platform/renderers/OpenGL/OpenGL.cpp | 29 +++++++++------------ source/samples/OpenGL/OpenGLSample.cpp | 1 - 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/source/platform/renderers/OpenGL/OpenGL.cpp b/source/platform/renderers/OpenGL/OpenGL.cpp index 57738bae..85cd1098 100644 --- a/source/platform/renderers/OpenGL/OpenGL.cpp +++ b/source/platform/renderers/OpenGL/OpenGL.cpp @@ -9,7 +9,6 @@ #include #include -//#include #include //#define STBI_ASSERT(x) // comment in for no asserts @@ -83,7 +82,7 @@ namespace Gwk // OpenGL origin is bottom-left. Gwork origin is top-left. m_vertices[ m_vertNum ].x = float(x); - m_vertices[ m_vertNum ].y = m_viewRect.h - float(y); + m_vertices[ m_vertNum ].y = float(m_viewRect.h - y); m_vertices[ m_vertNum ].u = u; m_vertices[ m_vertNum ].v = v; m_vertices[ m_vertNum ].r = m_color.r; @@ -122,22 +121,22 @@ namespace Gwk void OpenGL::StartClip() { Flush(); -// Gwk::Rect rect = ClipRegion(); -// // OpenGL's coords are from the bottom left -// // so we need to translate them here. -// { -// GLint view[4]; -// glGetIntegerv(GL_VIEWPORT, &view[0]); -// rect.y = view[3] - (rect.y + rect.h); -// } -// glScissor(rect.x*Scale(), rect.y*Scale(), rect.w*Scale(), rect.h*Scale()); -// glEnable(GL_SCISSOR_TEST); + Gwk::Rect rect = ClipRegion(); + // OpenGL's coords are from the bottom left + // so we need to translate them here. + { + GLint view[4]; + glGetIntegerv(GL_VIEWPORT, &view[0]); + rect.y = view[3] - (rect.y + rect.h); + } + glScissor(rect.x*Scale(), rect.y*Scale(), rect.w*Scale(), rect.h*Scale()); + glEnable(GL_SCISSOR_TEST); } void OpenGL::EndClip() { Flush(); -// glDisable(GL_SCISSOR_TEST); + glDisable(GL_SCISSOR_TEST); } void OpenGL::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, @@ -196,11 +195,7 @@ namespace Gwk glBindTexture(GL_TEXTURE_2D, *pglTexture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -//#ifdef FREEIMAGE_BIGENDIAN GLenum format = GL_RGBA; -//#else -// GLenum format = GL_BGRA; -//#endif glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->width, texture->height, 0, format, GL_UNSIGNED_BYTE, (const GLvoid*)data); diff --git a/source/samples/OpenGL/OpenGLSample.cpp b/source/samples/OpenGL/OpenGLSample.cpp index 4b984598..5f4084bd 100644 --- a/source/samples/OpenGL/OpenGLSample.cpp +++ b/source/samples/OpenGL/OpenGLSample.cpp @@ -17,7 +17,6 @@ # include #endif #include -//#include static Gwk::Input::GLFW GworkInput; From 462d69f17bd3b32ddce0c513b183f58759a0b213 Mon Sep 17 00:00:00 2001 From: BQ Date: Tue, 17 May 2016 14:58:14 +0100 Subject: [PATCH 14/54] Add GLFW GL link for Linux. --- cmake/Config.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/Config.cmake b/cmake/Config.cmake index 695c6956..bbb1a6e4 100644 --- a/cmake/Config.cmake +++ b/cmake/Config.cmake @@ -71,7 +71,11 @@ endif(RENDER_ALLEGRO5) if(RENDER_OPENGL) find_package(GLFW REQUIRED) - set(GLFW_DEPENDENCIES "-framework OpenGL") + if (APPLE) + set(GLFW_DEPENDENCIES "-framework OpenGL") + elseif(UNIX) + set(GLFW_DEPENDENCIES "-lGL") + endif() set(GWK_RENDER_NAME "OpenGL") set(GWK_RENDER_INCLUDES "${GLFW_INCLUDE_DIR}") set(GWK_RENDER_LIBRARIES ${GLFW_LIBRARIES} ${GLFW_DEPENDENCIES}) From 60fe1f08279ab66a605ebf8469a5a6c313483a2b Mon Sep 17 00:00:00 2001 From: BQ Date: Tue, 17 May 2016 15:03:35 +0100 Subject: [PATCH 15/54] Note on OpenGL version. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ee099a32..1a0aa6d6 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ A number of rendering backends are provided for use, or as an example for your o * TODO: Direct2D (Windows). * TODO: DirectX9 (Windows). * TODO: GDI+ (Windows). + * OpenGL (cross-platform using GLFW). * [SDL2][sdl2] (cross-platform). * [SFML2][sfml2] (cross-platform). From 0181d46fbcbaa71bed0ac2dd48e45a745996b5b1 Mon Sep 17 00:00:00 2001 From: Alice Date: Tue, 17 May 2016 14:12:46 -0400 Subject: [PATCH 16/54] More overrides, more range-for, some simple int -> size_t changes --- source/designer/source/DocumentCanvas.cpp | 22 +++++++------- source/gwork/include/Gwork/Anim.h | 30 +++++++++---------- .../include/Gwork/Controls/WindowCanvas.h | 18 +++++------ source/gwork/include/Gwork/UserData.h | 7 ++--- source/gwork/source/Controls/PageControl.cpp | 4 +-- source/gwork/source/Controls/ProgressBar.cpp | 2 +- source/gwork/source/Controls/TextBox.cpp | 4 +-- source/gwork/source/Events.cpp | 2 -- source/util/source/ImportExport/Base.cpp | 15 ++++------ .../source/ImportExport/DesignerFormat.cpp | 12 ++++---- 10 files changed, 52 insertions(+), 64 deletions(-) diff --git a/source/designer/source/DocumentCanvas.cpp b/source/designer/source/DocumentCanvas.cpp index 233e5d3e..89493dd7 100644 --- a/source/designer/source/DocumentCanvas.cpp +++ b/source/designer/source/DocumentCanvas.cpp @@ -67,9 +67,9 @@ void DocumentCanvas::SelectControls( ControlList& CtrlList ) { m_selectionLayer->ClearSelection(); - for ( ControlList::List::const_iterator it = CtrlList.list.cbegin(); it != CtrlList.list.cend(); ++it ) + for (auto const& iter : CtrlList.list) { - m_selectionLayer->AddSelection( (*it) ); + m_selectionLayer->AddSelection( iter ); } // Let everything else know the selection changed @@ -99,10 +99,10 @@ void DocumentCanvas::Command( const Gwk::String& str ) { if ( str == "delete" ) { - for ( ControlList::List::const_iterator it = m_selectionLayer->GetSelected().list.cbegin(); it != m_selectionLayer->GetSelected().list.cend(); ++it ) + for ( auto&& iter : m_selectionLayer->GetSelected().list) { - if ( *it == this ) continue; - (*it)->DelayedDelete(); + if ( iter == this ) continue; + iter->DelayedDelete(); } m_selectionLayer->ClearSelection(); @@ -110,19 +110,19 @@ void DocumentCanvas::Command( const Gwk::String& str ) if ( str == "bringforward" ) { - for ( ControlList::List::const_iterator it = m_selectionLayer->GetSelected().list.cbegin(); it != m_selectionLayer->GetSelected().list.cend(); ++it ) + for ( auto&& iter : m_selectionLayer->GetSelected().list) { - if ( *it == this ) continue; - (*it)->BringToFront(); + if ( iter == this ) continue; + iter->BringToFront(); } } if ( str == "sendback" ) { - for ( ControlList::List::const_iterator it = m_selectionLayer->GetSelected().list.cbegin(); it != m_selectionLayer->GetSelected().list.cend(); ++it ) + for ( auto&& iter : m_selectionLayer->GetSelected().list) { - if ( *it == this ) continue; - (*it)->SendToBack(); + if ( iter == this ) continue; + iter->SendToBack(); } } } diff --git a/source/gwork/include/Gwork/Anim.h b/source/gwork/include/Gwork/Anim.h index 47dd000e..42d15d48 100644 --- a/source/gwork/include/Gwork/Anim.h +++ b/source/gwork/include/Gwork/Anim.h @@ -53,8 +53,8 @@ namespace Gwk TimedAnimation(float fLength, float fDelay = 0.0f, float fEase = -1.0f); - virtual void Think(); - virtual bool Finished(); + virtual void Think() override; + virtual bool Finished() override; // // These are the magic functions you should be overriding @@ -88,17 +88,17 @@ namespace Gwk m_bHide = bHide; } - virtual void OnStart() + virtual void OnStart() override { m_control->SetHeight(m_startSize); } - virtual void Run(float delta) + virtual void Run(float delta) override { m_control->SetHeight(m_startSize+(((float)m_delta)*delta)); } - virtual void OnFinish() + virtual void OnFinish() override { m_control->SetHeight(m_startSize+m_delta); m_control->SetHidden(m_bHide); } @@ -124,17 +124,17 @@ namespace Gwk m_bHide = bHide; } - virtual void OnStart() + virtual void OnStart() override { m_control->SetWidth(m_startSize); } - virtual void Run(float delta) + virtual void Run(float delta) override { m_control->SetWidth(m_startSize+(((float)m_delta)*delta)); } - virtual void OnFinish() + virtual void OnFinish() override { m_control->SetWidth(m_startSize+m_delta); m_control->SetHidden(m_bHide); } @@ -164,18 +164,18 @@ namespace Gwk m_bHide = bHide; } - virtual void OnStart() + virtual void OnStart() override { m_control->SetPos(m_startSize, m_control->GetPos().y); } - virtual void Run(float delta) + virtual void Run(float delta) override { m_control->SetPos(m_startSize+(((float)m_delta)*delta), m_control->GetPos().y); } - virtual void OnFinish() + virtual void OnFinish() override { m_control->SetPos(m_startSize+m_delta, m_control->GetPos().y); m_control->SetHidden(m_bHide); @@ -202,18 +202,18 @@ namespace Gwk m_bHide = bHide; } - virtual void OnStart() + virtual void OnStart() override { m_control->SetPos(m_control->GetPos().x, m_startSize); } - virtual void Run(float delta) + virtual void Run(float delta) override { m_control->SetPos(m_control->GetPos().x, m_startSize+ (((float)m_delta)*delta)); } - virtual void OnFinish() + virtual void OnFinish() override { m_control->SetPos(m_control->GetPos().x, m_startSize+m_delta); m_control->SetHidden(m_bHide); @@ -240,7 +240,7 @@ namespace Gwk { } - virtual void OnFinish() + virtual void OnFinish() override { m_control->DelayedDelete(); } diff --git a/source/gwork/include/Gwork/Controls/WindowCanvas.h b/source/gwork/include/Gwork/Controls/WindowCanvas.h index cf5c7039..780d8ed8 100644 --- a/source/gwork/include/Gwork/Controls/WindowCanvas.h +++ b/source/gwork/include/Gwork/Controls/WindowCanvas.h @@ -31,7 +31,7 @@ namespace Gwk const Gwk::String& strWindowTitle = ""); ~WindowCanvas(); - virtual void DoThink(); + virtual void DoThink() override; virtual bool WantsQuit() { @@ -39,18 +39,18 @@ namespace Gwk } // Gwk::WindowProvider - virtual void* GetWindow(); + virtual void* GetWindow() override; - virtual bool InputQuit(); + virtual bool InputQuit() override; - Skin::Base* GetSkin(void); + Skin::Base* GetSkin(void) override; - virtual void Render(Skin::Base* skin); + virtual void Render(Skin::Base* skin) override; - virtual void SetPos(int x, int y); - virtual bool IsOnTop(); + virtual void SetPos(int x, int y) override; + virtual bool IsOnTop() override; - virtual void Layout(Skin::Base* skin); + virtual void Layout(Skin::Base* skin) override; virtual bool CanMaximize() { @@ -72,7 +72,7 @@ namespace Gwk protected: - virtual void RenderCanvas(); + virtual void RenderCanvas() override; virtual void DestroyWindow(); virtual void CloseButtonPressed(); diff --git a/source/gwork/include/Gwork/UserData.h b/source/gwork/include/Gwork/UserData.h index 83ebc272..cc88f1d6 100644 --- a/source/gwork/include/Gwork/UserData.h +++ b/source/gwork/include/Gwork/UserData.h @@ -79,12 +79,9 @@ namespace Gwk ~UserDataStorage() { - Container::iterator it = m_list.begin(), itEnd = m_list.end(); - - while (it != itEnd) + for (auto&& iter : m_list) { - it->second->DeleteThis(); - ++it; + iter.second->DeleteThis(); } } diff --git a/source/gwork/source/Controls/PageControl.cpp b/source/gwork/source/Controls/PageControl.cpp index bee267c6..2962d1f1 100644 --- a/source/gwork/source/Controls/PageControl.cpp +++ b/source/gwork/source/Controls/PageControl.cpp @@ -22,7 +22,7 @@ GWK_CONTROL_CONSTRUCTOR(PageControl) m_currentPage = 0; SetUseFinishButton(true); - for (int i = 0; i < MaxPages; i++) + for (size_t i = 0; i < MaxPages; i++) { m_pages[i] = nullptr; } @@ -78,7 +78,7 @@ void PageControl::SetPageCount(unsigned int iNum) void PageControl::HideAll() { - for (int i = 0; i < MaxPages; i++) + for (size_t i = 0; i < MaxPages; i++) { if (!m_pages[i]) continue; diff --git a/source/gwork/source/Controls/ProgressBar.cpp b/source/gwork/source/Controls/ProgressBar.cpp index 4c252245..1c35d7b4 100644 --- a/source/gwork/source/Controls/ProgressBar.cpp +++ b/source/gwork/source/Controls/ProgressBar.cpp @@ -22,7 +22,7 @@ class ProgressBarThink : public Gwk::Anim::Animation : m_fLastFrame(0.f) {} - virtual void Think() + virtual void Think() override { float fDiff = Platform::GetTimeInSeconds()-m_fLastFrame; gwk_cast(m_control)->CycleThink(Gwk::Clamp(fDiff, 0.f, 0.3f)); diff --git a/source/gwork/source/Controls/TextBox.cpp b/source/gwork/source/Controls/TextBox.cpp index 1baa7275..01048633 100644 --- a/source/gwork/source/Controls/TextBox.cpp +++ b/source/gwork/source/Controls/TextBox.cpp @@ -25,7 +25,7 @@ class ChangeCaretColor : public Gwk::Anim::Animation { public: - virtual void Think() + virtual void Think() override { gwk_cast(m_control)->UpdateCaretColor(); } @@ -739,7 +739,7 @@ void PasswordTextBox::SetText(const String& str, bool bDoEvents) m_realText = str; String passwordChars; - for (int i = 0; i < m_realText.length(); i++) + for (size_t i = 0; i < m_realText.length(); i++) { passwordChars += m_passwordChar; } diff --git a/source/gwork/source/Events.cpp b/source/gwork/source/Events.cpp index 32af7c3c..012c303a 100644 --- a/source/gwork/source/Events.cpp +++ b/source/gwork/source/Events.cpp @@ -57,8 +57,6 @@ Caller::~Caller() void Caller::CleanLinks() { - std::list::iterator iter; - for (auto&& h : m_handlers) { h.object->UnRegisterCaller(this); diff --git a/source/util/source/ImportExport/Base.cpp b/source/util/source/ImportExport/Base.cpp index 3d4cf474..766f5624 100644 --- a/source/util/source/ImportExport/Base.cpp +++ b/source/util/source/ImportExport/Base.cpp @@ -18,23 +18,18 @@ ImportExport::Base::List& GetList() Initialized = true; InitializeFormats(); } - + return list; } ImportExport::Base* Find(Gwk::String strName) { - ImportExport::Base::List::iterator it = GetList().begin(); - ImportExport::Base::List::iterator itEnd = GetList().end(); - - while (it != itEnd) + for(auto&& iter : GetList()) { - if ((*it)->Name() == strName) - return *it; - - ++it; + if (iter->Name() == strName) + return iter; } - + return nullptr; } diff --git a/source/util/source/ImportExport/DesignerFormat.cpp b/source/util/source/ImportExport/DesignerFormat.cpp index 04169708..9d6d1cc3 100644 --- a/source/util/source/ImportExport/DesignerFormat.cpp +++ b/source/util/source/ImportExport/DesignerFormat.cpp @@ -157,22 +157,20 @@ void DesignerFormat::ExportToTree(Gwk::Controls::Base* root, GwkUtil::Data::Tree while (cF) { - for (ControlFactory::Property::List::const_iterator - it = cF->Properties().begin(), itEnd = cF->Properties().end(); - it != itEnd; ++it) + for (auto const& iter : cF->Properties) { - if ((*it)->NumCount() > 0) + if (iter->NumCount() > 0) { - GwkUtil::Data::Tree& prop = props.AddChild((*it)->Name()); + GwkUtil::Data::Tree& prop = props.AddChild(iter->Name()); for (int i = 0; i < (*it)->NumCount(); i++) { - prop.SetChildVar((*it)->NumName(i), (*it)->NumGet(root, i)); + prop.SetChildVar(iter->NumName(i), iter->NumGet(root, i)); } } else { - props.SetChild((*it)->Name(), (*it)->GetValueAsString(root)); + props.SetChild(iter->Name(), iter->GetValueAsString(root)); } } From 03d5a162fccfb03da4fada2c64ea42692e6960d3 Mon Sep 17 00:00:00 2001 From: Alice Date: Tue, 17 May 2016 16:26:36 -0400 Subject: [PATCH 17/54] Rename iterators in range-for loops --- source/designer/source/DocumentCanvas.cpp | 22 ++++++------ source/gwork/include/Gwork/ControlList.h | 4 +-- .../include/Gwork/Controls/CollapsibleList.h | 8 ++--- source/gwork/include/Gwork/Hook.h | 16 ++++----- source/gwork/include/Gwork/UserData.h | 4 +-- source/gwork/source/ControlList.cpp | 36 +++++++++---------- source/gwork/source/Controls/Base.cpp | 22 ++++++------ .../source/Controls/CollapsibleCategory.cpp | 12 +++---- source/gwork/source/Controls/ComboBox.cpp | 4 +-- .../source/Controls/DockedTabControl.cpp | 4 +-- source/gwork/source/Controls/ListBox.cpp | 4 +-- source/gwork/source/Controls/Properties.cpp | 8 ++--- source/gwork/source/Controls/PropertyTree.cpp | 8 ++--- .../source/Controls/ResizableControl.cpp | 4 +-- source/gwork/source/Controls/RichLabel.cpp | 8 ++--- source/gwork/source/Controls/TabStrip.cpp | 4 +-- source/gwork/source/Controls/Text.cpp | 13 +++---- source/gwork/source/Controls/TreeNode.cpp | 8 ++--- .../source/ControlFactory/ControlFactory.cpp | 22 ++++++------ source/util/source/ImportExport/Base.cpp | 6 ++-- .../source/ImportExport/DesignerFormat.cpp | 10 +++--- 21 files changed, 114 insertions(+), 113 deletions(-) diff --git a/source/designer/source/DocumentCanvas.cpp b/source/designer/source/DocumentCanvas.cpp index 89493dd7..bb4430e8 100644 --- a/source/designer/source/DocumentCanvas.cpp +++ b/source/designer/source/DocumentCanvas.cpp @@ -67,9 +67,9 @@ void DocumentCanvas::SelectControls( ControlList& CtrlList ) { m_selectionLayer->ClearSelection(); - for (auto const& iter : CtrlList.list) + for (auto const& ctrl : CtrlList.list) { - m_selectionLayer->AddSelection( iter ); + m_selectionLayer->AddSelection( ctrl ); } // Let everything else know the selection changed @@ -99,10 +99,10 @@ void DocumentCanvas::Command( const Gwk::String& str ) { if ( str == "delete" ) { - for ( auto&& iter : m_selectionLayer->GetSelected().list) + for ( auto&& selected : m_selectionLayer->GetSelected().list) { - if ( iter == this ) continue; - iter->DelayedDelete(); + if ( selected == this ) continue; + selected->DelayedDelete(); } m_selectionLayer->ClearSelection(); @@ -110,19 +110,19 @@ void DocumentCanvas::Command( const Gwk::String& str ) if ( str == "bringforward" ) { - for ( auto&& iter : m_selectionLayer->GetSelected().list) + for ( auto&& selected : m_selectionLayer->GetSelected().list) { - if ( iter == this ) continue; - iter->BringToFront(); + if ( selected == this ) continue; + selected->BringToFront(); } } if ( str == "sendback" ) { - for ( auto&& iter : m_selectionLayer->GetSelected().list) + for ( auto&& selected : m_selectionLayer->GetSelected().list) { - if ( iter == this ) continue; - iter->SendToBack(); + if ( selected == this ) continue; + selected->SendToBack(); } } } diff --git a/source/gwork/include/Gwork/ControlList.h b/source/gwork/include/Gwork/ControlList.h index 134142cd..14814512 100644 --- a/source/gwork/include/Gwork/ControlList.h +++ b/source/gwork/include/Gwork/ControlList.h @@ -51,9 +51,9 @@ namespace Gwk void Add(const List& _list) { - for (auto const& it : _list) + for (auto const& item : _list) { - Add(it); + Add(item); } } diff --git a/source/gwork/include/Gwork/Controls/CollapsibleList.h b/source/gwork/include/Gwork/Controls/CollapsibleList.h index 2818e647..0c267b5a 100644 --- a/source/gwork/include/Gwork/Controls/CollapsibleList.h +++ b/source/gwork/include/Gwork/Controls/CollapsibleList.h @@ -61,10 +61,10 @@ namespace Gwk { Base::List& children = GetChildren(); - for (auto&& iter : children) + for (auto&& control : children) { Gwk::Controls::CollapsibleCategory* child = - gwk_cast(iter); + gwk_cast(control); if (!child) continue; @@ -77,10 +77,10 @@ namespace Gwk { Base::List& children = GetChildren(); - for (auto&& iter : children) + for (auto&& control : children) { Gwk::Controls::CollapsibleCategory* child = - gwk_cast(iter); + gwk_cast(control); if (!child) continue; diff --git a/source/gwork/include/Gwork/Hook.h b/source/gwork/include/Gwork/Hook.h index 73071d06..fbe1816e 100644 --- a/source/gwork/include/Gwork/Hook.h +++ b/source/gwork/include/Gwork/Hook.h @@ -44,9 +44,9 @@ namespace Gwk template bool CallHook(fnc f) { - for (auto&& it : GetHookList()) + for (auto&& hook : GetHookList()) { - if ((it->*f)()) + if ((hook->*f)()) return true; } @@ -56,9 +56,9 @@ namespace Gwk template bool CallHook(fnc f, AA a) { - for (auto&& it : GetHookList()) + for (auto&& hook : GetHookList()) { - if ((it->*f)(a)) + if ((hook->*f)(a)) return true; } @@ -68,9 +68,9 @@ namespace Gwk template bool CallHook(fnc f, AA a, AB b) { - for (auto&& it : GetHookList()) + for (auto&& hook : GetHookList()) { - if ((it->*f)(a, b)) + if ((hook->*f)(a, b)) return true; } @@ -80,9 +80,9 @@ namespace Gwk template bool CallHook(fnc f, AA a, AB b, AC c) { - for (auto&& it : GetHookList()) + for (auto&& hook : GetHookList()) { - if ((it->*f)(a, b, c)) + if ((hook->*f)(a, b, c)) return true; } diff --git a/source/gwork/include/Gwork/UserData.h b/source/gwork/include/Gwork/UserData.h index cc88f1d6..f19b6035 100644 --- a/source/gwork/include/Gwork/UserData.h +++ b/source/gwork/include/Gwork/UserData.h @@ -79,9 +79,9 @@ namespace Gwk ~UserDataStorage() { - for (auto&& iter : m_list) + for (auto&& item : m_list) { - iter.second->DeleteThis(); + item.second->DeleteThis(); } } diff --git a/source/gwork/source/ControlList.cpp b/source/gwork/source/ControlList.cpp index b835ebfc..d4022861 100644 --- a/source/gwork/source/ControlList.cpp +++ b/source/gwork/source/ControlList.cpp @@ -14,41 +14,41 @@ namespace Gwk void ControlList::Enable() { - for(auto&& iter : list) + for(auto&& item : list) { - iter->SetDisabled(false); + item->SetDisabled(false); } } void ControlList::Disable() { - for(auto&& iter : list) + for(auto&& item : list) { - iter->SetDisabled(true); + item->SetDisabled(true); } } void ControlList::Show() { - for(auto&& iter : list) + for(auto&& item : list) { - iter->Show(); + item->Show(); } } void ControlList::Hide() { - for(auto&& iter : list) + for(auto&& item : list) { - iter->Hide(); + item->Hide(); } } Gwk::String ControlList::GetValue() { - for(auto&& iter : list) + for(auto&& item : list) { - return iter->GetValue(); + return item->GetValue(); } return ""; @@ -56,25 +56,25 @@ Gwk::String ControlList::GetValue() void ControlList::SetValue(const Gwk::String& value) { - for(auto&& iter : list) + for(auto&& item : list) { - iter->SetValue(value); + item->SetValue(value); } } void ControlList::MoveBy(const Gwk::Point& point) { - for(auto&& iter : list) + for(auto&& item : list) { - iter->MoveBy(point.x, point.y); + item->MoveBy(point.x, point.y); } } void ControlList::DoAction() { - for(auto&& iter : list) + for(auto&& item : list) { - iter->DoAction(); + item->DoAction(); } } @@ -82,9 +82,9 @@ void ControlList::SetActionInternal(Gwk::Event::Handler* object, void ( Gwk::Event::Handler::*f )( Gwk::Event::Info), const Gwk::Event::Packet& packet) { - for(auto&& iter : list) + for(auto&& item : list) { - iter->SetAction(object, f, packet); + item->SetAction(object, f, packet); } } diff --git a/source/gwork/source/Controls/Base.cpp b/source/gwork/source/Controls/Base.cpp index fe10841e..811a54fb 100644 --- a/source/gwork/source/Controls/Base.cpp +++ b/source/gwork/source/Controls/Base.cpp @@ -175,22 +175,22 @@ bool Base::Visible() const void Base::InvalidateChildren(bool bRecursive) { - for(auto&& it : Children) + for(auto&& child : Children) { - it->Invalidate(); + child->Invalidate(); if (bRecursive) - it->InvalidateChildren(bRecursive); + child->InvalidateChildren(bRecursive); } if (m_innerPanel) { - for(auto&& it : m_innerPanel->Children) + for(auto&& innerchild : m_innerPanel->Children) { - it->Invalidate(); + innerchild->Invalidate(); if (bRecursive) - it->InvalidateChildren(bRecursive); + innerchild->InvalidateChildren(bRecursive); } } } @@ -338,10 +338,10 @@ Controls::Base* Base::GetChild(unsigned int i) if (i >= NumChildren()) return nullptr; - for(auto&& iter : Children) + for(auto&& child : Children) { if (i == 0) - return iter; + return child; i--; } @@ -872,11 +872,11 @@ void Base::RecurseLayout(Skin::Base* skin) GetCanvas()->NextTab = nullptr; } -bool Base::IsChild(Controls::Base* child) +bool Base::IsChild(Controls::Base* possiblechild) { - for(auto&& iter : Children) + for(auto&& child : Children) { - if (child == iter) + if (possiblechild == child) return true; } diff --git a/source/gwork/source/Controls/CollapsibleCategory.cpp b/source/gwork/source/Controls/CollapsibleCategory.cpp index c5694dbc..a6ad613d 100644 --- a/source/gwork/source/Controls/CollapsibleCategory.cpp +++ b/source/gwork/source/Controls/CollapsibleCategory.cpp @@ -145,9 +145,9 @@ void CollapsibleCategory::UnselectAll() { Base::List& children = GetChildren(); - for(auto&& iter : children) + for(auto&& control : children) { - CategoryButton* child = gwk_cast(iter); + CategoryButton* child = gwk_cast(control); if (!child) continue; @@ -166,9 +166,9 @@ void CollapsibleCategory::PostLayout(Skin::Base* /*skin*/) Base::List& children = GetChildren(); bool b = true; - for(auto&& iter : children) + for(auto&& control : children) { - CategoryButton* child = gwk_cast(iter); + CategoryButton* child = gwk_cast(control); if (!child) continue; @@ -183,9 +183,9 @@ Button* CollapsibleCategory::GetSelected() { Base::List& children = GetChildren(); - for(auto&& iter : children) + for(auto&& control : children) { - CategoryButton* child = gwk_cast(iter); + CategoryButton* child = gwk_cast(control); if (!child) continue; diff --git a/source/gwork/source/Controls/ComboBox.cpp b/source/gwork/source/Controls/ComboBox.cpp index fa6b877d..86c6bc56 100644 --- a/source/gwork/source/Controls/ComboBox.cpp +++ b/source/gwork/source/Controls/ComboBox.cpp @@ -150,9 +150,9 @@ void ComboBox::OnItemSelected(Controls::Base* control) void ComboBox::SelectItemByName(const Gwk::String& name, bool bFireChangeEvents) { - for(auto&& iter : m_menu->GetChildren()) + for(auto&& control : m_menu->GetChildren()) { - MenuItem* child = gwk_cast(iter); + MenuItem* child = gwk_cast(control); if (child->GetName() == name) return SelectItem(child, bFireChangeEvents); diff --git a/source/gwork/source/Controls/DockedTabControl.cpp b/source/gwork/source/Controls/DockedTabControl.cpp index 47fa701b..6ef9fa56 100644 --- a/source/gwork/source/Controls/DockedTabControl.cpp +++ b/source/gwork/source/Controls/DockedTabControl.cpp @@ -78,9 +78,9 @@ void DockedTabControl::MoveTabsTo(DockedTabControl* target) { Base::List Children = GetTabStrip()->Children; - for (auto&& iter : Children) + for (auto&& child : Children) { - TabButton* button = gwk_cast(iter); + TabButton* button = gwk_cast(child); if (!button) continue; diff --git a/source/gwork/source/Controls/ListBox.cpp b/source/gwork/source/Controls/ListBox.cpp index 6d9c5132..95bfb8ff 100644 --- a/source/gwork/source/Controls/ListBox.cpp +++ b/source/gwork/source/Controls/ListBox.cpp @@ -173,9 +173,9 @@ void ListBox::SelectByString(const String& strName, bool bClearOthers) Base::List& children = m_table->GetChildren(); - for(auto&& iter : children) + for(auto&& control : children) { - ListBoxRow* child = gwk_cast(iter); + ListBoxRow* child = gwk_cast(control); if (!child) continue; diff --git a/source/gwork/source/Controls/Properties.cpp b/source/gwork/source/Controls/Properties.cpp index 9e23de3e..44e61fdd 100644 --- a/source/gwork/source/Controls/Properties.cpp +++ b/source/gwork/source/Controls/Properties.cpp @@ -60,9 +60,9 @@ PropertyRow* Properties::Add(const String& text, Property::Base* prop, const Str PropertyRow* Properties::Find(const String& text) { - for (auto&& it : GetChildren()) + for (auto&& control : GetChildren()) { - PropertyRow* row = gwk_cast(it); + PropertyRow* row = gwk_cast(control); if (!row) continue; @@ -78,9 +78,9 @@ void Properties::Clear() { Base::List ChildListCopy = GetChildren(); - for (auto&& it : ChildListCopy) + for (auto&& child : ChildListCopy) { - PropertyRow* row = gwk_cast(it); + PropertyRow* row = gwk_cast(child); if (!row) continue; diff --git a/source/gwork/source/Controls/PropertyTree.cpp b/source/gwork/source/Controls/PropertyTree.cpp index 982b238a..c8a63a31 100644 --- a/source/gwork/source/Controls/PropertyTree.cpp +++ b/source/gwork/source/Controls/PropertyTree.cpp @@ -29,9 +29,9 @@ Properties* PropertyTree::Find(const String& text) { Controls::Base::List& children = GetChildNodes(); - for (auto&& iter : children) + for (auto&& control : children) { - PropertyTreeNode* child = gwk_cast(iter); + PropertyTreeNode* child = gwk_cast(control); if (!child) continue; @@ -40,9 +40,9 @@ Properties* PropertyTree::Find(const String& text) { Base::List& nodechildren = child->GetChildren(); - for (auto&& subiter : nodechildren) + for (auto&& subcontrol : nodechildren) { - Properties* propertyChild = gwk_cast(subiter); + Properties* propertyChild = gwk_cast(subcontrol); if (!propertyChild) continue; diff --git a/source/gwork/source/Controls/ResizableControl.cpp b/source/gwork/source/Controls/ResizableControl.cpp index 67754de9..cf12d00c 100644 --- a/source/gwork/source/Controls/ResizableControl.cpp +++ b/source/gwork/source/Controls/ResizableControl.cpp @@ -65,9 +65,9 @@ GWK_CONTROL_CONSTRUCTOR(ResizableControl) void ResizableControl::DisableResizing() { - for (auto&& it : Children) + for (auto&& child : Children) { - Resizer* resizer = gwk_cast(it); + Resizer* resizer = gwk_cast(child); if (!resizer) continue; diff --git a/source/gwork/source/Controls/RichLabel.cpp b/source/gwork/source/Controls/RichLabel.cpp index 3c72d3df..fbeb89b3 100644 --- a/source/gwork/source/Controls/RichLabel.cpp +++ b/source/gwork/source/Controls/RichLabel.cpp @@ -170,17 +170,17 @@ void RichLabel::Rebuild() int y = 0; int lineheight = -1; - for (auto&& iter : m_textBlocks) + for (auto&& text : m_textBlocks) { - if (iter.type == Type_Newline) + if (text.type == Type_Newline) { CreateNewline(x, y, lineheight); continue; } - if (iter.type == Type_Text) + if (text.type == Type_Text) { - CreateLabel(iter.text, iter, x, y, lineheight, false); + CreateLabel(text.text, text, x, y, lineheight, false); continue; } } diff --git a/source/gwork/source/Controls/TabStrip.cpp b/source/gwork/source/Controls/TabStrip.cpp index 40ee5a76..f69e1e9a 100644 --- a/source/gwork/source/Controls/TabStrip.cpp +++ b/source/gwork/source/Controls/TabStrip.cpp @@ -70,9 +70,9 @@ void TabStrip::Layout(Skin::Base* skin) Gwk::Point largestTab(5, 5); int iNum = 0; - for (auto&& iter : Children) + for (auto&& control : Children) { - TabButton* button = gwk_cast(iter); + TabButton* button = gwk_cast(control); if (!button) continue; diff --git a/source/gwork/source/Controls/Text.cpp b/source/gwork/source/Controls/Text.cpp index 29a0241a..355017ab 100644 --- a/source/gwork/source/Controls/Text.cpp +++ b/source/gwork/source/Controls/Text.cpp @@ -52,11 +52,12 @@ void Text::SetFont(Gwk::Font* font) m_bTextChanged = true; // Change the font of multilines too! { - for (auto&& it : m_lines) + for (auto&& line : m_lines) { - it->SetFont(m_font); + line->SetFont(m_font); } } + Invalidate(); } @@ -276,9 +277,9 @@ void Text::RefreshSizeWrap() { RemoveAllChildren(); - for (auto&& it : m_lines) + for (auto&& line : m_lines) { - delete it; + delete line; } m_lines.clear(); @@ -371,10 +372,10 @@ unsigned int Text::NumLines() Text* Text::GetLine(int i) { - for (auto&& it : m_lines) + for (auto&& line : m_lines) { if (i == 0) - return it; + return line; i--; } diff --git a/source/gwork/source/Controls/TreeNode.cpp b/source/gwork/source/Controls/TreeNode.cpp index 70c31aff..e143625a 100644 --- a/source/gwork/source/Controls/TreeNode.cpp +++ b/source/gwork/source/Controls/TreeNode.cpp @@ -183,9 +183,9 @@ void TreeNode::ExpandAll() Open(); Base::List& children = GetChildNodes(); - for (auto&& iter : children) + for (auto&& childnode : children) { - TreeNode* child = gwk_cast(iter); + TreeNode* child = gwk_cast(childnode); if (!child) continue; @@ -261,9 +261,9 @@ void TreeNode::DeselectAll() Base::List& children = GetChildNodes(); - for (auto&& iter : children) + for (auto&& childnode : children) { - TreeNode* child = gwk_cast(iter); + TreeNode* child = gwk_cast(childnode); if (!child) continue; diff --git a/source/util/source/ControlFactory/ControlFactory.cpp b/source/util/source/ControlFactory/ControlFactory.cpp index f1e4dde3..883c83d5 100644 --- a/source/util/source/ControlFactory/ControlFactory.cpp +++ b/source/util/source/ControlFactory/ControlFactory.cpp @@ -167,10 +167,10 @@ List& GetList() ControlFactory::Base* Find(const Gwk::String& name) { - for (auto const& iter : ControlFactory::GetList) + for (auto const& control : ControlFactory::GetList) { - if (iter->Name() == name) - return iter; + if (control->Name() == name) + return control; } return nullptr; @@ -188,10 +188,10 @@ void Base::AddProperty(Property* prop) Base* Base::GetBaseFactory() { - for (auto const& iter : ControlFactory::GetList()) + for (auto const& control : ControlFactory::GetList()) { - if iter->Name() == ParentFactory()) - return iter; + if control->Name() == ParentFactory()) + return control; } return nullptr; @@ -199,12 +199,12 @@ Base* Base::GetBaseFactory() Property* Base::GetProperty(const Gwk::String& name) { - for (auto const& iter : Properties()) + for (auto const& property : Properties()) { - if iter->Name() != name) + if property->Name() != name) continue; - return iter; + return property; } Base* base = GetBaseFactory(); @@ -250,9 +250,9 @@ Controls::Base* Clone(Controls::Base* source, ControlFactory::Base* factory) while (factory) { - for(auto&& iter : factory->Properties()) + for(auto&& property : factory->Properties()) { - iter->SetValueFromString(control, iter->GetValueAsString(source)); + property->SetValueFromString(control, property->GetValueAsString(source)); } factory = factory->GetBaseFactory(); diff --git a/source/util/source/ImportExport/Base.cpp b/source/util/source/ImportExport/Base.cpp index 766f5624..beef1a0d 100644 --- a/source/util/source/ImportExport/Base.cpp +++ b/source/util/source/ImportExport/Base.cpp @@ -24,10 +24,10 @@ ImportExport::Base::List& GetList() ImportExport::Base* Find(Gwk::String strName) { - for(auto&& iter : GetList()) + for(auto&& item : GetList()) { - if (iter->Name() == strName) - return iter; + if (item->Name() == strName) + return item; } return nullptr; diff --git a/source/util/source/ImportExport/DesignerFormat.cpp b/source/util/source/ImportExport/DesignerFormat.cpp index 9d6d1cc3..4a53bbd2 100644 --- a/source/util/source/ImportExport/DesignerFormat.cpp +++ b/source/util/source/ImportExport/DesignerFormat.cpp @@ -157,20 +157,20 @@ void DesignerFormat::ExportToTree(Gwk::Controls::Base* root, GwkUtil::Data::Tree while (cF) { - for (auto const& iter : cF->Properties) + for (auto const& property : cF->Properties) { - if (iter->NumCount() > 0) + if (property->NumCount() > 0) { - GwkUtil::Data::Tree& prop = props.AddChild(iter->Name()); + GwkUtil::Data::Tree& prop = props.AddChild(property->Name()); for (int i = 0; i < (*it)->NumCount(); i++) { - prop.SetChildVar(iter->NumName(i), iter->NumGet(root, i)); + prop.SetChildVar(property->NumName(i), property->NumGet(root, i)); } } else { - props.SetChild(iter->Name(), iter->GetValueAsString(root)); + props.SetChild(property->Name(), property->GetValueAsString(root)); } } From be89f14f16afb1aaed9b67cf16aaea685fc62e67 Mon Sep 17 00:00:00 2001 From: Alice Date: Tue, 17 May 2016 20:01:41 -0400 Subject: [PATCH 18/54] Fixing for(auto to be for (auto to match previous code --- source/designer/source/DocumentCanvas.cpp | 7 ++--- .../include/Gwork/Controls/Layout/Position.h | 2 +- .../include/Gwork/Controls/Layout/Table.h | 8 ++--- source/gwork/source/ControlList.cpp | 18 +++++------ source/gwork/source/Controls/Base.cpp | 30 +++++++++---------- source/gwork/source/Controls/Canvas.cpp | 2 +- .../source/Controls/CollapsibleCategory.cpp | 6 ++-- source/gwork/source/Controls/ComboBox.cpp | 2 +- source/gwork/source/Controls/ListBox.cpp | 2 +- source/gwork/source/Controls/Menu.cpp | 8 ++--- .../source/ControlFactory/ControlFactory.cpp | 2 +- source/util/source/ImportExport/Base.cpp | 15 +++++----- 12 files changed, 50 insertions(+), 52 deletions(-) diff --git a/source/designer/source/DocumentCanvas.cpp b/source/designer/source/DocumentCanvas.cpp index bb4430e8..3501289e 100644 --- a/source/designer/source/DocumentCanvas.cpp +++ b/source/designer/source/DocumentCanvas.cpp @@ -16,7 +16,6 @@ GWK_CONTROL_CONSTRUCTOR( DocumentCanvas ) UserData.Set( "ControlFactory", controlFactory ); } - void DocumentCanvas::Render( Gwk::Skin::Base* skin ) { skin->DrawGenericPanel( this ); @@ -67,7 +66,7 @@ void DocumentCanvas::SelectControls( ControlList& CtrlList ) { m_selectionLayer->ClearSelection(); - for (auto const& ctrl : CtrlList.list) + for (auto const& ctrl : CtrlList.list) { m_selectionLayer->AddSelection( ctrl ); } @@ -110,7 +109,7 @@ void DocumentCanvas::Command( const Gwk::String& str ) if ( str == "bringforward" ) { - for ( auto&& selected : m_selectionLayer->GetSelected().list) + for ( auto&& selected : m_selectionLayer->GetSelected().list) { if ( selected == this ) continue; selected->BringToFront(); @@ -119,7 +118,7 @@ void DocumentCanvas::Command( const Gwk::String& str ) if ( str == "sendback" ) { - for ( auto&& selected : m_selectionLayer->GetSelected().list) + for ( auto&& selected : m_selectionLayer->GetSelected().list) { if ( selected == this ) continue; selected->SendToBack(); diff --git a/source/gwork/include/Gwork/Controls/Layout/Position.h b/source/gwork/include/Gwork/Controls/Layout/Position.h index 4f77395e..e2a03d6d 100644 --- a/source/gwork/include/Gwork/Controls/Layout/Position.h +++ b/source/gwork/include/Gwork/Controls/Layout/Position.h @@ -30,7 +30,7 @@ namespace Gwk void PostLayout(Skin::Base* skin) override { - for(auto&& child : Children) + for (auto&& child : Children) { if (child->GetDock() != Position::None) continue; diff --git a/source/gwork/include/Gwork/Controls/Layout/Table.h b/source/gwork/include/Gwork/Controls/Layout/Table.h index 9a2a9a73..c55959f6 100644 --- a/source/gwork/include/Gwork/Controls/Layout/Table.h +++ b/source/gwork/include/Gwork/Controls/Layout/Table.h @@ -190,7 +190,7 @@ namespace Gwk if (m_columnCount == i) return; - for(auto&& child : Children) + for (auto&& child : Children) { TableRow* row = gwk_cast(child); @@ -245,7 +245,7 @@ namespace Gwk void Clear() { - for(auto&& child : Children) + for (auto&& child : Children) { TableRow* row = gwk_cast(child); @@ -279,7 +279,7 @@ namespace Gwk bool bEven = false; - for(auto&& child : Children) + for (auto&& child : Children) { TableRow* row = gwk_cast(child); @@ -324,7 +324,7 @@ namespace Gwk m_columnWidth[i] = 10; } - for(auto&& child : Children) + for (auto&& child : Children) { TableRow* row = gwk_cast(child); diff --git a/source/gwork/source/ControlList.cpp b/source/gwork/source/ControlList.cpp index d4022861..bbbd1c22 100644 --- a/source/gwork/source/ControlList.cpp +++ b/source/gwork/source/ControlList.cpp @@ -14,7 +14,7 @@ namespace Gwk void ControlList::Enable() { - for(auto&& item : list) + for (auto&& item : list) { item->SetDisabled(false); } @@ -22,7 +22,7 @@ void ControlList::Enable() void ControlList::Disable() { - for(auto&& item : list) + for (auto&& item : list) { item->SetDisabled(true); } @@ -30,7 +30,7 @@ void ControlList::Disable() void ControlList::Show() { - for(auto&& item : list) + for (auto&& item : list) { item->Show(); } @@ -38,7 +38,7 @@ void ControlList::Show() void ControlList::Hide() { - for(auto&& item : list) + for (auto&& item : list) { item->Hide(); } @@ -46,7 +46,7 @@ void ControlList::Hide() Gwk::String ControlList::GetValue() { - for(auto&& item : list) + for (auto&& item : list) { return item->GetValue(); } @@ -56,7 +56,7 @@ Gwk::String ControlList::GetValue() void ControlList::SetValue(const Gwk::String& value) { - for(auto&& item : list) + for (auto&& item : list) { item->SetValue(value); } @@ -64,7 +64,7 @@ void ControlList::SetValue(const Gwk::String& value) void ControlList::MoveBy(const Gwk::Point& point) { - for(auto&& item : list) + for (auto&& item : list) { item->MoveBy(point.x, point.y); } @@ -72,7 +72,7 @@ void ControlList::MoveBy(const Gwk::Point& point) void ControlList::DoAction() { - for(auto&& item : list) + for (auto&& item : list) { item->DoAction(); } @@ -82,7 +82,7 @@ void ControlList::SetActionInternal(Gwk::Event::Handler* object, void ( Gwk::Event::Handler::*f )( Gwk::Event::Info), const Gwk::Event::Packet& packet) { - for(auto&& item : list) + for (auto&& item : list) { item->SetAction(object, f, packet); } diff --git a/source/gwork/source/Controls/Base.cpp b/source/gwork/source/Controls/Base.cpp index 811a54fb..df368320 100644 --- a/source/gwork/source/Controls/Base.cpp +++ b/source/gwork/source/Controls/Base.cpp @@ -175,7 +175,7 @@ bool Base::Visible() const void Base::InvalidateChildren(bool bRecursive) { - for(auto&& child : Children) + for (auto&& child : Children) { child->Invalidate(); @@ -185,7 +185,7 @@ void Base::InvalidateChildren(bool bRecursive) if (m_innerPanel) { - for(auto&& innerchild : m_innerPanel->Children) + for (auto&& innerchild : m_innerPanel->Children) { innerchild->Invalidate(); @@ -252,7 +252,7 @@ void Base::BringToFront() Controls::Base* Base::FindChildByName(const Gwk::String& name, bool bRecursive) { - for(auto&& child : Children) + for (auto&& child : Children) { if (!child->GetName().empty() && child->GetName() == name) return child; @@ -338,7 +338,7 @@ Controls::Base* Base::GetChild(unsigned int i) if (i >= NumChildren()) return nullptr; - for(auto&& child : Children) + for (auto&& child : Children) { if (i == 0) return child; @@ -447,7 +447,7 @@ void Base::OnBoundsChanged(Gwk::Rect oldBounds) void Base::OnScaleChanged() { - for(auto&& child : Children) + for (auto&& child : Children) { child->OnScaleChanged(); } @@ -497,7 +497,7 @@ void Base::DoCacheRender(Gwk::Skin::Base* skin, Gwk::Controls::Base* master) if (!Children.empty()) { // Now render my kids - for(auto&& child : Children) + for (auto&& child : Children) { if (!child->Hidden()) { @@ -581,7 +581,7 @@ void Base::RenderRecursive(Gwk::Skin::Base* skin, const Gwk::Rect& cliprect) if (!Children.empty()) { // Now render my kids - for(auto&& child : Children) + for (auto&& child : Children) { if (child->Hidden()) continue; @@ -618,7 +618,7 @@ void Base::SetSkin(Skin::Base* skin, bool doChildren) if (doChildren) { - for(auto&& child : Children) + for (auto&& child : Children) { child->SetSkin(skin, true); } @@ -779,7 +779,7 @@ void Base::RecurseLayout(Skin::Base* skin) rBounds.y += m_padding.top; rBounds.h -= m_padding.top + m_padding.bottom; - for(auto&& child : Children) + for (auto&& child : Children) { if (child->Hidden()) continue; @@ -844,7 +844,7 @@ void Base::RecurseLayout(Skin::Base* skin) // // Fill uses the left over space, so do that now. // - for(auto&& child : Children) + for (auto&& child : Children) { Position dock = child->GetDock(); @@ -874,7 +874,7 @@ void Base::RecurseLayout(Skin::Base* skin) bool Base::IsChild(Controls::Base* possiblechild) { - for(auto&& child : Children) + for (auto&& child : Children) { if (possiblechild == child) return true; @@ -937,7 +937,7 @@ bool Base::IsMenuComponent() void Base::CloseMenus() { - for(auto&& child : Children) + for (auto&& child : Children) { child->CloseMenus(); } @@ -1003,7 +1003,7 @@ Gwk::Point Base::ChildrenSize() { Gwk::Point size; - for(auto&& child : Children) + for (auto&& child : Children) { if (child->Hidden()) continue; @@ -1057,7 +1057,7 @@ bool Base::HandleAccelerator(Gwk::String& accelerator) } } - for(auto&& child : Children) + for (auto&& child : Children) { if (child->HandleAccelerator(accelerator)) return true; @@ -1194,7 +1194,7 @@ int Base::GetNamedChildren(Gwk::ControlList& list, const Gwk::String& strName, b { int iFound = 0; - for(auto&& child : Children) + for (auto&& child : Children) { if (!child->GetName().empty() && child->GetName() == strName) { diff --git a/source/gwork/source/Controls/Canvas.cpp b/source/gwork/source/Controls/Canvas.cpp index 1ea3d6cf..27482956 100644 --- a/source/gwork/source/Controls/Canvas.cpp +++ b/source/gwork/source/Controls/Canvas.cpp @@ -143,7 +143,7 @@ void Canvas::ProcessDelayedDeletes() m_deleteList.clear(); m_deleteSet.clear(); - for(auto&& control : deleteList) + for (auto&& control : deleteList) { control->PreDelete(GetSkin()); delete control; diff --git a/source/gwork/source/Controls/CollapsibleCategory.cpp b/source/gwork/source/Controls/CollapsibleCategory.cpp index a6ad613d..b3ffc937 100644 --- a/source/gwork/source/Controls/CollapsibleCategory.cpp +++ b/source/gwork/source/Controls/CollapsibleCategory.cpp @@ -145,7 +145,7 @@ void CollapsibleCategory::UnselectAll() { Base::List& children = GetChildren(); - for(auto&& control : children) + for (auto&& control : children) { CategoryButton* child = gwk_cast(control); @@ -166,7 +166,7 @@ void CollapsibleCategory::PostLayout(Skin::Base* /*skin*/) Base::List& children = GetChildren(); bool b = true; - for(auto&& control : children) + for (auto&& control : children) { CategoryButton* child = gwk_cast(control); @@ -183,7 +183,7 @@ Button* CollapsibleCategory::GetSelected() { Base::List& children = GetChildren(); - for(auto&& control : children) + for (auto&& control : children) { CategoryButton* child = gwk_cast(control); diff --git a/source/gwork/source/Controls/ComboBox.cpp b/source/gwork/source/Controls/ComboBox.cpp index 86c6bc56..b6ad3f72 100644 --- a/source/gwork/source/Controls/ComboBox.cpp +++ b/source/gwork/source/Controls/ComboBox.cpp @@ -150,7 +150,7 @@ void ComboBox::OnItemSelected(Controls::Base* control) void ComboBox::SelectItemByName(const Gwk::String& name, bool bFireChangeEvents) { - for(auto&& control : m_menu->GetChildren()) + for (auto&& control : m_menu->GetChildren()) { MenuItem* child = gwk_cast(control); diff --git a/source/gwork/source/Controls/ListBox.cpp b/source/gwork/source/Controls/ListBox.cpp index 95bfb8ff..f5367b12 100644 --- a/source/gwork/source/Controls/ListBox.cpp +++ b/source/gwork/source/Controls/ListBox.cpp @@ -173,7 +173,7 @@ void ListBox::SelectByString(const String& strName, bool bClearOthers) Base::List& children = m_table->GetChildren(); - for(auto&& control : children) + for (auto&& control : children) { ListBoxRow* child = gwk_cast(control); diff --git a/source/gwork/source/Controls/Menu.cpp b/source/gwork/source/Controls/Menu.cpp index 9d1d3f54..e557cc79 100644 --- a/source/gwork/source/Controls/Menu.cpp +++ b/source/gwork/source/Controls/Menu.cpp @@ -42,7 +42,7 @@ void Menu::Layout(Skin::Base* skin) { int childrenHeight = 0; - for(auto&& child : m_innerPanel->Children) + for (auto&& child : m_innerPanel->Children) { if (!child) continue; @@ -89,7 +89,7 @@ void Menu::OnAddItem(MenuItem* item) void Menu::ClearItems() { - for(auto&& child : m_innerPanel->Children) + for (auto&& child : m_innerPanel->Children) { if (!child) continue; @@ -100,7 +100,7 @@ void Menu::ClearItems() void Menu::CloseAll() { - for(auto&& child : m_innerPanel->Children) + for (auto&& child : m_innerPanel->Children) { MenuItem* item = gwk_cast(child); @@ -113,7 +113,7 @@ void Menu::CloseAll() bool Menu::IsMenuOpen() { - for(auto&& child : m_innerPanel->Children) + for (auto&& child : m_innerPanel->Children) { MenuItem* item = gwk_cast(child); diff --git a/source/util/source/ControlFactory/ControlFactory.cpp b/source/util/source/ControlFactory/ControlFactory.cpp index 883c83d5..9a038280 100644 --- a/source/util/source/ControlFactory/ControlFactory.cpp +++ b/source/util/source/ControlFactory/ControlFactory.cpp @@ -250,7 +250,7 @@ Controls::Base* Clone(Controls::Base* source, ControlFactory::Base* factory) while (factory) { - for(auto&& property : factory->Properties()) + for (auto&& property : factory->Properties()) { property->SetValueFromString(control, property->GetValueAsString(source)); } diff --git a/source/util/source/ImportExport/Base.cpp b/source/util/source/ImportExport/Base.cpp index beef1a0d..98d7c203 100644 --- a/source/util/source/ImportExport/Base.cpp +++ b/source/util/source/ImportExport/Base.cpp @@ -12,7 +12,7 @@ ImportExport::Base::List& GetList() { static ImportExport::Base::List list; static bool Initialized = false; - + if (!Initialized) { Initialized = true; @@ -24,7 +24,7 @@ ImportExport::Base::List& GetList() ImportExport::Base* Find(Gwk::String strName) { - for(auto&& item : GetList()) + for (auto&& item : GetList()) { if (item->Name() == strName) return item; @@ -43,14 +43,14 @@ namespace Tools ControlList GetExportableChildren(Gwk::Controls::Base* root) { ControlList list; - + for (int i = 0; i < root->NumChildren(); i++) { Gwk::Controls::Base* baseChild = root->GetChild(i); - + if (!baseChild) continue; - + // // If we have a child is isn't exportable - maybe it has a // child that is @@ -61,13 +61,12 @@ namespace Tools list.Add(GetExportableChildren(baseChild)); continue; } - + list.Add(baseChild); } - + return list; } - } } // namespace ImportExport From 732f818c14aba8f66edfa5dd78bc6a647d2b4eda Mon Sep 17 00:00:00 2001 From: BQ Date: Wed, 18 May 2016 10:20:12 +0100 Subject: [PATCH 19/54] Use m_viewRect. --- source/platform/renderers/OpenGL/OpenGL.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/source/platform/renderers/OpenGL/OpenGL.cpp b/source/platform/renderers/OpenGL/OpenGL.cpp index 85cd1098..50ce945f 100644 --- a/source/platform/renderers/OpenGL/OpenGL.cpp +++ b/source/platform/renderers/OpenGL/OpenGL.cpp @@ -122,14 +122,12 @@ namespace Gwk { Flush(); Gwk::Rect rect = ClipRegion(); + // OpenGL's coords are from the bottom left - // so we need to translate them here. - { - GLint view[4]; - glGetIntegerv(GL_VIEWPORT, &view[0]); - rect.y = view[3] - (rect.y + rect.h); - } - glScissor(rect.x*Scale(), rect.y*Scale(), rect.w*Scale(), rect.h*Scale()); + rect.y = m_viewRect.h - (rect.y + rect.h); + + glScissor(rect.x * Scale(), rect.y * Scale(), + rect.w * Scale(), rect.h * Scale()); glEnable(GL_SCISSOR_TEST); } From d7befa3ec13837249edb4e13449afd4b99dda7b0 Mon Sep 17 00:00:00 2001 From: BQ Date: Wed, 18 May 2016 12:23:37 +0100 Subject: [PATCH 20/54] GL load fonts. - not quite rendering. --- source/platform/include/Gwork/PlatformTypes.h | 9 +- .../platform/include/Gwork/Renderers/OpenGL.h | 9 + source/platform/renderers/OpenGL/OpenGL.cpp | 103 +- .../platform/renderers/OpenGL/stb_truetype.h | 3267 +++++++++++++++++ source/samples/OpenGL/OpenGLSample.cpp | 1 + 5 files changed, 3377 insertions(+), 12 deletions(-) create mode 100644 source/platform/renderers/OpenGL/stb_truetype.h diff --git a/source/platform/include/Gwork/PlatformTypes.h b/source/platform/include/Gwork/PlatformTypes.h index 4c8533f1..ffb27e31 100644 --- a/source/platform/include/Gwork/PlatformTypes.h +++ b/source/platform/include/Gwork/PlatformTypes.h @@ -205,6 +205,7 @@ namespace Gwk , bold(false) , data(nullptr) , realsize(0) + , render_data(nullptr) { } @@ -212,12 +213,12 @@ namespace Gwk float size; bool bold; - /// This should be set by the renderer - /// if it tries to use a font where it's nullptr. - void* data; + void *data; // Font data, set by renderer - /// This is the real font size, after it's been scaled by Render->Scale() + // This is the real font size, after it's been scaled by Render->Scale() float realsize; + + void *render_data; // optional renderer data }; struct Texture diff --git a/source/platform/include/Gwork/Renderers/OpenGL.h b/source/platform/include/Gwork/Renderers/OpenGL.h index 80ba8d79..6b9545d1 100644 --- a/source/platform/include/Gwork/Renderers/OpenGL.h +++ b/source/platform/include/Gwork/Renderers/OpenGL.h @@ -41,6 +41,15 @@ namespace Gwk unsigned int x, unsigned int y, const Gwk::Color& col_default) override; + void LoadFont(Gwk::Font* font) override; + void FreeFont(Gwk::Font* font) override; + + void RenderText(Gwk::Font* font, + Gwk::Point pos, + const Gwk::String& text) override; + + Gwk::Point MeasureText(Gwk::Font* font, const Gwk::String& text) override; + protected: Rect m_viewRect; diff --git a/source/platform/renderers/OpenGL/OpenGL.cpp b/source/platform/renderers/OpenGL/OpenGL.cpp index 85cd1098..f219de38 100644 --- a/source/platform/renderers/OpenGL/OpenGL.cpp +++ b/source/platform/renderers/OpenGL/OpenGL.cpp @@ -10,11 +10,16 @@ #include #include +#include +#include //#define STBI_ASSERT(x) // comment in for no asserts #define STB_IMAGE_IMPLEMENTATION #include "stb_image.h" +#define STB_TRUETYPE_IMPLEMENTATION +#define STBTT_STATIC +#include "stb_truetype.h" namespace Gwk { @@ -71,6 +76,7 @@ namespace Gwk glTexCoordPointer(2, GL_FLOAT, sizeof(Vertex), (void*)&m_vertices[0].u); glEnableClientState(GL_TEXTURE_COORD_ARRAY); glDrawArrays(GL_TRIANGLES, 0, (GLsizei)m_vertNum); + m_vertNum = 0; glFlush(); } @@ -225,24 +231,105 @@ namespace Gwk unsigned int iPixelSize = sizeof(unsigned char)*4; glBindTexture(GL_TEXTURE_2D, *tex); unsigned char* data = - (unsigned char*)malloc(iPixelSize*texture->width*texture->height); + (unsigned char*)malloc(iPixelSize * texture->width * texture->height); glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); unsigned int iOffset = (y*texture->width+x)*4; - Gwk::Color c; - c.r = data[0+iOffset]; - c.g = data[1+iOffset]; - c.b = data[2+iOffset]; - c.a = data[3+iOffset]; - // + + Color c(data[0+iOffset], data[1+iOffset], data[2+iOffset], data[3+iOffset]); + // Retrieving the entire texture for a single pixel read // is kind of a waste - maybe cache this pointer in the texture // data and then release later on? It's never called during runtime // - only during initialization. - // free(data); + return c; } + void OpenGL::LoadFont(Gwk::Font* font) + { + std::string fontName(font->facename); + + if (fontName.find(".ttf") == std::string::npos) + fontName += ".ttf"; + + FILE* f = fopen(fontName.c_str(), "rb"); + if (!f) + { + font->data = nullptr; + return; + } + + struct stat stat_buf; + int rc = stat(fontName.c_str(), &stat_buf); + size_t fsz = rc == 0 ? stat_buf.st_size : -1; + assert(fsz > 0); + + unsigned char* ttfdata = new unsigned char[fsz]; + fread(ttfdata, 1, fsz, f); + + const int texsz = 512; + unsigned char *font_bmp = new unsigned char[texsz * texsz]; + + font->render_data = new stbtt_bakedchar['z' - ' ' + 1]; + + stbtt_BakeFontBitmap(ttfdata, 0, + font->realsize, // height + font_bmp, texsz, texsz, + ' ','z', // range to bake + static_cast(font->render_data)); + delete [] ttfdata; + + font->data = new GLuint; + glGenTextures(1, static_cast(font->data)); + glBindTexture(GL_TEXTURE_2D, *static_cast(font->data)); + glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 512,512, 0, GL_ALPHA, GL_UNSIGNED_BYTE, + font_bmp); + delete [] font_bmp; + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + } + + void OpenGL::FreeFont(Gwk::Font* font) + { + delete [] static_cast(font->data); + delete [] static_cast(font->render_data); + } + + void OpenGL::RenderText(Gwk::Font* font, Gwk::Point pos, + const Gwk::String& text) + { +// return; + + if (!font->data) + { + LoadFont(font); + } + + Texture tex; + tex.data = font->data; + + float x = pos.x, y = pos.y; + const char *pc = text.c_str(); + size_t slen = text.length(); + + while (slen > 0) + { + stbtt_aligned_quad q; + stbtt_GetBakedQuad(static_cast(font->render_data), + 512,512, + *pc - 32, + &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 + Rect r(q.x0, q.y0, q.x1 - q.x0, q.y1 - q.y0); + DrawTexturedRect(&tex, r, q.s0,q.t0, q.s1,q.t1); + ++pc, --slen; + } + } + + Gwk::Point OpenGL::MeasureText(Gwk::Font* font, const Gwk::String& text) + { + return Point(); + } + bool OpenGL::InitializeContext(Gwk::WindowProvider* window) { #ifdef _WIN32 diff --git a/source/platform/renderers/OpenGL/stb_truetype.h b/source/platform/renderers/OpenGL/stb_truetype.h new file mode 100644 index 00000000..d360d609 --- /dev/null +++ b/source/platform/renderers/OpenGL/stb_truetype.h @@ -0,0 +1,3267 @@ +// stb_truetype.h - v1.11 - public domain +// authored from 2009-2015 by Sean Barrett / RAD Game Tools +// +// This library processes TrueType files: +// parse files +// extract glyph metrics +// extract glyph shapes +// render glyphs to one-channel bitmaps with antialiasing (box filter) +// +// Todo: +// non-MS cmaps +// crashproof on bad data +// hinting? (no longer patented) +// cleartype-style AA? +// optimize: use simple memory allocator for intermediates +// optimize: build edge-list directly from curves +// optimize: rasterize directly from curves? +// +// ADDITIONAL CONTRIBUTORS +// +// Mikko Mononen: compound shape support, more cmap formats +// Tor Andersson: kerning, subpixel rendering +// +// Misc other: +// Ryan Gordon +// Simon Glass +// +// Bug/warning reports/fixes: +// "Zer" on mollyrocket (with fix) +// Cass Everitt +// stoiko (Haemimont Games) +// Brian Hook +// Walter van Niftrik +// David Gow +// David Given +// Ivan-Assen Ivanov +// Anthony Pesch +// Johan Duparc +// Hou Qiming +// Fabian "ryg" Giesen +// Martins Mozeiko +// Cap Petschulat +// Omar Cornut +// github:aloucks +// Peter LaValle +// Sergey Popov +// Giumo X. Clanjor +// Higor Euripedes +// Thomas Fields +// Derek Vinyard +// +// VERSION HISTORY +// +// 1.11 (2016-04-02) fix unused-variable warning +// 1.10 (2016-04-02) user-defined fabs(); rare memory leak; remove duplicate typedef +// 1.09 (2016-01-16) warning fix; avoid crash on outofmem; use allocation userdata properly +// 1.08 (2015-09-13) document stbtt_Rasterize(); fixes for vertical & horizontal edges +// 1.07 (2015-08-01) allow PackFontRanges to accept arrays of sparse codepoints; +// variant PackFontRanges to pack and render in separate phases; +// fix stbtt_GetFontOFfsetForIndex (never worked for non-0 input?); +// fixed an assert() bug in the new rasterizer +// replace assert() with STBTT_assert() in new rasterizer +// 1.06 (2015-07-14) performance improvements (~35% faster on x86 and x64 on test machine) +// also more precise AA rasterizer, except if shapes overlap +// remove need for STBTT_sort +// 1.05 (2015-04-15) fix misplaced definitions for STBTT_STATIC +// 1.04 (2015-04-15) typo in example +// 1.03 (2015-04-12) STBTT_STATIC, fix memory leak in new packing, various fixes +// +// Full history can be found at the end of this file. +// +// LICENSE +// +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. +// +// USAGE +// +// Include this file in whatever places neeed to refer to it. In ONE C/C++ +// file, write: +// #define STB_TRUETYPE_IMPLEMENTATION +// before the #include of this file. This expands out the actual +// implementation into that C/C++ file. +// +// To make the implementation private to the file that generates the implementation, +// #define STBTT_STATIC +// +// Simple 3D API (don't ship this, but it's fine for tools and quick start) +// stbtt_BakeFontBitmap() -- bake a font to a bitmap for use as texture +// stbtt_GetBakedQuad() -- compute quad to draw for a given char +// +// Improved 3D API (more shippable): +// #include "stb_rect_pack.h" -- optional, but you really want it +// stbtt_PackBegin() +// stbtt_PackSetOversample() -- for improved quality on small fonts +// stbtt_PackFontRanges() -- pack and renders +// stbtt_PackEnd() +// stbtt_GetPackedQuad() +// +// "Load" a font file from a memory buffer (you have to keep the buffer loaded) +// stbtt_InitFont() +// stbtt_GetFontOffsetForIndex() -- use for TTC font collections +// +// Render a unicode codepoint to a bitmap +// stbtt_GetCodepointBitmap() -- allocates and returns a bitmap +// stbtt_MakeCodepointBitmap() -- renders into bitmap you provide +// stbtt_GetCodepointBitmapBox() -- how big the bitmap must be +// +// Character advance/positioning +// stbtt_GetCodepointHMetrics() +// stbtt_GetFontVMetrics() +// stbtt_GetCodepointKernAdvance() +// +// Starting with version 1.06, the rasterizer was replaced with a new, +// faster and generally-more-precise rasterizer. The new rasterizer more +// accurately measures pixel coverage for anti-aliasing, except in the case +// where multiple shapes overlap, in which case it overestimates the AA pixel +// coverage. Thus, anti-aliasing of intersecting shapes may look wrong. If +// this turns out to be a problem, you can re-enable the old rasterizer with +// #define STBTT_RASTERIZER_VERSION 1 +// which will incur about a 15% speed hit. +// +// ADDITIONAL DOCUMENTATION +// +// Immediately after this block comment are a series of sample programs. +// +// After the sample programs is the "header file" section. This section +// includes documentation for each API function. +// +// Some important concepts to understand to use this library: +// +// Codepoint +// Characters are defined by unicode codepoints, e.g. 65 is +// uppercase A, 231 is lowercase c with a cedilla, 0x7e30 is +// the hiragana for "ma". +// +// Glyph +// A visual character shape (every codepoint is rendered as +// some glyph) +// +// Glyph index +// A font-specific integer ID representing a glyph +// +// Baseline +// Glyph shapes are defined relative to a baseline, which is the +// bottom of uppercase characters. Characters extend both above +// and below the baseline. +// +// Current Point +// As you draw text to the screen, you keep track of a "current point" +// which is the origin of each character. The current point's vertical +// position is the baseline. Even "baked fonts" use this model. +// +// Vertical Font Metrics +// The vertical qualities of the font, used to vertically position +// and space the characters. See docs for stbtt_GetFontVMetrics. +// +// Font Size in Pixels or Points +// The preferred interface for specifying font sizes in stb_truetype +// is to specify how tall the font's vertical extent should be in pixels. +// If that sounds good enough, skip the next paragraph. +// +// Most font APIs instead use "points", which are a common typographic +// measurement for describing font size, defined as 72 points per inch. +// stb_truetype provides a point API for compatibility. However, true +// "per inch" conventions don't make much sense on computer displays +// since they different monitors have different number of pixels per +// inch. For example, Windows traditionally uses a convention that +// there are 96 pixels per inch, thus making 'inch' measurements have +// nothing to do with inches, and thus effectively defining a point to +// be 1.333 pixels. Additionally, the TrueType font data provides +// an explicit scale factor to scale a given font's glyphs to points, +// but the author has observed that this scale factor is often wrong +// for non-commercial fonts, thus making fonts scaled in points +// according to the TrueType spec incoherently sized in practice. +// +// ADVANCED USAGE +// +// Quality: +// +// - Use the functions with Subpixel at the end to allow your characters +// to have subpixel positioning. Since the font is anti-aliased, not +// hinted, this is very import for quality. (This is not possible with +// baked fonts.) +// +// - Kerning is now supported, and if you're supporting subpixel rendering +// then kerning is worth using to give your text a polished look. +// +// Performance: +// +// - Convert Unicode codepoints to glyph indexes and operate on the glyphs; +// if you don't do this, stb_truetype is forced to do the conversion on +// every call. +// +// - There are a lot of memory allocations. We should modify it to take +// a temp buffer and allocate from the temp buffer (without freeing), +// should help performance a lot. +// +// NOTES +// +// The system uses the raw data found in the .ttf file without changing it +// and without building auxiliary data structures. This is a bit inefficient +// on little-endian systems (the data is big-endian), but assuming you're +// caching the bitmaps or glyph shapes this shouldn't be a big deal. +// +// It appears to be very hard to programmatically determine what font a +// given file is in a general way. I provide an API for this, but I don't +// recommend it. +// +// +// SOURCE STATISTICS (based on v0.6c, 2050 LOC) +// +// Documentation & header file 520 LOC \___ 660 LOC documentation +// Sample code 140 LOC / +// Truetype parsing 620 LOC ---- 620 LOC TrueType +// Software rasterization 240 LOC \ . +// Curve tesselation 120 LOC \__ 550 LOC Bitmap creation +// Bitmap management 100 LOC / +// Baked bitmap interface 70 LOC / +// Font name matching & access 150 LOC ---- 150 +// C runtime library abstraction 60 LOC ---- 60 +// +// +// PERFORMANCE MEASUREMENTS FOR 1.06: +// +// 32-bit 64-bit +// Previous release: 8.83 s 7.68 s +// Pool allocations: 7.72 s 6.34 s +// Inline sort : 6.54 s 5.65 s +// New rasterizer : 5.63 s 5.00 s + +////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// +//// +//// SAMPLE PROGRAMS +//// +// +// Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless +// +#if 0 +#define STB_TRUETYPE_IMPLEMENTATION // force following include to generate implementation +#include "stb_truetype.h" + +unsigned char ttf_buffer[1<<20]; +unsigned char temp_bitmap[512*512]; + +stbtt_bakedchar cdata[96]; // ASCII 32..126 is 95 glyphs +GLuint ftex; + +void my_stbtt_initfont(void) +{ + fread(ttf_buffer, 1, 1<<20, fopen("c:/windows/fonts/times.ttf", "rb")); + stbtt_BakeFontBitmap(ttf_buffer,0, 32.0, temp_bitmap,512,512, 32,96, cdata); // no guarantee this fits! + // can free ttf_buffer at this point + glGenTextures(1, &ftex); + glBindTexture(GL_TEXTURE_2D, ftex); + glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 512,512, 0, GL_ALPHA, GL_UNSIGNED_BYTE, temp_bitmap); + // can free temp_bitmap at this point + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); +} + +void my_stbtt_print(float x, float y, char *text) +{ + // assume orthographic projection with units = screen pixels, origin at top left + glEnable(GL_TEXTURE_2D); + glBindTexture(GL_TEXTURE_2D, ftex); + glBegin(GL_QUADS); + while (*text) { + if (*text >= 32 && *text < 128) { + stbtt_aligned_quad q; + stbtt_GetBakedQuad(cdata, 512,512, *text-32, &x,&y,&q,1);//1=opengl & d3d10+,0=d3d9 + glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y0); + glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y0); + glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y1); + glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y1); + } + ++text; + } + glEnd(); +} +#endif +// +// +////////////////////////////////////////////////////////////////////////////// +// +// Complete program (this compiles): get a single bitmap, print as ASCII art +// +#if 0 +#include +#define STB_TRUETYPE_IMPLEMENTATION // force following include to generate implementation +#include "stb_truetype.h" + +char ttf_buffer[1<<25]; + +int main(int argc, char **argv) +{ + stbtt_fontinfo font; + unsigned char *bitmap; + int w,h,i,j,c = (argc > 1 ? atoi(argv[1]) : 'a'), s = (argc > 2 ? atoi(argv[2]) : 20); + + fread(ttf_buffer, 1, 1<<25, fopen(argc > 3 ? argv[3] : "c:/windows/fonts/arialbd.ttf", "rb")); + + stbtt_InitFont(&font, ttf_buffer, stbtt_GetFontOffsetForIndex(ttf_buffer,0)); + bitmap = stbtt_GetCodepointBitmap(&font, 0,stbtt_ScaleForPixelHeight(&font, s), c, &w, &h, 0,0); + + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) + putchar(" .:ioVM@"[bitmap[j*w+i]>>5]); + putchar('\n'); + } + return 0; +} +#endif +// +// Output: +// +// .ii. +// @@@@@@. +// V@Mio@@o +// :i. V@V +// :oM@@M +// :@@@MM@M +// @@o o@M +// :@@. M@M +// @@@o@@@@ +// :M@@V:@@. +// +////////////////////////////////////////////////////////////////////////////// +// +// Complete program: print "Hello World!" banner, with bugs +// +#if 0 +char buffer[24<<20]; +unsigned char screen[20][79]; + +int main(int arg, char **argv) +{ + stbtt_fontinfo font; + int i,j,ascent,baseline,ch=0; + float scale, xpos=2; // leave a little padding in case the character extends left + char *text = "Heljo World!"; // intentionally misspelled to show 'lj' brokenness + + fread(buffer, 1, 1000000, fopen("c:/windows/fonts/arialbd.ttf", "rb")); + stbtt_InitFont(&font, buffer, 0); + + scale = stbtt_ScaleForPixelHeight(&font, 15); + stbtt_GetFontVMetrics(&font, &ascent,0,0); + baseline = (int) (ascent*scale); + + while (text[ch]) { + int advance,lsb,x0,y0,x1,y1; + float x_shift = xpos - (float) floor(xpos); + stbtt_GetCodepointHMetrics(&font, text[ch], &advance, &lsb); + stbtt_GetCodepointBitmapBoxSubpixel(&font, text[ch], scale,scale,x_shift,0, &x0,&y0,&x1,&y1); + stbtt_MakeCodepointBitmapSubpixel(&font, &screen[baseline + y0][(int) xpos + x0], x1-x0,y1-y0, 79, scale,scale,x_shift,0, text[ch]); + // note that this stomps the old data, so where character boxes overlap (e.g. 'lj') it's wrong + // because this API is really for baking character bitmaps into textures. if you want to render + // a sequence of characters, you really need to render each bitmap to a temp buffer, then + // "alpha blend" that into the working buffer + xpos += (advance * scale); + if (text[ch+1]) + xpos += scale*stbtt_GetCodepointKernAdvance(&font, text[ch],text[ch+1]); + ++ch; + } + + for (j=0; j < 20; ++j) { + for (i=0; i < 78; ++i) + putchar(" .:ioVM@"[screen[j][i]>>5]); + putchar('\n'); + } + + return 0; +} +#endif + + +////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// +//// +//// INTEGRATION WITH YOUR CODEBASE +//// +//// The following sections allow you to supply alternate definitions +//// of C library functions used by stb_truetype. + +#ifdef STB_TRUETYPE_IMPLEMENTATION + // #define your own (u)stbtt_int8/16/32 before including to override this + #ifndef stbtt_uint8 + typedef unsigned char stbtt_uint8; + typedef signed char stbtt_int8; + typedef unsigned short stbtt_uint16; + typedef signed short stbtt_int16; + typedef unsigned int stbtt_uint32; + typedef signed int stbtt_int32; + #endif + + typedef char stbtt__check_size32[sizeof(stbtt_int32)==4 ? 1 : -1]; + typedef char stbtt__check_size16[sizeof(stbtt_int16)==2 ? 1 : -1]; + + // #define your own STBTT_ifloor/STBTT_iceil() to avoid math.h + #ifndef STBTT_ifloor + #include + #define STBTT_ifloor(x) ((int) floor(x)) + #define STBTT_iceil(x) ((int) ceil(x)) + #endif + + #ifndef STBTT_sqrt + #include + #define STBTT_sqrt(x) sqrt(x) + #endif + + #ifndef STBTT_fabs + #include + #define STBTT_fabs(x) fabs(x) + #endif + + // #define your own functions "STBTT_malloc" / "STBTT_free" to avoid malloc.h + #ifndef STBTT_malloc + #include + #define STBTT_malloc(x,u) ((void)(u),malloc(x)) + #define STBTT_free(x,u) ((void)(u),free(x)) + #endif + + #ifndef STBTT_assert + #include + #define STBTT_assert(x) assert(x) + #endif + + #ifndef STBTT_strlen + #include + #define STBTT_strlen(x) strlen(x) + #endif + + #ifndef STBTT_memcpy + #include + #define STBTT_memcpy memcpy + #define STBTT_memset memset + #endif +#endif + +/////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +//// +//// INTERFACE +//// +//// + +#ifndef __STB_INCLUDE_STB_TRUETYPE_H__ +#define __STB_INCLUDE_STB_TRUETYPE_H__ + +#ifdef STBTT_STATIC +#define STBTT_DEF static +#else +#define STBTT_DEF extern +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// TEXTURE BAKING API +// +// If you use this API, you only have to call two functions ever. +// + +typedef struct +{ + unsigned short x0,y0,x1,y1; // coordinates of bbox in bitmap + float xoff,yoff,xadvance; +} stbtt_bakedchar; + +STBTT_DEF int stbtt_BakeFontBitmap(const unsigned char *data, int offset, // font location (use offset=0 for plain .ttf) + float pixel_height, // height of font in pixels + unsigned char *pixels, int pw, int ph, // bitmap to be filled in + int first_char, int num_chars, // characters to bake + stbtt_bakedchar *chardata); // you allocate this, it's num_chars long +// if return is positive, the first unused row of the bitmap +// if return is negative, returns the negative of the number of characters that fit +// if return is 0, no characters fit and no rows were used +// This uses a very crappy packing. + +typedef struct +{ + float x0,y0,s0,t0; // top-left + float x1,y1,s1,t1; // bottom-right +} stbtt_aligned_quad; + +STBTT_DEF void stbtt_GetBakedQuad(stbtt_bakedchar *chardata, int pw, int ph, // same data as above + int char_index, // character to display + float *xpos, float *ypos, // pointers to current position in screen pixel space + stbtt_aligned_quad *q, // output: quad to draw + int opengl_fillrule); // true if opengl fill rule; false if DX9 or earlier +// Call GetBakedQuad with char_index = 'character - first_char', and it +// creates the quad you need to draw and advances the current position. +// +// The coordinate system used assumes y increases downwards. +// +// Characters will extend both above and below the current position; +// see discussion of "BASELINE" above. +// +// It's inefficient; you might want to c&p it and optimize it. + + + +////////////////////////////////////////////////////////////////////////////// +// +// NEW TEXTURE BAKING API +// +// This provides options for packing multiple fonts into one atlas, not +// perfectly but better than nothing. + +typedef struct +{ + unsigned short x0,y0,x1,y1; // coordinates of bbox in bitmap + float xoff,yoff,xadvance; + float xoff2,yoff2; +} stbtt_packedchar; + +typedef struct stbtt_pack_context stbtt_pack_context; +typedef struct stbtt_fontinfo stbtt_fontinfo; +#ifndef STB_RECT_PACK_VERSION +typedef struct stbrp_rect stbrp_rect; +#endif + +STBTT_DEF int stbtt_PackBegin(stbtt_pack_context *spc, unsigned char *pixels, int width, int height, int stride_in_bytes, int padding, void *alloc_context); +// Initializes a packing context stored in the passed-in stbtt_pack_context. +// Future calls using this context will pack characters into the bitmap passed +// in here: a 1-channel bitmap that is weight x height. stride_in_bytes is +// the distance from one row to the next (or 0 to mean they are packed tightly +// together). "padding" is the amount of padding to leave between each +// character (normally you want '1' for bitmaps you'll use as textures with +// bilinear filtering). +// +// Returns 0 on failure, 1 on success. + +STBTT_DEF void stbtt_PackEnd (stbtt_pack_context *spc); +// Cleans up the packing context and frees all memory. + +#define STBTT_POINT_SIZE(x) (-(x)) + +STBTT_DEF int stbtt_PackFontRange(stbtt_pack_context *spc, unsigned char *fontdata, int font_index, float font_size, + int first_unicode_char_in_range, int num_chars_in_range, stbtt_packedchar *chardata_for_range); +// Creates character bitmaps from the font_index'th font found in fontdata (use +// font_index=0 if you don't know what that is). It creates num_chars_in_range +// bitmaps for characters with unicode values starting at first_unicode_char_in_range +// and increasing. Data for how to render them is stored in chardata_for_range; +// pass these to stbtt_GetPackedQuad to get back renderable quads. +// +// font_size is the full height of the character from ascender to descender, +// as computed by stbtt_ScaleForPixelHeight. To use a point size as computed +// by stbtt_ScaleForMappingEmToPixels, wrap the point size in STBTT_POINT_SIZE() +// and pass that result as 'font_size': +// ..., 20 , ... // font max minus min y is 20 pixels tall +// ..., STBTT_POINT_SIZE(20), ... // 'M' is 20 pixels tall + +typedef struct +{ + float font_size; + int first_unicode_codepoint_in_range; // if non-zero, then the chars are continuous, and this is the first codepoint + int *array_of_unicode_codepoints; // if non-zero, then this is an array of unicode codepoints + int num_chars; + stbtt_packedchar *chardata_for_range; // output + unsigned char h_oversample, v_oversample; // don't set these, they're used internally +} stbtt_pack_range; + +STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, unsigned char *fontdata, int font_index, stbtt_pack_range *ranges, int num_ranges); +// Creates character bitmaps from multiple ranges of characters stored in +// ranges. This will usually create a better-packed bitmap than multiple +// calls to stbtt_PackFontRange. Note that you can call this multiple +// times within a single PackBegin/PackEnd. + +STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h_oversample, unsigned int v_oversample); +// Oversampling a font increases the quality by allowing higher-quality subpixel +// positioning, and is especially valuable at smaller text sizes. +// +// This function sets the amount of oversampling for all following calls to +// stbtt_PackFontRange(s) or stbtt_PackFontRangesGatherRects for a given +// pack context. The default (no oversampling) is achieved by h_oversample=1 +// and v_oversample=1. The total number of pixels required is +// h_oversample*v_oversample larger than the default; for example, 2x2 +// oversampling requires 4x the storage of 1x1. For best results, render +// oversampled textures with bilinear filtering. Look at the readme in +// stb/tests/oversample for information about oversampled fonts +// +// To use with PackFontRangesGather etc., you must set it before calls +// call to PackFontRangesGatherRects. + +STBTT_DEF void stbtt_GetPackedQuad(stbtt_packedchar *chardata, int pw, int ph, // same data as above + int char_index, // character to display + float *xpos, float *ypos, // pointers to current position in screen pixel space + stbtt_aligned_quad *q, // output: quad to draw + int align_to_integer); + +STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects); +STBTT_DEF void stbtt_PackFontRangesPackRects(stbtt_pack_context *spc, stbrp_rect *rects, int num_rects); +STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects); +// Calling these functions in sequence is roughly equivalent to calling +// stbtt_PackFontRanges(). If you more control over the packing of multiple +// fonts, or if you want to pack custom data into a font texture, take a look +// at the source to of stbtt_PackFontRanges() and create a custom version +// using these functions, e.g. call GatherRects multiple times, +// building up a single array of rects, then call PackRects once, +// then call RenderIntoRects repeatedly. This may result in a +// better packing than calling PackFontRanges multiple times +// (or it may not). + +// this is an opaque structure that you shouldn't mess with which holds +// all the context needed from PackBegin to PackEnd. +struct stbtt_pack_context { + void *user_allocator_context; + void *pack_info; + int width; + int height; + int stride_in_bytes; + int padding; + unsigned int h_oversample, v_oversample; + unsigned char *pixels; + void *nodes; +}; + +////////////////////////////////////////////////////////////////////////////// +// +// FONT LOADING +// +// + +STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index); +// Each .ttf/.ttc file may have more than one font. Each font has a sequential +// index number starting from 0. Call this function to get the font offset for +// a given index; it returns -1 if the index is out of range. A regular .ttf +// file will only define one font and it always be at offset 0, so it will +// return '0' for index 0, and -1 for all other indices. You can just skip +// this step if you know it's that kind of font. + + +// The following structure is defined publically so you can declare one on +// the stack or as a global or etc, but you should treat it as opaque. +struct stbtt_fontinfo +{ + void * userdata; + unsigned char * data; // pointer to .ttf file + int fontstart; // offset of start of font + + int numGlyphs; // number of glyphs, needed for range checking + + int loca,head,glyf,hhea,hmtx,kern; // table locations as offset from start of .ttf + int index_map; // a cmap mapping for our chosen character encoding + int indexToLocFormat; // format needed to map from glyph index to glyph +}; + +STBTT_DEF int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data, int offset); +// Given an offset into the file that defines a font, this function builds +// the necessary cached info for the rest of the system. You must allocate +// the stbtt_fontinfo yourself, and stbtt_InitFont will fill it out. You don't +// need to do anything special to free it, because the contents are pure +// value data with no additional data structures. Returns 0 on failure. + + +////////////////////////////////////////////////////////////////////////////// +// +// CHARACTER TO GLYPH-INDEX CONVERSIOn + +STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint); +// If you're going to perform multiple operations on the same character +// and you want a speed-up, call this function with the character you're +// going to process, then use glyph-based functions instead of the +// codepoint-based functions. + + +////////////////////////////////////////////////////////////////////////////// +// +// CHARACTER PROPERTIES +// + +STBTT_DEF float stbtt_ScaleForPixelHeight(const stbtt_fontinfo *info, float pixels); +// computes a scale factor to produce a font whose "height" is 'pixels' tall. +// Height is measured as the distance from the highest ascender to the lowest +// descender; in other words, it's equivalent to calling stbtt_GetFontVMetrics +// and computing: +// scale = pixels / (ascent - descent) +// so if you prefer to measure height by the ascent only, use a similar calculation. + +STBTT_DEF float stbtt_ScaleForMappingEmToPixels(const stbtt_fontinfo *info, float pixels); +// computes a scale factor to produce a font whose EM size is mapped to +// 'pixels' tall. This is probably what traditional APIs compute, but +// I'm not positive. + +STBTT_DEF void stbtt_GetFontVMetrics(const stbtt_fontinfo *info, int *ascent, int *descent, int *lineGap); +// ascent is the coordinate above the baseline the font extends; descent +// is the coordinate below the baseline the font extends (i.e. it is typically negative) +// lineGap is the spacing between one row's descent and the next row's ascent... +// so you should advance the vertical position by "*ascent - *descent + *lineGap" +// these are expressed in unscaled coordinates, so you must multiply by +// the scale factor for a given size + +STBTT_DEF void stbtt_GetFontBoundingBox(const stbtt_fontinfo *info, int *x0, int *y0, int *x1, int *y1); +// the bounding box around all possible characters + +STBTT_DEF void stbtt_GetCodepointHMetrics(const stbtt_fontinfo *info, int codepoint, int *advanceWidth, int *leftSideBearing); +// leftSideBearing is the offset from the current horizontal position to the left edge of the character +// advanceWidth is the offset from the current horizontal position to the next horizontal position +// these are expressed in unscaled coordinates + +STBTT_DEF int stbtt_GetCodepointKernAdvance(const stbtt_fontinfo *info, int ch1, int ch2); +// an additional amount to add to the 'advance' value between ch1 and ch2 + +STBTT_DEF int stbtt_GetCodepointBox(const stbtt_fontinfo *info, int codepoint, int *x0, int *y0, int *x1, int *y1); +// Gets the bounding box of the visible part of the glyph, in unscaled coordinates + +STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_index, int *advanceWidth, int *leftSideBearing); +STBTT_DEF int stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2); +STBTT_DEF int stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1); +// as above, but takes one or more glyph indices for greater efficiency + + +////////////////////////////////////////////////////////////////////////////// +// +// GLYPH SHAPES (you probably don't need these, but they have to go before +// the bitmaps for C declaration-order reasons) +// + +#ifndef STBTT_vmove // you can predefine these to use different values (but why?) + enum { + STBTT_vmove=1, + STBTT_vline, + STBTT_vcurve + }; +#endif + +#ifndef stbtt_vertex // you can predefine this to use different values + // (we share this with other code at RAD) + #define stbtt_vertex_type short // can't use stbtt_int16 because that's not visible in the header file + typedef struct + { + stbtt_vertex_type x,y,cx,cy; + unsigned char type,padding; + } stbtt_vertex; +#endif + +STBTT_DEF int stbtt_IsGlyphEmpty(const stbtt_fontinfo *info, int glyph_index); +// returns non-zero if nothing is drawn for this glyph + +STBTT_DEF int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices); +STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **vertices); +// returns # of vertices and fills *vertices with the pointer to them +// these are expressed in "unscaled" coordinates +// +// The shape is a series of countours. Each one starts with +// a STBTT_moveto, then consists of a series of mixed +// STBTT_lineto and STBTT_curveto segments. A lineto +// draws a line from previous endpoint to its x,y; a curveto +// draws a quadratic bezier from previous endpoint to +// its x,y, using cx,cy as the bezier control point. + +STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *vertices); +// frees the data allocated above + +////////////////////////////////////////////////////////////////////////////// +// +// BITMAP RENDERING +// + +STBTT_DEF void stbtt_FreeBitmap(unsigned char *bitmap, void *userdata); +// frees the bitmap allocated below + +STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff); +// allocates a large-enough single-channel 8bpp bitmap and renders the +// specified character/glyph at the specified scale into it, with +// antialiasing. 0 is no coverage (transparent), 255 is fully covered (opaque). +// *width & *height are filled out with the width & height of the bitmap, +// which is stored left-to-right, top-to-bottom. +// +// xoff/yoff are the offset it pixel space from the glyph origin to the top-left of the bitmap + +STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff); +// the same as stbtt_GetCodepoitnBitmap, but you can specify a subpixel +// shift for the character + +STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint); +// the same as stbtt_GetCodepointBitmap, but you pass in storage for the bitmap +// in the form of 'output', with row spacing of 'out_stride' bytes. the bitmap +// is clipped to out_w/out_h bytes. Call stbtt_GetCodepointBitmapBox to get the +// width and height and positioning info for it first. + +STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint); +// same as stbtt_MakeCodepointBitmap, but you can specify a subpixel +// shift for the character + +STBTT_DEF void stbtt_GetCodepointBitmapBox(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1); +// get the bbox of the bitmap centered around the glyph origin; so the +// bitmap width is ix1-ix0, height is iy1-iy0, and location to place +// the bitmap top left is (leftSideBearing*scale,iy0). +// (Note that the bitmap uses y-increases-down, but the shape uses +// y-increases-up, so CodepointBitmapBox and CodepointBox are inverted.) + +STBTT_DEF void stbtt_GetCodepointBitmapBoxSubpixel(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1); +// same as stbtt_GetCodepointBitmapBox, but you can specify a subpixel +// shift for the character + +// the following functions are equivalent to the above functions, but operate +// on glyph indices instead of Unicode codepoints (for efficiency) +STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff); +STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int glyph, int *width, int *height, int *xoff, int *yoff); +STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int glyph); +STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int glyph); +STBTT_DEF void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1); +STBTT_DEF void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1); + + +// @TODO: don't expose this structure +typedef struct +{ + int w,h,stride; + unsigned char *pixels; +} stbtt__bitmap; + +// rasterize a shape with quadratic beziers into a bitmap +STBTT_DEF void stbtt_Rasterize(stbtt__bitmap *result, // 1-channel bitmap to draw into + float flatness_in_pixels, // allowable error of curve in pixels + stbtt_vertex *vertices, // array of vertices defining shape + int num_verts, // number of vertices in above array + float scale_x, float scale_y, // scale applied to input vertices + float shift_x, float shift_y, // translation applied to input vertices + int x_off, int y_off, // another translation applied to input + int invert, // if non-zero, vertically flip shape + void *userdata); // context for to STBTT_MALLOC + +////////////////////////////////////////////////////////////////////////////// +// +// Finding the right font... +// +// You should really just solve this offline, keep your own tables +// of what font is what, and don't try to get it out of the .ttf file. +// That's because getting it out of the .ttf file is really hard, because +// the names in the file can appear in many possible encodings, in many +// possible languages, and e.g. if you need a case-insensitive comparison, +// the details of that depend on the encoding & language in a complex way +// (actually underspecified in truetype, but also gigantic). +// +// But you can use the provided functions in two possible ways: +// stbtt_FindMatchingFont() will use *case-sensitive* comparisons on +// unicode-encoded names to try to find the font you want; +// you can run this before calling stbtt_InitFont() +// +// stbtt_GetFontNameString() lets you get any of the various strings +// from the file yourself and do your own comparisons on them. +// You have to have called stbtt_InitFont() first. + + +STBTT_DEF int stbtt_FindMatchingFont(const unsigned char *fontdata, const char *name, int flags); +// returns the offset (not index) of the font that matches, or -1 if none +// if you use STBTT_MACSTYLE_DONTCARE, use a font name like "Arial Bold". +// if you use any other flag, use a font name like "Arial"; this checks +// the 'macStyle' header field; i don't know if fonts set this consistently +#define STBTT_MACSTYLE_DONTCARE 0 +#define STBTT_MACSTYLE_BOLD 1 +#define STBTT_MACSTYLE_ITALIC 2 +#define STBTT_MACSTYLE_UNDERSCORE 4 +#define STBTT_MACSTYLE_NONE 8 // <= not same as 0, this makes us check the bitfield is 0 + +STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2); +// returns 1/0 whether the first string interpreted as utf8 is identical to +// the second string interpreted as big-endian utf16... useful for strings from next func + +STBTT_DEF const char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *length, int platformID, int encodingID, int languageID, int nameID); +// returns the string (which may be big-endian double byte, e.g. for unicode) +// and puts the length in bytes in *length. +// +// some of the values for the IDs are below; for more see the truetype spec: +// http://developer.apple.com/textfonts/TTRefMan/RM06/Chap6name.html +// http://www.microsoft.com/typography/otspec/name.htm + +enum { // platformID + STBTT_PLATFORM_ID_UNICODE =0, + STBTT_PLATFORM_ID_MAC =1, + STBTT_PLATFORM_ID_ISO =2, + STBTT_PLATFORM_ID_MICROSOFT =3 +}; + +enum { // encodingID for STBTT_PLATFORM_ID_UNICODE + STBTT_UNICODE_EID_UNICODE_1_0 =0, + STBTT_UNICODE_EID_UNICODE_1_1 =1, + STBTT_UNICODE_EID_ISO_10646 =2, + STBTT_UNICODE_EID_UNICODE_2_0_BMP=3, + STBTT_UNICODE_EID_UNICODE_2_0_FULL=4 +}; + +enum { // encodingID for STBTT_PLATFORM_ID_MICROSOFT + STBTT_MS_EID_SYMBOL =0, + STBTT_MS_EID_UNICODE_BMP =1, + STBTT_MS_EID_SHIFTJIS =2, + STBTT_MS_EID_UNICODE_FULL =10 +}; + +enum { // encodingID for STBTT_PLATFORM_ID_MAC; same as Script Manager codes + STBTT_MAC_EID_ROMAN =0, STBTT_MAC_EID_ARABIC =4, + STBTT_MAC_EID_JAPANESE =1, STBTT_MAC_EID_HEBREW =5, + STBTT_MAC_EID_CHINESE_TRAD =2, STBTT_MAC_EID_GREEK =6, + STBTT_MAC_EID_KOREAN =3, STBTT_MAC_EID_RUSSIAN =7 +}; + +enum { // languageID for STBTT_PLATFORM_ID_MICROSOFT; same as LCID... + // problematic because there are e.g. 16 english LCIDs and 16 arabic LCIDs + STBTT_MS_LANG_ENGLISH =0x0409, STBTT_MS_LANG_ITALIAN =0x0410, + STBTT_MS_LANG_CHINESE =0x0804, STBTT_MS_LANG_JAPANESE =0x0411, + STBTT_MS_LANG_DUTCH =0x0413, STBTT_MS_LANG_KOREAN =0x0412, + STBTT_MS_LANG_FRENCH =0x040c, STBTT_MS_LANG_RUSSIAN =0x0419, + STBTT_MS_LANG_GERMAN =0x0407, STBTT_MS_LANG_SPANISH =0x0409, + STBTT_MS_LANG_HEBREW =0x040d, STBTT_MS_LANG_SWEDISH =0x041D +}; + +enum { // languageID for STBTT_PLATFORM_ID_MAC + STBTT_MAC_LANG_ENGLISH =0 , STBTT_MAC_LANG_JAPANESE =11, + STBTT_MAC_LANG_ARABIC =12, STBTT_MAC_LANG_KOREAN =23, + STBTT_MAC_LANG_DUTCH =4 , STBTT_MAC_LANG_RUSSIAN =32, + STBTT_MAC_LANG_FRENCH =1 , STBTT_MAC_LANG_SPANISH =6 , + STBTT_MAC_LANG_GERMAN =2 , STBTT_MAC_LANG_SWEDISH =5 , + STBTT_MAC_LANG_HEBREW =10, STBTT_MAC_LANG_CHINESE_SIMPLIFIED =33, + STBTT_MAC_LANG_ITALIAN =3 , STBTT_MAC_LANG_CHINESE_TRAD =19 +}; + +#ifdef __cplusplus +} +#endif + +#endif // __STB_INCLUDE_STB_TRUETYPE_H__ + +/////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +//// +//// IMPLEMENTATION +//// +//// + +#ifdef STB_TRUETYPE_IMPLEMENTATION + +#ifndef STBTT_MAX_OVERSAMPLE +#define STBTT_MAX_OVERSAMPLE 8 +#endif + +#if STBTT_MAX_OVERSAMPLE > 255 +#error "STBTT_MAX_OVERSAMPLE cannot be > 255" +#endif + +typedef int stbtt__test_oversample_pow2[(STBTT_MAX_OVERSAMPLE & (STBTT_MAX_OVERSAMPLE-1)) == 0 ? 1 : -1]; + +#ifndef STBTT_RASTERIZER_VERSION +#define STBTT_RASTERIZER_VERSION 2 +#endif + +#ifdef _MSC_VER +#define STBTT__NOTUSED(v) (void)(v) +#else +#define STBTT__NOTUSED(v) (void)sizeof(v) +#endif + +////////////////////////////////////////////////////////////////////////// +// +// accessors to parse data from file +// + +// on platforms that don't allow misaligned reads, if we want to allow +// truetype fonts that aren't padded to alignment, define ALLOW_UNALIGNED_TRUETYPE + +#define ttBYTE(p) (* (stbtt_uint8 *) (p)) +#define ttCHAR(p) (* (stbtt_int8 *) (p)) +#define ttFixed(p) ttLONG(p) + +#if defined(STB_TRUETYPE_BIGENDIAN) && !defined(ALLOW_UNALIGNED_TRUETYPE) + + #define ttUSHORT(p) (* (stbtt_uint16 *) (p)) + #define ttSHORT(p) (* (stbtt_int16 *) (p)) + #define ttULONG(p) (* (stbtt_uint32 *) (p)) + #define ttLONG(p) (* (stbtt_int32 *) (p)) + +#else + + static stbtt_uint16 ttUSHORT(const stbtt_uint8 *p) { return p[0]*256 + p[1]; } + static stbtt_int16 ttSHORT(const stbtt_uint8 *p) { return p[0]*256 + p[1]; } + static stbtt_uint32 ttULONG(const stbtt_uint8 *p) { return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; } + static stbtt_int32 ttLONG(const stbtt_uint8 *p) { return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; } + +#endif + +#define stbtt_tag4(p,c0,c1,c2,c3) ((p)[0] == (c0) && (p)[1] == (c1) && (p)[2] == (c2) && (p)[3] == (c3)) +#define stbtt_tag(p,str) stbtt_tag4(p,str[0],str[1],str[2],str[3]) + +static int stbtt__isfont(const stbtt_uint8 *font) +{ + // check the version number + if (stbtt_tag4(font, '1',0,0,0)) return 1; // TrueType 1 + if (stbtt_tag(font, "typ1")) return 1; // TrueType with type 1 font -- we don't support this! + if (stbtt_tag(font, "OTTO")) return 1; // OpenType with CFF + if (stbtt_tag4(font, 0,1,0,0)) return 1; // OpenType 1.0 + return 0; +} + +// @OPTIMIZE: binary search +static stbtt_uint32 stbtt__find_table(stbtt_uint8 *data, stbtt_uint32 fontstart, const char *tag) +{ + stbtt_int32 num_tables = ttUSHORT(data+fontstart+4); + stbtt_uint32 tabledir = fontstart + 12; + stbtt_int32 i; + for (i=0; i < num_tables; ++i) { + stbtt_uint32 loc = tabledir + 16*i; + if (stbtt_tag(data+loc+0, tag)) + return ttULONG(data+loc+8); + } + return 0; +} + +STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *font_collection, int index) +{ + // if it's just a font, there's only one valid index + if (stbtt__isfont(font_collection)) + return index == 0 ? 0 : -1; + + // check if it's a TTC + if (stbtt_tag(font_collection, "ttcf")) { + // version 1? + if (ttULONG(font_collection+4) == 0x00010000 || ttULONG(font_collection+4) == 0x00020000) { + stbtt_int32 n = ttLONG(font_collection+8); + if (index >= n) + return -1; + return ttULONG(font_collection+12+index*4); + } + } + return -1; +} + +STBTT_DEF int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data2, int fontstart) +{ + stbtt_uint8 *data = (stbtt_uint8 *) data2; + stbtt_uint32 cmap, t; + stbtt_int32 i,numTables; + + info->data = data; + info->fontstart = fontstart; + + cmap = stbtt__find_table(data, fontstart, "cmap"); // required + info->loca = stbtt__find_table(data, fontstart, "loca"); // required + info->head = stbtt__find_table(data, fontstart, "head"); // required + info->glyf = stbtt__find_table(data, fontstart, "glyf"); // required + info->hhea = stbtt__find_table(data, fontstart, "hhea"); // required + info->hmtx = stbtt__find_table(data, fontstart, "hmtx"); // required + info->kern = stbtt__find_table(data, fontstart, "kern"); // not required + if (!cmap || !info->loca || !info->head || !info->glyf || !info->hhea || !info->hmtx) + return 0; + + t = stbtt__find_table(data, fontstart, "maxp"); + if (t) + info->numGlyphs = ttUSHORT(data+t+4); + else + info->numGlyphs = 0xffff; + + // find a cmap encoding table we understand *now* to avoid searching + // later. (todo: could make this installable) + // the same regardless of glyph. + numTables = ttUSHORT(data + cmap + 2); + info->index_map = 0; + for (i=0; i < numTables; ++i) { + stbtt_uint32 encoding_record = cmap + 4 + 8 * i; + // find an encoding we understand: + switch(ttUSHORT(data+encoding_record)) { + case STBTT_PLATFORM_ID_MICROSOFT: + switch (ttUSHORT(data+encoding_record+2)) { + case STBTT_MS_EID_UNICODE_BMP: + case STBTT_MS_EID_UNICODE_FULL: + // MS/Unicode + info->index_map = cmap + ttULONG(data+encoding_record+4); + break; + } + break; + case STBTT_PLATFORM_ID_UNICODE: + // Mac/iOS has these + // all the encodingIDs are unicode, so we don't bother to check it + info->index_map = cmap + ttULONG(data+encoding_record+4); + break; + } + } + if (info->index_map == 0) + return 0; + + info->indexToLocFormat = ttUSHORT(data+info->head + 50); + return 1; +} + +STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint) +{ + stbtt_uint8 *data = info->data; + stbtt_uint32 index_map = info->index_map; + + stbtt_uint16 format = ttUSHORT(data + index_map + 0); + if (format == 0) { // apple byte encoding + stbtt_int32 bytes = ttUSHORT(data + index_map + 2); + if (unicode_codepoint < bytes-6) + return ttBYTE(data + index_map + 6 + unicode_codepoint); + return 0; + } else if (format == 6) { + stbtt_uint32 first = ttUSHORT(data + index_map + 6); + stbtt_uint32 count = ttUSHORT(data + index_map + 8); + if ((stbtt_uint32) unicode_codepoint >= first && (stbtt_uint32) unicode_codepoint < first+count) + return ttUSHORT(data + index_map + 10 + (unicode_codepoint - first)*2); + return 0; + } else if (format == 2) { + STBTT_assert(0); // @TODO: high-byte mapping for japanese/chinese/korean + return 0; + } else if (format == 4) { // standard mapping for windows fonts: binary search collection of ranges + stbtt_uint16 segcount = ttUSHORT(data+index_map+6) >> 1; + stbtt_uint16 searchRange = ttUSHORT(data+index_map+8) >> 1; + stbtt_uint16 entrySelector = ttUSHORT(data+index_map+10); + stbtt_uint16 rangeShift = ttUSHORT(data+index_map+12) >> 1; + + // do a binary search of the segments + stbtt_uint32 endCount = index_map + 14; + stbtt_uint32 search = endCount; + + if (unicode_codepoint > 0xffff) + return 0; + + // they lie from endCount .. endCount + segCount + // but searchRange is the nearest power of two, so... + if (unicode_codepoint >= ttUSHORT(data + search + rangeShift*2)) + search += rangeShift*2; + + // now decrement to bias correctly to find smallest + search -= 2; + while (entrySelector) { + stbtt_uint16 end; + searchRange >>= 1; + end = ttUSHORT(data + search + searchRange*2); + if (unicode_codepoint > end) + search += searchRange*2; + --entrySelector; + } + search += 2; + + { + stbtt_uint16 offset, start; + stbtt_uint16 item = (stbtt_uint16) ((search - endCount) >> 1); + + STBTT_assert(unicode_codepoint <= ttUSHORT(data + endCount + 2*item)); + start = ttUSHORT(data + index_map + 14 + segcount*2 + 2 + 2*item); + if (unicode_codepoint < start) + return 0; + + offset = ttUSHORT(data + index_map + 14 + segcount*6 + 2 + 2*item); + if (offset == 0) + return (stbtt_uint16) (unicode_codepoint + ttSHORT(data + index_map + 14 + segcount*4 + 2 + 2*item)); + + return ttUSHORT(data + offset + (unicode_codepoint-start)*2 + index_map + 14 + segcount*6 + 2 + 2*item); + } + } else if (format == 12 || format == 13) { + stbtt_uint32 ngroups = ttULONG(data+index_map+12); + stbtt_int32 low,high; + low = 0; high = (stbtt_int32)ngroups; + // Binary search the right group. + while (low < high) { + stbtt_int32 mid = low + ((high-low) >> 1); // rounds down, so low <= mid < high + stbtt_uint32 start_char = ttULONG(data+index_map+16+mid*12); + stbtt_uint32 end_char = ttULONG(data+index_map+16+mid*12+4); + if ((stbtt_uint32) unicode_codepoint < start_char) + high = mid; + else if ((stbtt_uint32) unicode_codepoint > end_char) + low = mid+1; + else { + stbtt_uint32 start_glyph = ttULONG(data+index_map+16+mid*12+8); + if (format == 12) + return start_glyph + unicode_codepoint-start_char; + else // format == 13 + return start_glyph; + } + } + return 0; // not found + } + // @TODO + STBTT_assert(0); + return 0; +} + +STBTT_DEF int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices) +{ + return stbtt_GetGlyphShape(info, stbtt_FindGlyphIndex(info, unicode_codepoint), vertices); +} + +static void stbtt_setvertex(stbtt_vertex *v, stbtt_uint8 type, stbtt_int32 x, stbtt_int32 y, stbtt_int32 cx, stbtt_int32 cy) +{ + v->type = type; + v->x = (stbtt_int16) x; + v->y = (stbtt_int16) y; + v->cx = (stbtt_int16) cx; + v->cy = (stbtt_int16) cy; +} + +static int stbtt__GetGlyfOffset(const stbtt_fontinfo *info, int glyph_index) +{ + int g1,g2; + + if (glyph_index >= info->numGlyphs) return -1; // glyph index out of range + if (info->indexToLocFormat >= 2) return -1; // unknown index->glyph map format + + if (info->indexToLocFormat == 0) { + g1 = info->glyf + ttUSHORT(info->data + info->loca + glyph_index * 2) * 2; + g2 = info->glyf + ttUSHORT(info->data + info->loca + glyph_index * 2 + 2) * 2; + } else { + g1 = info->glyf + ttULONG (info->data + info->loca + glyph_index * 4); + g2 = info->glyf + ttULONG (info->data + info->loca + glyph_index * 4 + 4); + } + + return g1==g2 ? -1 : g1; // if length is 0, return -1 +} + +STBTT_DEF int stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1) +{ + int g = stbtt__GetGlyfOffset(info, glyph_index); + if (g < 0) return 0; + + if (x0) *x0 = ttSHORT(info->data + g + 2); + if (y0) *y0 = ttSHORT(info->data + g + 4); + if (x1) *x1 = ttSHORT(info->data + g + 6); + if (y1) *y1 = ttSHORT(info->data + g + 8); + return 1; +} + +STBTT_DEF int stbtt_GetCodepointBox(const stbtt_fontinfo *info, int codepoint, int *x0, int *y0, int *x1, int *y1) +{ + return stbtt_GetGlyphBox(info, stbtt_FindGlyphIndex(info,codepoint), x0,y0,x1,y1); +} + +STBTT_DEF int stbtt_IsGlyphEmpty(const stbtt_fontinfo *info, int glyph_index) +{ + stbtt_int16 numberOfContours; + int g = stbtt__GetGlyfOffset(info, glyph_index); + if (g < 0) return 1; + numberOfContours = ttSHORT(info->data + g); + return numberOfContours == 0; +} + +static int stbtt__close_shape(stbtt_vertex *vertices, int num_vertices, int was_off, int start_off, + stbtt_int32 sx, stbtt_int32 sy, stbtt_int32 scx, stbtt_int32 scy, stbtt_int32 cx, stbtt_int32 cy) +{ + if (start_off) { + if (was_off) + stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, (cx+scx)>>1, (cy+scy)>>1, cx,cy); + stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, sx,sy,scx,scy); + } else { + if (was_off) + stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve,sx,sy,cx,cy); + else + stbtt_setvertex(&vertices[num_vertices++], STBTT_vline,sx,sy,0,0); + } + return num_vertices; +} + +STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices) +{ + stbtt_int16 numberOfContours; + stbtt_uint8 *endPtsOfContours; + stbtt_uint8 *data = info->data; + stbtt_vertex *vertices=0; + int num_vertices=0; + int g = stbtt__GetGlyfOffset(info, glyph_index); + + *pvertices = NULL; + + if (g < 0) return 0; + + numberOfContours = ttSHORT(data + g); + + if (numberOfContours > 0) { + stbtt_uint8 flags=0,flagcount; + stbtt_int32 ins, i,j=0,m,n, next_move, was_off=0, off, start_off=0; + stbtt_int32 x,y,cx,cy,sx,sy, scx,scy; + stbtt_uint8 *points; + endPtsOfContours = (data + g + 10); + ins = ttUSHORT(data + g + 10 + numberOfContours * 2); + points = data + g + 10 + numberOfContours * 2 + 2 + ins; + + n = 1+ttUSHORT(endPtsOfContours + numberOfContours*2-2); + + m = n + 2*numberOfContours; // a loose bound on how many vertices we might need + vertices = (stbtt_vertex *) STBTT_malloc(m * sizeof(vertices[0]), info->userdata); + if (vertices == 0) + return 0; + + next_move = 0; + flagcount=0; + + // in first pass, we load uninterpreted data into the allocated array + // above, shifted to the end of the array so we won't overwrite it when + // we create our final data starting from the front + + off = m - n; // starting offset for uninterpreted data, regardless of how m ends up being calculated + + // first load flags + + for (i=0; i < n; ++i) { + if (flagcount == 0) { + flags = *points++; + if (flags & 8) + flagcount = *points++; + } else + --flagcount; + vertices[off+i].type = flags; + } + + // now load x coordinates + x=0; + for (i=0; i < n; ++i) { + flags = vertices[off+i].type; + if (flags & 2) { + stbtt_int16 dx = *points++; + x += (flags & 16) ? dx : -dx; // ??? + } else { + if (!(flags & 16)) { + x = x + (stbtt_int16) (points[0]*256 + points[1]); + points += 2; + } + } + vertices[off+i].x = (stbtt_int16) x; + } + + // now load y coordinates + y=0; + for (i=0; i < n; ++i) { + flags = vertices[off+i].type; + if (flags & 4) { + stbtt_int16 dy = *points++; + y += (flags & 32) ? dy : -dy; // ??? + } else { + if (!(flags & 32)) { + y = y + (stbtt_int16) (points[0]*256 + points[1]); + points += 2; + } + } + vertices[off+i].y = (stbtt_int16) y; + } + + // now convert them to our format + num_vertices=0; + sx = sy = cx = cy = scx = scy = 0; + for (i=0; i < n; ++i) { + flags = vertices[off+i].type; + x = (stbtt_int16) vertices[off+i].x; + y = (stbtt_int16) vertices[off+i].y; + + if (next_move == i) { + if (i != 0) + num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy); + + // now start the new one + start_off = !(flags & 1); + if (start_off) { + // if we start off with an off-curve point, then when we need to find a point on the curve + // where we can start, and we need to save some state for when we wraparound. + scx = x; + scy = y; + if (!(vertices[off+i+1].type & 1)) { + // next point is also a curve point, so interpolate an on-point curve + sx = (x + (stbtt_int32) vertices[off+i+1].x) >> 1; + sy = (y + (stbtt_int32) vertices[off+i+1].y) >> 1; + } else { + // otherwise just use the next point as our start point + sx = (stbtt_int32) vertices[off+i+1].x; + sy = (stbtt_int32) vertices[off+i+1].y; + ++i; // we're using point i+1 as the starting point, so skip it + } + } else { + sx = x; + sy = y; + } + stbtt_setvertex(&vertices[num_vertices++], STBTT_vmove,sx,sy,0,0); + was_off = 0; + next_move = 1 + ttUSHORT(endPtsOfContours+j*2); + ++j; + } else { + if (!(flags & 1)) { // if it's a curve + if (was_off) // two off-curve control points in a row means interpolate an on-curve midpoint + stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, (cx+x)>>1, (cy+y)>>1, cx, cy); + cx = x; + cy = y; + was_off = 1; + } else { + if (was_off) + stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, x,y, cx, cy); + else + stbtt_setvertex(&vertices[num_vertices++], STBTT_vline, x,y,0,0); + was_off = 0; + } + } + } + num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy); + } else if (numberOfContours == -1) { + // Compound shapes. + int more = 1; + stbtt_uint8 *comp = data + g + 10; + num_vertices = 0; + vertices = 0; + while (more) { + stbtt_uint16 flags, gidx; + int comp_num_verts = 0, i; + stbtt_vertex *comp_verts = 0, *tmp = 0; + float mtx[6] = {1,0,0,1,0,0}, m, n; + + flags = ttSHORT(comp); comp+=2; + gidx = ttSHORT(comp); comp+=2; + + if (flags & 2) { // XY values + if (flags & 1) { // shorts + mtx[4] = ttSHORT(comp); comp+=2; + mtx[5] = ttSHORT(comp); comp+=2; + } else { + mtx[4] = ttCHAR(comp); comp+=1; + mtx[5] = ttCHAR(comp); comp+=1; + } + } + else { + // @TODO handle matching point + STBTT_assert(0); + } + if (flags & (1<<3)) { // WE_HAVE_A_SCALE + mtx[0] = mtx[3] = ttSHORT(comp)/16384.0f; comp+=2; + mtx[1] = mtx[2] = 0; + } else if (flags & (1<<6)) { // WE_HAVE_AN_X_AND_YSCALE + mtx[0] = ttSHORT(comp)/16384.0f; comp+=2; + mtx[1] = mtx[2] = 0; + mtx[3] = ttSHORT(comp)/16384.0f; comp+=2; + } else if (flags & (1<<7)) { // WE_HAVE_A_TWO_BY_TWO + mtx[0] = ttSHORT(comp)/16384.0f; comp+=2; + mtx[1] = ttSHORT(comp)/16384.0f; comp+=2; + mtx[2] = ttSHORT(comp)/16384.0f; comp+=2; + mtx[3] = ttSHORT(comp)/16384.0f; comp+=2; + } + + // Find transformation scales. + m = (float) STBTT_sqrt(mtx[0]*mtx[0] + mtx[1]*mtx[1]); + n = (float) STBTT_sqrt(mtx[2]*mtx[2] + mtx[3]*mtx[3]); + + // Get indexed glyph. + comp_num_verts = stbtt_GetGlyphShape(info, gidx, &comp_verts); + if (comp_num_verts > 0) { + // Transform vertices. + for (i = 0; i < comp_num_verts; ++i) { + stbtt_vertex* v = &comp_verts[i]; + stbtt_vertex_type x,y; + x=v->x; y=v->y; + v->x = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4])); + v->y = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5])); + x=v->cx; y=v->cy; + v->cx = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4])); + v->cy = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5])); + } + // Append vertices. + tmp = (stbtt_vertex*)STBTT_malloc((num_vertices+comp_num_verts)*sizeof(stbtt_vertex), info->userdata); + if (!tmp) { + if (vertices) STBTT_free(vertices, info->userdata); + if (comp_verts) STBTT_free(comp_verts, info->userdata); + return 0; + } + if (num_vertices > 0) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex)); + STBTT_memcpy(tmp+num_vertices, comp_verts, comp_num_verts*sizeof(stbtt_vertex)); + if (vertices) STBTT_free(vertices, info->userdata); + vertices = tmp; + STBTT_free(comp_verts, info->userdata); + num_vertices += comp_num_verts; + } + // More components ? + more = flags & (1<<5); + } + } else if (numberOfContours < 0) { + // @TODO other compound variations? + STBTT_assert(0); + } else { + // numberOfCounters == 0, do nothing + } + + *pvertices = vertices; + return num_vertices; +} + +STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_index, int *advanceWidth, int *leftSideBearing) +{ + stbtt_uint16 numOfLongHorMetrics = ttUSHORT(info->data+info->hhea + 34); + if (glyph_index < numOfLongHorMetrics) { + if (advanceWidth) *advanceWidth = ttSHORT(info->data + info->hmtx + 4*glyph_index); + if (leftSideBearing) *leftSideBearing = ttSHORT(info->data + info->hmtx + 4*glyph_index + 2); + } else { + if (advanceWidth) *advanceWidth = ttSHORT(info->data + info->hmtx + 4*(numOfLongHorMetrics-1)); + if (leftSideBearing) *leftSideBearing = ttSHORT(info->data + info->hmtx + 4*numOfLongHorMetrics + 2*(glyph_index - numOfLongHorMetrics)); + } +} + +STBTT_DEF int stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) +{ + stbtt_uint8 *data = info->data + info->kern; + stbtt_uint32 needle, straw; + int l, r, m; + + // we only look at the first table. it must be 'horizontal' and format 0. + if (!info->kern) + return 0; + if (ttUSHORT(data+2) < 1) // number of tables, need at least 1 + return 0; + if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format + return 0; + + l = 0; + r = ttUSHORT(data+10) - 1; + needle = glyph1 << 16 | glyph2; + while (l <= r) { + m = (l + r) >> 1; + straw = ttULONG(data+18+(m*6)); // note: unaligned read + if (needle < straw) + r = m - 1; + else if (needle > straw) + l = m + 1; + else + return ttSHORT(data+22+(m*6)); + } + return 0; +} + +STBTT_DEF int stbtt_GetCodepointKernAdvance(const stbtt_fontinfo *info, int ch1, int ch2) +{ + if (!info->kern) // if no kerning table, don't waste time looking up both codepoint->glyphs + return 0; + return stbtt_GetGlyphKernAdvance(info, stbtt_FindGlyphIndex(info,ch1), stbtt_FindGlyphIndex(info,ch2)); +} + +STBTT_DEF void stbtt_GetCodepointHMetrics(const stbtt_fontinfo *info, int codepoint, int *advanceWidth, int *leftSideBearing) +{ + stbtt_GetGlyphHMetrics(info, stbtt_FindGlyphIndex(info,codepoint), advanceWidth, leftSideBearing); +} + +STBTT_DEF void stbtt_GetFontVMetrics(const stbtt_fontinfo *info, int *ascent, int *descent, int *lineGap) +{ + if (ascent ) *ascent = ttSHORT(info->data+info->hhea + 4); + if (descent) *descent = ttSHORT(info->data+info->hhea + 6); + if (lineGap) *lineGap = ttSHORT(info->data+info->hhea + 8); +} + +STBTT_DEF void stbtt_GetFontBoundingBox(const stbtt_fontinfo *info, int *x0, int *y0, int *x1, int *y1) +{ + *x0 = ttSHORT(info->data + info->head + 36); + *y0 = ttSHORT(info->data + info->head + 38); + *x1 = ttSHORT(info->data + info->head + 40); + *y1 = ttSHORT(info->data + info->head + 42); +} + +STBTT_DEF float stbtt_ScaleForPixelHeight(const stbtt_fontinfo *info, float height) +{ + int fheight = ttSHORT(info->data + info->hhea + 4) - ttSHORT(info->data + info->hhea + 6); + return (float) height / fheight; +} + +STBTT_DEF float stbtt_ScaleForMappingEmToPixels(const stbtt_fontinfo *info, float pixels) +{ + int unitsPerEm = ttUSHORT(info->data + info->head + 18); + return pixels / unitsPerEm; +} + +STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *v) +{ + STBTT_free(v, info->userdata); +} + +////////////////////////////////////////////////////////////////////////////// +// +// antialiasing software rasterizer +// + +STBTT_DEF void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1) +{ + int x0=0,y0=0,x1,y1; // =0 suppresses compiler warning + if (!stbtt_GetGlyphBox(font, glyph, &x0,&y0,&x1,&y1)) { + // e.g. space character + if (ix0) *ix0 = 0; + if (iy0) *iy0 = 0; + if (ix1) *ix1 = 0; + if (iy1) *iy1 = 0; + } else { + // move to integral bboxes (treating pixels as little squares, what pixels get touched)? + if (ix0) *ix0 = STBTT_ifloor( x0 * scale_x + shift_x); + if (iy0) *iy0 = STBTT_ifloor(-y1 * scale_y + shift_y); + if (ix1) *ix1 = STBTT_iceil ( x1 * scale_x + shift_x); + if (iy1) *iy1 = STBTT_iceil (-y0 * scale_y + shift_y); + } +} + +STBTT_DEF void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1) +{ + stbtt_GetGlyphBitmapBoxSubpixel(font, glyph, scale_x, scale_y,0.0f,0.0f, ix0, iy0, ix1, iy1); +} + +STBTT_DEF void stbtt_GetCodepointBitmapBoxSubpixel(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1) +{ + stbtt_GetGlyphBitmapBoxSubpixel(font, stbtt_FindGlyphIndex(font,codepoint), scale_x, scale_y,shift_x,shift_y, ix0,iy0,ix1,iy1); +} + +STBTT_DEF void stbtt_GetCodepointBitmapBox(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1) +{ + stbtt_GetCodepointBitmapBoxSubpixel(font, codepoint, scale_x, scale_y,0.0f,0.0f, ix0,iy0,ix1,iy1); +} + +////////////////////////////////////////////////////////////////////////////// +// +// Rasterizer + +typedef struct stbtt__hheap_chunk +{ + struct stbtt__hheap_chunk *next; +} stbtt__hheap_chunk; + +typedef struct stbtt__hheap +{ + struct stbtt__hheap_chunk *head; + void *first_free; + int num_remaining_in_head_chunk; +} stbtt__hheap; + +static void *stbtt__hheap_alloc(stbtt__hheap *hh, size_t size, void *userdata) +{ + if (hh->first_free) { + void *p = hh->first_free; + hh->first_free = * (void **) p; + return p; + } else { + if (hh->num_remaining_in_head_chunk == 0) { + int count = (size < 32 ? 2000 : size < 128 ? 800 : 100); + stbtt__hheap_chunk *c = (stbtt__hheap_chunk *) STBTT_malloc(sizeof(stbtt__hheap_chunk) + size * count, userdata); + if (c == NULL) + return NULL; + c->next = hh->head; + hh->head = c; + hh->num_remaining_in_head_chunk = count; + } + --hh->num_remaining_in_head_chunk; + return (char *) (hh->head) + size * hh->num_remaining_in_head_chunk; + } +} + +static void stbtt__hheap_free(stbtt__hheap *hh, void *p) +{ + *(void **) p = hh->first_free; + hh->first_free = p; +} + +static void stbtt__hheap_cleanup(stbtt__hheap *hh, void *userdata) +{ + stbtt__hheap_chunk *c = hh->head; + while (c) { + stbtt__hheap_chunk *n = c->next; + STBTT_free(c, userdata); + c = n; + } +} + +typedef struct stbtt__edge { + float x0,y0, x1,y1; + int invert; +} stbtt__edge; + + +typedef struct stbtt__active_edge +{ + struct stbtt__active_edge *next; + #if STBTT_RASTERIZER_VERSION==1 + int x,dx; + float ey; + int direction; + #elif STBTT_RASTERIZER_VERSION==2 + float fx,fdx,fdy; + float direction; + float sy; + float ey; + #else + #error "Unrecognized value of STBTT_RASTERIZER_VERSION" + #endif +} stbtt__active_edge; + +#if STBTT_RASTERIZER_VERSION == 1 +#define STBTT_FIXSHIFT 10 +#define STBTT_FIX (1 << STBTT_FIXSHIFT) +#define STBTT_FIXMASK (STBTT_FIX-1) + +static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, int off_x, float start_point, void *userdata) +{ + stbtt__active_edge *z = (stbtt__active_edge *) stbtt__hheap_alloc(hh, sizeof(*z), userdata); + float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0); + STBTT_assert(z != NULL); + if (!z) return z; + + // round dx down to avoid overshooting + if (dxdy < 0) + z->dx = -STBTT_ifloor(STBTT_FIX * -dxdy); + else + z->dx = STBTT_ifloor(STBTT_FIX * dxdy); + + z->x = STBTT_ifloor(STBTT_FIX * e->x0 + z->dx * (start_point - e->y0)); // use z->dx so when we offset later it's by the same amount + z->x -= off_x * STBTT_FIX; + + z->ey = e->y1; + z->next = 0; + z->direction = e->invert ? 1 : -1; + return z; +} +#elif STBTT_RASTERIZER_VERSION == 2 +static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, int off_x, float start_point, void *userdata) +{ + stbtt__active_edge *z = (stbtt__active_edge *) stbtt__hheap_alloc(hh, sizeof(*z), userdata); + float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0); + STBTT_assert(z != NULL); + //STBTT_assert(e->y0 <= start_point); + if (!z) return z; + z->fdx = dxdy; + z->fdy = dxdy != 0.0f ? (1.0f/dxdy) : 0.0f; + z->fx = e->x0 + dxdy * (start_point - e->y0); + z->fx -= off_x; + z->direction = e->invert ? 1.0f : -1.0f; + z->sy = e->y0; + z->ey = e->y1; + z->next = 0; + return z; +} +#else +#error "Unrecognized value of STBTT_RASTERIZER_VERSION" +#endif + +#if STBTT_RASTERIZER_VERSION == 1 +// note: this routine clips fills that extend off the edges... ideally this +// wouldn't happen, but it could happen if the truetype glyph bounding boxes +// are wrong, or if the user supplies a too-small bitmap +static void stbtt__fill_active_edges(unsigned char *scanline, int len, stbtt__active_edge *e, int max_weight) +{ + // non-zero winding fill + int x0=0, w=0; + + while (e) { + if (w == 0) { + // if we're currently at zero, we need to record the edge start point + x0 = e->x; w += e->direction; + } else { + int x1 = e->x; w += e->direction; + // if we went to zero, we need to draw + if (w == 0) { + int i = x0 >> STBTT_FIXSHIFT; + int j = x1 >> STBTT_FIXSHIFT; + + if (i < len && j >= 0) { + if (i == j) { + // x0,x1 are the same pixel, so compute combined coverage + scanline[i] = scanline[i] + (stbtt_uint8) ((x1 - x0) * max_weight >> STBTT_FIXSHIFT); + } else { + if (i >= 0) // add antialiasing for x0 + scanline[i] = scanline[i] + (stbtt_uint8) (((STBTT_FIX - (x0 & STBTT_FIXMASK)) * max_weight) >> STBTT_FIXSHIFT); + else + i = -1; // clip + + if (j < len) // add antialiasing for x1 + scanline[j] = scanline[j] + (stbtt_uint8) (((x1 & STBTT_FIXMASK) * max_weight) >> STBTT_FIXSHIFT); + else + j = len; // clip + + for (++i; i < j; ++i) // fill pixels between x0 and x1 + scanline[i] = scanline[i] + (stbtt_uint8) max_weight; + } + } + } + } + + e = e->next; + } +} + +static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int n, int vsubsample, int off_x, int off_y, void *userdata) +{ + stbtt__hheap hh = { 0, 0, 0 }; + stbtt__active_edge *active = NULL; + int y,j=0; + int max_weight = (255 / vsubsample); // weight per vertical scanline + int s; // vertical subsample index + unsigned char scanline_data[512], *scanline; + + if (result->w > 512) + scanline = (unsigned char *) STBTT_malloc(result->w, userdata); + else + scanline = scanline_data; + + y = off_y * vsubsample; + e[n].y0 = (off_y + result->h) * (float) vsubsample + 1; + + while (j < result->h) { + STBTT_memset(scanline, 0, result->w); + for (s=0; s < vsubsample; ++s) { + // find center of pixel for this scanline + float scan_y = y + 0.5f; + stbtt__active_edge **step = &active; + + // update all active edges; + // remove all active edges that terminate before the center of this scanline + while (*step) { + stbtt__active_edge * z = *step; + if (z->ey <= scan_y) { + *step = z->next; // delete from list + STBTT_assert(z->direction); + z->direction = 0; + stbtt__hheap_free(&hh, z); + } else { + z->x += z->dx; // advance to position for current scanline + step = &((*step)->next); // advance through list + } + } + + // resort the list if needed + for(;;) { + int changed=0; + step = &active; + while (*step && (*step)->next) { + if ((*step)->x > (*step)->next->x) { + stbtt__active_edge *t = *step; + stbtt__active_edge *q = t->next; + + t->next = q->next; + q->next = t; + *step = q; + changed = 1; + } + step = &(*step)->next; + } + if (!changed) break; + } + + // insert all edges that start before the center of this scanline -- omit ones that also end on this scanline + while (e->y0 <= scan_y) { + if (e->y1 > scan_y) { + stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y, userdata); + if (z != NULL) { + // find insertion point + if (active == NULL) + active = z; + else if (z->x < active->x) { + // insert at front + z->next = active; + active = z; + } else { + // find thing to insert AFTER + stbtt__active_edge *p = active; + while (p->next && p->next->x < z->x) + p = p->next; + // at this point, p->next->x is NOT < z->x + z->next = p->next; + p->next = z; + } + } + } + ++e; + } + + // now process all active edges in XOR fashion + if (active) + stbtt__fill_active_edges(scanline, result->w, active, max_weight); + + ++y; + } + STBTT_memcpy(result->pixels + j * result->stride, scanline, result->w); + ++j; + } + + stbtt__hheap_cleanup(&hh, userdata); + + if (scanline != scanline_data) + STBTT_free(scanline, userdata); +} + +#elif STBTT_RASTERIZER_VERSION == 2 + +// the edge passed in here does not cross the vertical line at x or the vertical line at x+1 +// (i.e. it has already been clipped to those) +static void stbtt__handle_clipped_edge(float *scanline, int x, stbtt__active_edge *e, float x0, float y0, float x1, float y1) +{ + if (y0 == y1) return; + STBTT_assert(y0 < y1); + STBTT_assert(e->sy <= e->ey); + if (y0 > e->ey) return; + if (y1 < e->sy) return; + if (y0 < e->sy) { + x0 += (x1-x0) * (e->sy - y0) / (y1-y0); + y0 = e->sy; + } + if (y1 > e->ey) { + x1 += (x1-x0) * (e->ey - y1) / (y1-y0); + y1 = e->ey; + } + + if (x0 == x) + STBTT_assert(x1 <= x+1); + else if (x0 == x+1) + STBTT_assert(x1 >= x); + else if (x0 <= x) + STBTT_assert(x1 <= x); + else if (x0 >= x+1) + STBTT_assert(x1 >= x+1); + else + STBTT_assert(x1 >= x && x1 <= x+1); + + if (x0 <= x && x1 <= x) + scanline[x] += e->direction * (y1-y0); + else if (x0 >= x+1 && x1 >= x+1) + ; + else { + STBTT_assert(x0 >= x && x0 <= x+1 && x1 >= x && x1 <= x+1); + scanline[x] += e->direction * (y1-y0) * (1-((x0-x)+(x1-x))/2); // coverage = 1 - average x position + } +} + +static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, int len, stbtt__active_edge *e, float y_top) +{ + float y_bottom = y_top+1; + + while (e) { + // brute force every pixel + + // compute intersection points with top & bottom + STBTT_assert(e->ey >= y_top); + + if (e->fdx == 0) { + float x0 = e->fx; + if (x0 < len) { + if (x0 >= 0) { + stbtt__handle_clipped_edge(scanline,(int) x0,e, x0,y_top, x0,y_bottom); + stbtt__handle_clipped_edge(scanline_fill-1,(int) x0+1,e, x0,y_top, x0,y_bottom); + } else { + stbtt__handle_clipped_edge(scanline_fill-1,0,e, x0,y_top, x0,y_bottom); + } + } + } else { + float x0 = e->fx; + float dx = e->fdx; + float xb = x0 + dx; + float x_top, x_bottom; + float sy0,sy1; + float dy = e->fdy; + STBTT_assert(e->sy <= y_bottom && e->ey >= y_top); + + // compute endpoints of line segment clipped to this scanline (if the + // line segment starts on this scanline. x0 is the intersection of the + // line with y_top, but that may be off the line segment. + if (e->sy > y_top) { + x_top = x0 + dx * (e->sy - y_top); + sy0 = e->sy; + } else { + x_top = x0; + sy0 = y_top; + } + if (e->ey < y_bottom) { + x_bottom = x0 + dx * (e->ey - y_top); + sy1 = e->ey; + } else { + x_bottom = xb; + sy1 = y_bottom; + } + + if (x_top >= 0 && x_bottom >= 0 && x_top < len && x_bottom < len) { + // from here on, we don't have to range check x values + + if ((int) x_top == (int) x_bottom) { + float height; + // simple case, only spans one pixel + int x = (int) x_top; + height = sy1 - sy0; + STBTT_assert(x >= 0 && x < len); + scanline[x] += e->direction * (1-((x_top - x) + (x_bottom-x))/2) * height; + scanline_fill[x] += e->direction * height; // everything right of this pixel is filled + } else { + int x,x1,x2; + float y_crossing, step, sign, area; + // covers 2+ pixels + if (x_top > x_bottom) { + // flip scanline vertically; signed area is the same + float t; + sy0 = y_bottom - (sy0 - y_top); + sy1 = y_bottom - (sy1 - y_top); + t = sy0, sy0 = sy1, sy1 = t; + t = x_bottom, x_bottom = x_top, x_top = t; + dx = -dx; + dy = -dy; + t = x0, x0 = xb, xb = t; + } + + x1 = (int) x_top; + x2 = (int) x_bottom; + // compute intersection with y axis at x1+1 + y_crossing = (x1+1 - x0) * dy + y_top; + + sign = e->direction; + // area of the rectangle covered from y0..y_crossing + area = sign * (y_crossing-sy0); + // area of the triangle (x_top,y0), (x+1,y0), (x+1,y_crossing) + scanline[x1] += area * (1-((x_top - x1)+(x1+1-x1))/2); + + step = sign * dy; + for (x = x1+1; x < x2; ++x) { + scanline[x] += area + step/2; + area += step; + } + y_crossing += dy * (x2 - (x1+1)); + + STBTT_assert(STBTT_fabs(area) <= 1.01f); + + scanline[x2] += area + sign * (1-((x2-x2)+(x_bottom-x2))/2) * (sy1-y_crossing); + + scanline_fill[x2] += sign * (sy1-sy0); + } + } else { + // if edge goes outside of box we're drawing, we require + // clipping logic. since this does not match the intended use + // of this library, we use a different, very slow brute + // force implementation + int x; + for (x=0; x < len; ++x) { + // cases: + // + // there can be up to two intersections with the pixel. any intersection + // with left or right edges can be handled by splitting into two (or three) + // regions. intersections with top & bottom do not necessitate case-wise logic. + // + // the old way of doing this found the intersections with the left & right edges, + // then used some simple logic to produce up to three segments in sorted order + // from top-to-bottom. however, this had a problem: if an x edge was epsilon + // across the x border, then the corresponding y position might not be distinct + // from the other y segment, and it might ignored as an empty segment. to avoid + // that, we need to explicitly produce segments based on x positions. + + // rename variables to clear pairs + float y0 = y_top; + float x1 = (float) (x); + float x2 = (float) (x+1); + float x3 = xb; + float y3 = y_bottom; + float y1,y2; + + // x = e->x + e->dx * (y-y_top) + // (y-y_top) = (x - e->x) / e->dx + // y = (x - e->x) / e->dx + y_top + y1 = (x - x0) / dx + y_top; + y2 = (x+1 - x0) / dx + y_top; + + if (x0 < x1 && x3 > x2) { // three segments descending down-right + stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1); + stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x2,y2); + stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3); + } else if (x3 < x1 && x0 > x2) { // three segments descending down-left + stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2); + stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x1,y1); + stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3); + } else if (x0 < x1 && x3 > x1) { // two segments across x, down-right + stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1); + stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3); + } else if (x3 < x1 && x0 > x1) { // two segments across x, down-left + stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1); + stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3); + } else if (x0 < x2 && x3 > x2) { // two segments across x+1, down-right + stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2); + stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3); + } else if (x3 < x2 && x0 > x2) { // two segments across x+1, down-left + stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2); + stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3); + } else { // one segment + stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x3,y3); + } + } + } + } + e = e->next; + } +} + +// directly AA rasterize edges w/o supersampling +static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int n, int vsubsample, int off_x, int off_y, void *userdata) +{ + stbtt__hheap hh = { 0, 0, 0 }; + stbtt__active_edge *active = NULL; + int y,j=0, i; + float scanline_data[129], *scanline, *scanline2; + + STBTT__NOTUSED(vsubsample); + + if (result->w > 64) + scanline = (float *) STBTT_malloc((result->w*2+1) * sizeof(float), userdata); + else + scanline = scanline_data; + + scanline2 = scanline + result->w; + + y = off_y; + e[n].y0 = (float) (off_y + result->h) + 1; + + while (j < result->h) { + // find center of pixel for this scanline + float scan_y_top = y + 0.0f; + float scan_y_bottom = y + 1.0f; + stbtt__active_edge **step = &active; + + STBTT_memset(scanline , 0, result->w*sizeof(scanline[0])); + STBTT_memset(scanline2, 0, (result->w+1)*sizeof(scanline[0])); + + // update all active edges; + // remove all active edges that terminate before the top of this scanline + while (*step) { + stbtt__active_edge * z = *step; + if (z->ey <= scan_y_top) { + *step = z->next; // delete from list + STBTT_assert(z->direction); + z->direction = 0; + stbtt__hheap_free(&hh, z); + } else { + step = &((*step)->next); // advance through list + } + } + + // insert all edges that start before the bottom of this scanline + while (e->y0 <= scan_y_bottom) { + if (e->y0 != e->y1) { + stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y_top, userdata); + if (z != NULL) { + STBTT_assert(z->ey >= scan_y_top); + // insert at front + z->next = active; + active = z; + } + } + ++e; + } + + // now process all active edges + if (active) + stbtt__fill_active_edges_new(scanline, scanline2+1, result->w, active, scan_y_top); + + { + float sum = 0; + for (i=0; i < result->w; ++i) { + float k; + int m; + sum += scanline2[i]; + k = scanline[i] + sum; + k = (float) STBTT_fabs(k)*255 + 0.5f; + m = (int) k; + if (m > 255) m = 255; + result->pixels[j*result->stride + i] = (unsigned char) m; + } + } + // advance all the edges + step = &active; + while (*step) { + stbtt__active_edge *z = *step; + z->fx += z->fdx; // advance to position for current scanline + step = &((*step)->next); // advance through list + } + + ++y; + ++j; + } + + stbtt__hheap_cleanup(&hh, userdata); + + if (scanline != scanline_data) + STBTT_free(scanline, userdata); +} +#else +#error "Unrecognized value of STBTT_RASTERIZER_VERSION" +#endif + +#define STBTT__COMPARE(a,b) ((a)->y0 < (b)->y0) + +static void stbtt__sort_edges_ins_sort(stbtt__edge *p, int n) +{ + int i,j; + for (i=1; i < n; ++i) { + stbtt__edge t = p[i], *a = &t; + j = i; + while (j > 0) { + stbtt__edge *b = &p[j-1]; + int c = STBTT__COMPARE(a,b); + if (!c) break; + p[j] = p[j-1]; + --j; + } + if (i != j) + p[j] = t; + } +} + +static void stbtt__sort_edges_quicksort(stbtt__edge *p, int n) +{ + /* threshhold for transitioning to insertion sort */ + while (n > 12) { + stbtt__edge t; + int c01,c12,c,m,i,j; + + /* compute median of three */ + m = n >> 1; + c01 = STBTT__COMPARE(&p[0],&p[m]); + c12 = STBTT__COMPARE(&p[m],&p[n-1]); + /* if 0 >= mid >= end, or 0 < mid < end, then use mid */ + if (c01 != c12) { + /* otherwise, we'll need to swap something else to middle */ + int z; + c = STBTT__COMPARE(&p[0],&p[n-1]); + /* 0>mid && midn => n; 0 0 */ + /* 0n: 0>n => 0; 0 n */ + z = (c == c12) ? 0 : n-1; + t = p[z]; + p[z] = p[m]; + p[m] = t; + } + /* now p[m] is the median-of-three */ + /* swap it to the beginning so it won't move around */ + t = p[0]; + p[0] = p[m]; + p[m] = t; + + /* partition loop */ + i=1; + j=n-1; + for(;;) { + /* handling of equality is crucial here */ + /* for sentinels & efficiency with duplicates */ + for (;;++i) { + if (!STBTT__COMPARE(&p[i], &p[0])) break; + } + for (;;--j) { + if (!STBTT__COMPARE(&p[0], &p[j])) break; + } + /* make sure we haven't crossed */ + if (i >= j) break; + t = p[i]; + p[i] = p[j]; + p[j] = t; + + ++i; + --j; + } + /* recurse on smaller side, iterate on larger */ + if (j < (n-i)) { + stbtt__sort_edges_quicksort(p,j); + p = p+i; + n = n-i; + } else { + stbtt__sort_edges_quicksort(p+i, n-i); + n = j; + } + } +} + +static void stbtt__sort_edges(stbtt__edge *p, int n) +{ + stbtt__sort_edges_quicksort(p, n); + stbtt__sort_edges_ins_sort(p, n); +} + +typedef struct +{ + float x,y; +} stbtt__point; + +static void stbtt__rasterize(stbtt__bitmap *result, stbtt__point *pts, int *wcount, int windings, float scale_x, float scale_y, float shift_x, float shift_y, int off_x, int off_y, int invert, void *userdata) +{ + float y_scale_inv = invert ? -scale_y : scale_y; + stbtt__edge *e; + int n,i,j,k,m; +#if STBTT_RASTERIZER_VERSION == 1 + int vsubsample = result->h < 8 ? 15 : 5; +#elif STBTT_RASTERIZER_VERSION == 2 + int vsubsample = 1; +#else + #error "Unrecognized value of STBTT_RASTERIZER_VERSION" +#endif + // vsubsample should divide 255 evenly; otherwise we won't reach full opacity + + // now we have to blow out the windings into explicit edge lists + n = 0; + for (i=0; i < windings; ++i) + n += wcount[i]; + + e = (stbtt__edge *) STBTT_malloc(sizeof(*e) * (n+1), userdata); // add an extra one as a sentinel + if (e == 0) return; + n = 0; + + m=0; + for (i=0; i < windings; ++i) { + stbtt__point *p = pts + m; + m += wcount[i]; + j = wcount[i]-1; + for (k=0; k < wcount[i]; j=k++) { + int a=k,b=j; + // skip the edge if horizontal + if (p[j].y == p[k].y) + continue; + // add edge from j to k to the list + e[n].invert = 0; + if (invert ? p[j].y > p[k].y : p[j].y < p[k].y) { + e[n].invert = 1; + a=j,b=k; + } + e[n].x0 = p[a].x * scale_x + shift_x; + e[n].y0 = (p[a].y * y_scale_inv + shift_y) * vsubsample; + e[n].x1 = p[b].x * scale_x + shift_x; + e[n].y1 = (p[b].y * y_scale_inv + shift_y) * vsubsample; + ++n; + } + } + + // now sort the edges by their highest point (should snap to integer, and then by x) + //STBTT_sort(e, n, sizeof(e[0]), stbtt__edge_compare); + stbtt__sort_edges(e, n); + + // now, traverse the scanlines and find the intersections on each scanline, use xor winding rule + stbtt__rasterize_sorted_edges(result, e, n, vsubsample, off_x, off_y, userdata); + + STBTT_free(e, userdata); +} + +static void stbtt__add_point(stbtt__point *points, int n, float x, float y) +{ + if (!points) return; // during first pass, it's unallocated + points[n].x = x; + points[n].y = y; +} + +// tesselate until threshhold p is happy... @TODO warped to compensate for non-linear stretching +static int stbtt__tesselate_curve(stbtt__point *points, int *num_points, float x0, float y0, float x1, float y1, float x2, float y2, float objspace_flatness_squared, int n) +{ + // midpoint + float mx = (x0 + 2*x1 + x2)/4; + float my = (y0 + 2*y1 + y2)/4; + // versus directly drawn line + float dx = (x0+x2)/2 - mx; + float dy = (y0+y2)/2 - my; + if (n > 16) // 65536 segments on one curve better be enough! + return 1; + if (dx*dx+dy*dy > objspace_flatness_squared) { // half-pixel error allowed... need to be smaller if AA + stbtt__tesselate_curve(points, num_points, x0,y0, (x0+x1)/2.0f,(y0+y1)/2.0f, mx,my, objspace_flatness_squared,n+1); + stbtt__tesselate_curve(points, num_points, mx,my, (x1+x2)/2.0f,(y1+y2)/2.0f, x2,y2, objspace_flatness_squared,n+1); + } else { + stbtt__add_point(points, *num_points,x2,y2); + *num_points = *num_points+1; + } + return 1; +} + +// returns number of contours +static stbtt__point *stbtt_FlattenCurves(stbtt_vertex *vertices, int num_verts, float objspace_flatness, int **contour_lengths, int *num_contours, void *userdata) +{ + stbtt__point *points=0; + int num_points=0; + + float objspace_flatness_squared = objspace_flatness * objspace_flatness; + int i,n=0,start=0, pass; + + // count how many "moves" there are to get the contour count + for (i=0; i < num_verts; ++i) + if (vertices[i].type == STBTT_vmove) + ++n; + + *num_contours = n; + if (n == 0) return 0; + + *contour_lengths = (int *) STBTT_malloc(sizeof(**contour_lengths) * n, userdata); + + if (*contour_lengths == 0) { + *num_contours = 0; + return 0; + } + + // make two passes through the points so we don't need to realloc + for (pass=0; pass < 2; ++pass) { + float x=0,y=0; + if (pass == 1) { + points = (stbtt__point *) STBTT_malloc(num_points * sizeof(points[0]), userdata); + if (points == NULL) goto error; + } + num_points = 0; + n= -1; + for (i=0; i < num_verts; ++i) { + switch (vertices[i].type) { + case STBTT_vmove: + // start the next contour + if (n >= 0) + (*contour_lengths)[n] = num_points - start; + ++n; + start = num_points; + + x = vertices[i].x, y = vertices[i].y; + stbtt__add_point(points, num_points++, x,y); + break; + case STBTT_vline: + x = vertices[i].x, y = vertices[i].y; + stbtt__add_point(points, num_points++, x, y); + break; + case STBTT_vcurve: + stbtt__tesselate_curve(points, &num_points, x,y, + vertices[i].cx, vertices[i].cy, + vertices[i].x, vertices[i].y, + objspace_flatness_squared, 0); + x = vertices[i].x, y = vertices[i].y; + break; + } + } + (*contour_lengths)[n] = num_points - start; + } + + return points; +error: + STBTT_free(points, userdata); + STBTT_free(*contour_lengths, userdata); + *contour_lengths = 0; + *num_contours = 0; + return NULL; +} + +STBTT_DEF void stbtt_Rasterize(stbtt__bitmap *result, float flatness_in_pixels, stbtt_vertex *vertices, int num_verts, float scale_x, float scale_y, float shift_x, float shift_y, int x_off, int y_off, int invert, void *userdata) +{ + float scale = scale_x > scale_y ? scale_y : scale_x; + int winding_count, *winding_lengths; + stbtt__point *windings = stbtt_FlattenCurves(vertices, num_verts, flatness_in_pixels / scale, &winding_lengths, &winding_count, userdata); + if (windings) { + stbtt__rasterize(result, windings, winding_lengths, winding_count, scale_x, scale_y, shift_x, shift_y, x_off, y_off, invert, userdata); + STBTT_free(winding_lengths, userdata); + STBTT_free(windings, userdata); + } +} + +STBTT_DEF void stbtt_FreeBitmap(unsigned char *bitmap, void *userdata) +{ + STBTT_free(bitmap, userdata); +} + +STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int glyph, int *width, int *height, int *xoff, int *yoff) +{ + int ix0,iy0,ix1,iy1; + stbtt__bitmap gbm; + stbtt_vertex *vertices; + int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices); + + if (scale_x == 0) scale_x = scale_y; + if (scale_y == 0) { + if (scale_x == 0) { + STBTT_free(vertices, info->userdata); + return NULL; + } + scale_y = scale_x; + } + + stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,&ix1,&iy1); + + // now we get the size + gbm.w = (ix1 - ix0); + gbm.h = (iy1 - iy0); + gbm.pixels = NULL; // in case we error + + if (width ) *width = gbm.w; + if (height) *height = gbm.h; + if (xoff ) *xoff = ix0; + if (yoff ) *yoff = iy0; + + if (gbm.w && gbm.h) { + gbm.pixels = (unsigned char *) STBTT_malloc(gbm.w * gbm.h, info->userdata); + if (gbm.pixels) { + gbm.stride = gbm.w; + + stbtt_Rasterize(&gbm, 0.35f, vertices, num_verts, scale_x, scale_y, shift_x, shift_y, ix0, iy0, 1, info->userdata); + } + } + STBTT_free(vertices, info->userdata); + return gbm.pixels; +} + +STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff) +{ + return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y, 0.0f, 0.0f, glyph, width, height, xoff, yoff); +} + +STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int glyph) +{ + int ix0,iy0; + stbtt_vertex *vertices; + int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices); + stbtt__bitmap gbm; + + stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,0,0); + gbm.pixels = output; + gbm.w = out_w; + gbm.h = out_h; + gbm.stride = out_stride; + + if (gbm.w && gbm.h) + stbtt_Rasterize(&gbm, 0.35f, vertices, num_verts, scale_x, scale_y, shift_x, shift_y, ix0,iy0, 1, info->userdata); + + STBTT_free(vertices, info->userdata); +} + +STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int glyph) +{ + stbtt_MakeGlyphBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, 0.0f,0.0f, glyph); +} + +STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff) +{ + return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y,shift_x,shift_y, stbtt_FindGlyphIndex(info,codepoint), width,height,xoff,yoff); +} + +STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint) +{ + stbtt_MakeGlyphBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, shift_x, shift_y, stbtt_FindGlyphIndex(info,codepoint)); +} + +STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff) +{ + return stbtt_GetCodepointBitmapSubpixel(info, scale_x, scale_y, 0.0f,0.0f, codepoint, width,height,xoff,yoff); +} + +STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint) +{ + stbtt_MakeCodepointBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, 0.0f,0.0f, codepoint); +} + +////////////////////////////////////////////////////////////////////////////// +// +// bitmap baking +// +// This is SUPER-CRAPPY packing to keep source code small + +STBTT_DEF int stbtt_BakeFontBitmap(const unsigned char *data, int offset, // font location (use offset=0 for plain .ttf) + float pixel_height, // height of font in pixels + unsigned char *pixels, int pw, int ph, // bitmap to be filled in + int first_char, int num_chars, // characters to bake + stbtt_bakedchar *chardata) +{ + float scale; + int x,y,bottom_y, i; + stbtt_fontinfo f; + f.userdata = NULL; + if (!stbtt_InitFont(&f, data, offset)) + return -1; + STBTT_memset(pixels, 0, pw*ph); // background of 0 around pixels + x=y=1; + bottom_y = 1; + + scale = stbtt_ScaleForPixelHeight(&f, pixel_height); + + for (i=0; i < num_chars; ++i) { + int advance, lsb, x0,y0,x1,y1,gw,gh; + int g = stbtt_FindGlyphIndex(&f, first_char + i); + stbtt_GetGlyphHMetrics(&f, g, &advance, &lsb); + stbtt_GetGlyphBitmapBox(&f, g, scale,scale, &x0,&y0,&x1,&y1); + gw = x1-x0; + gh = y1-y0; + if (x + gw + 1 >= pw) + y = bottom_y, x = 1; // advance to next row + if (y + gh + 1 >= ph) // check if it fits vertically AFTER potentially moving to next row + return -i; + STBTT_assert(x+gw < pw); + STBTT_assert(y+gh < ph); + stbtt_MakeGlyphBitmap(&f, pixels+x+y*pw, gw,gh,pw, scale,scale, g); + chardata[i].x0 = (stbtt_int16) x; + chardata[i].y0 = (stbtt_int16) y; + chardata[i].x1 = (stbtt_int16) (x + gw); + chardata[i].y1 = (stbtt_int16) (y + gh); + chardata[i].xadvance = scale * advance; + chardata[i].xoff = (float) x0; + chardata[i].yoff = (float) y0; + x = x + gw + 1; + if (y+gh+1 > bottom_y) + bottom_y = y+gh+1; + } + return bottom_y; +} + +STBTT_DEF void stbtt_GetBakedQuad(stbtt_bakedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int opengl_fillrule) +{ + float d3d_bias = opengl_fillrule ? 0 : -0.5f; + float ipw = 1.0f / pw, iph = 1.0f / ph; + stbtt_bakedchar *b = chardata + char_index; + int round_x = STBTT_ifloor((*xpos + b->xoff) + 0.5f); + int round_y = STBTT_ifloor((*ypos + b->yoff) + 0.5f); + + q->x0 = round_x + d3d_bias; + q->y0 = round_y + d3d_bias; + q->x1 = round_x + b->x1 - b->x0 + d3d_bias; + q->y1 = round_y + b->y1 - b->y0 + d3d_bias; + + q->s0 = b->x0 * ipw; + q->t0 = b->y0 * iph; + q->s1 = b->x1 * ipw; + q->t1 = b->y1 * iph; + + *xpos += b->xadvance; +} + +////////////////////////////////////////////////////////////////////////////// +// +// rectangle packing replacement routines if you don't have stb_rect_pack.h +// + +#ifndef STB_RECT_PACK_VERSION + +typedef int stbrp_coord; + +//////////////////////////////////////////////////////////////////////////////////// +// // +// // +// COMPILER WARNING ?!?!? // +// // +// // +// if you get a compile warning due to these symbols being defined more than // +// once, move #include "stb_rect_pack.h" before #include "stb_truetype.h" // +// // +//////////////////////////////////////////////////////////////////////////////////// + +typedef struct +{ + int width,height; + int x,y,bottom_y; +} stbrp_context; + +typedef struct +{ + unsigned char x; +} stbrp_node; + +struct stbrp_rect +{ + stbrp_coord x,y; + int id,w,h,was_packed; +}; + +static void stbrp_init_target(stbrp_context *con, int pw, int ph, stbrp_node *nodes, int num_nodes) +{ + con->width = pw; + con->height = ph; + con->x = 0; + con->y = 0; + con->bottom_y = 0; + STBTT__NOTUSED(nodes); + STBTT__NOTUSED(num_nodes); +} + +static void stbrp_pack_rects(stbrp_context *con, stbrp_rect *rects, int num_rects) +{ + int i; + for (i=0; i < num_rects; ++i) { + if (con->x + rects[i].w > con->width) { + con->x = 0; + con->y = con->bottom_y; + } + if (con->y + rects[i].h > con->height) + break; + rects[i].x = con->x; + rects[i].y = con->y; + rects[i].was_packed = 1; + con->x += rects[i].w; + if (con->y + rects[i].h > con->bottom_y) + con->bottom_y = con->y + rects[i].h; + } + for ( ; i < num_rects; ++i) + rects[i].was_packed = 0; +} +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// bitmap baking +// +// This is SUPER-AWESOME (tm Ryan Gordon) packing using stb_rect_pack.h. If +// stb_rect_pack.h isn't available, it uses the BakeFontBitmap strategy. + +STBTT_DEF int stbtt_PackBegin(stbtt_pack_context *spc, unsigned char *pixels, int pw, int ph, int stride_in_bytes, int padding, void *alloc_context) +{ + stbrp_context *context = (stbrp_context *) STBTT_malloc(sizeof(*context) ,alloc_context); + int num_nodes = pw - padding; + stbrp_node *nodes = (stbrp_node *) STBTT_malloc(sizeof(*nodes ) * num_nodes,alloc_context); + + if (context == NULL || nodes == NULL) { + if (context != NULL) STBTT_free(context, alloc_context); + if (nodes != NULL) STBTT_free(nodes , alloc_context); + return 0; + } + + spc->user_allocator_context = alloc_context; + spc->width = pw; + spc->height = ph; + spc->pixels = pixels; + spc->pack_info = context; + spc->nodes = nodes; + spc->padding = padding; + spc->stride_in_bytes = stride_in_bytes != 0 ? stride_in_bytes : pw; + spc->h_oversample = 1; + spc->v_oversample = 1; + + stbrp_init_target(context, pw-padding, ph-padding, nodes, num_nodes); + + if (pixels) + STBTT_memset(pixels, 0, pw*ph); // background of 0 around pixels + + return 1; +} + +STBTT_DEF void stbtt_PackEnd (stbtt_pack_context *spc) +{ + STBTT_free(spc->nodes , spc->user_allocator_context); + STBTT_free(spc->pack_info, spc->user_allocator_context); +} + +STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h_oversample, unsigned int v_oversample) +{ + STBTT_assert(h_oversample <= STBTT_MAX_OVERSAMPLE); + STBTT_assert(v_oversample <= STBTT_MAX_OVERSAMPLE); + if (h_oversample <= STBTT_MAX_OVERSAMPLE) + spc->h_oversample = h_oversample; + if (v_oversample <= STBTT_MAX_OVERSAMPLE) + spc->v_oversample = v_oversample; +} + +#define STBTT__OVER_MASK (STBTT_MAX_OVERSAMPLE-1) + +static void stbtt__h_prefilter(unsigned char *pixels, int w, int h, int stride_in_bytes, unsigned int kernel_width) +{ + unsigned char buffer[STBTT_MAX_OVERSAMPLE]; + int safe_w = w - kernel_width; + int j; + STBTT_memset(buffer, 0, STBTT_MAX_OVERSAMPLE); // suppress bogus warning from VS2013 -analyze + for (j=0; j < h; ++j) { + int i; + unsigned int total; + STBTT_memset(buffer, 0, kernel_width); + + total = 0; + + // make kernel_width a constant in common cases so compiler can optimize out the divide + switch (kernel_width) { + case 2: + for (i=0; i <= safe_w; ++i) { + total += pixels[i] - buffer[i & STBTT__OVER_MASK]; + buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i]; + pixels[i] = (unsigned char) (total / 2); + } + break; + case 3: + for (i=0; i <= safe_w; ++i) { + total += pixels[i] - buffer[i & STBTT__OVER_MASK]; + buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i]; + pixels[i] = (unsigned char) (total / 3); + } + break; + case 4: + for (i=0; i <= safe_w; ++i) { + total += pixels[i] - buffer[i & STBTT__OVER_MASK]; + buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i]; + pixels[i] = (unsigned char) (total / 4); + } + break; + case 5: + for (i=0; i <= safe_w; ++i) { + total += pixels[i] - buffer[i & STBTT__OVER_MASK]; + buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i]; + pixels[i] = (unsigned char) (total / 5); + } + break; + default: + for (i=0; i <= safe_w; ++i) { + total += pixels[i] - buffer[i & STBTT__OVER_MASK]; + buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i]; + pixels[i] = (unsigned char) (total / kernel_width); + } + break; + } + + for (; i < w; ++i) { + STBTT_assert(pixels[i] == 0); + total -= buffer[i & STBTT__OVER_MASK]; + pixels[i] = (unsigned char) (total / kernel_width); + } + + pixels += stride_in_bytes; + } +} + +static void stbtt__v_prefilter(unsigned char *pixels, int w, int h, int stride_in_bytes, unsigned int kernel_width) +{ + unsigned char buffer[STBTT_MAX_OVERSAMPLE]; + int safe_h = h - kernel_width; + int j; + STBTT_memset(buffer, 0, STBTT_MAX_OVERSAMPLE); // suppress bogus warning from VS2013 -analyze + for (j=0; j < w; ++j) { + int i; + unsigned int total; + STBTT_memset(buffer, 0, kernel_width); + + total = 0; + + // make kernel_width a constant in common cases so compiler can optimize out the divide + switch (kernel_width) { + case 2: + for (i=0; i <= safe_h; ++i) { + total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK]; + buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes]; + pixels[i*stride_in_bytes] = (unsigned char) (total / 2); + } + break; + case 3: + for (i=0; i <= safe_h; ++i) { + total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK]; + buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes]; + pixels[i*stride_in_bytes] = (unsigned char) (total / 3); + } + break; + case 4: + for (i=0; i <= safe_h; ++i) { + total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK]; + buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes]; + pixels[i*stride_in_bytes] = (unsigned char) (total / 4); + } + break; + case 5: + for (i=0; i <= safe_h; ++i) { + total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK]; + buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes]; + pixels[i*stride_in_bytes] = (unsigned char) (total / 5); + } + break; + default: + for (i=0; i <= safe_h; ++i) { + total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK]; + buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes]; + pixels[i*stride_in_bytes] = (unsigned char) (total / kernel_width); + } + break; + } + + for (; i < h; ++i) { + STBTT_assert(pixels[i*stride_in_bytes] == 0); + total -= buffer[i & STBTT__OVER_MASK]; + pixels[i*stride_in_bytes] = (unsigned char) (total / kernel_width); + } + + pixels += 1; + } +} + +static float stbtt__oversample_shift(int oversample) +{ + if (!oversample) + return 0.0f; + + // The prefilter is a box filter of width "oversample", + // which shifts phase by (oversample - 1)/2 pixels in + // oversampled space. We want to shift in the opposite + // direction to counter this. + return (float)-(oversample - 1) / (2.0f * (float)oversample); +} + +// rects array must be big enough to accommodate all characters in the given ranges +STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects) +{ + int i,j,k; + + k=0; + for (i=0; i < num_ranges; ++i) { + float fh = ranges[i].font_size; + float scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh); + ranges[i].h_oversample = (unsigned char) spc->h_oversample; + ranges[i].v_oversample = (unsigned char) spc->v_oversample; + for (j=0; j < ranges[i].num_chars; ++j) { + int x0,y0,x1,y1; + int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j]; + int glyph = stbtt_FindGlyphIndex(info, codepoint); + stbtt_GetGlyphBitmapBoxSubpixel(info,glyph, + scale * spc->h_oversample, + scale * spc->v_oversample, + 0,0, + &x0,&y0,&x1,&y1); + rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1); + rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1); + ++k; + } + } + + return k; +} + +// rects array must be big enough to accommodate all characters in the given ranges +STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects) +{ + int i,j,k, return_value = 1; + + // save current values + int old_h_over = spc->h_oversample; + int old_v_over = spc->v_oversample; + + k = 0; + for (i=0; i < num_ranges; ++i) { + float fh = ranges[i].font_size; + float scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh); + float recip_h,recip_v,sub_x,sub_y; + spc->h_oversample = ranges[i].h_oversample; + spc->v_oversample = ranges[i].v_oversample; + recip_h = 1.0f / spc->h_oversample; + recip_v = 1.0f / spc->v_oversample; + sub_x = stbtt__oversample_shift(spc->h_oversample); + sub_y = stbtt__oversample_shift(spc->v_oversample); + for (j=0; j < ranges[i].num_chars; ++j) { + stbrp_rect *r = &rects[k]; + if (r->was_packed) { + stbtt_packedchar *bc = &ranges[i].chardata_for_range[j]; + int advance, lsb, x0,y0,x1,y1; + int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j]; + int glyph = stbtt_FindGlyphIndex(info, codepoint); + stbrp_coord pad = (stbrp_coord) spc->padding; + + // pad on left and top + r->x += pad; + r->y += pad; + r->w -= pad; + r->h -= pad; + stbtt_GetGlyphHMetrics(info, glyph, &advance, &lsb); + stbtt_GetGlyphBitmapBox(info, glyph, + scale * spc->h_oversample, + scale * spc->v_oversample, + &x0,&y0,&x1,&y1); + stbtt_MakeGlyphBitmapSubpixel(info, + spc->pixels + r->x + r->y*spc->stride_in_bytes, + r->w - spc->h_oversample+1, + r->h - spc->v_oversample+1, + spc->stride_in_bytes, + scale * spc->h_oversample, + scale * spc->v_oversample, + 0,0, + glyph); + + if (spc->h_oversample > 1) + stbtt__h_prefilter(spc->pixels + r->x + r->y*spc->stride_in_bytes, + r->w, r->h, spc->stride_in_bytes, + spc->h_oversample); + + if (spc->v_oversample > 1) + stbtt__v_prefilter(spc->pixels + r->x + r->y*spc->stride_in_bytes, + r->w, r->h, spc->stride_in_bytes, + spc->v_oversample); + + bc->x0 = (stbtt_int16) r->x; + bc->y0 = (stbtt_int16) r->y; + bc->x1 = (stbtt_int16) (r->x + r->w); + bc->y1 = (stbtt_int16) (r->y + r->h); + bc->xadvance = scale * advance; + bc->xoff = (float) x0 * recip_h + sub_x; + bc->yoff = (float) y0 * recip_v + sub_y; + bc->xoff2 = (x0 + r->w) * recip_h + sub_x; + bc->yoff2 = (y0 + r->h) * recip_v + sub_y; + } else { + return_value = 0; // if any fail, report failure + } + + ++k; + } + } + + // restore original values + spc->h_oversample = old_h_over; + spc->v_oversample = old_v_over; + + return return_value; +} + +STBTT_DEF void stbtt_PackFontRangesPackRects(stbtt_pack_context *spc, stbrp_rect *rects, int num_rects) +{ + stbrp_pack_rects((stbrp_context *) spc->pack_info, rects, num_rects); +} + +STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, unsigned char *fontdata, int font_index, stbtt_pack_range *ranges, int num_ranges) +{ + stbtt_fontinfo info; + int i,j,n, return_value = 1; + //stbrp_context *context = (stbrp_context *) spc->pack_info; + stbrp_rect *rects; + + // flag all characters as NOT packed + for (i=0; i < num_ranges; ++i) + for (j=0; j < ranges[i].num_chars; ++j) + ranges[i].chardata_for_range[j].x0 = + ranges[i].chardata_for_range[j].y0 = + ranges[i].chardata_for_range[j].x1 = + ranges[i].chardata_for_range[j].y1 = 0; + + n = 0; + for (i=0; i < num_ranges; ++i) + n += ranges[i].num_chars; + + rects = (stbrp_rect *) STBTT_malloc(sizeof(*rects) * n, spc->user_allocator_context); + if (rects == NULL) + return 0; + + info.userdata = spc->user_allocator_context; + stbtt_InitFont(&info, fontdata, stbtt_GetFontOffsetForIndex(fontdata,font_index)); + + n = stbtt_PackFontRangesGatherRects(spc, &info, ranges, num_ranges, rects); + + stbtt_PackFontRangesPackRects(spc, rects, n); + + return_value = stbtt_PackFontRangesRenderIntoRects(spc, &info, ranges, num_ranges, rects); + + STBTT_free(rects, spc->user_allocator_context); + return return_value; +} + +STBTT_DEF int stbtt_PackFontRange(stbtt_pack_context *spc, unsigned char *fontdata, int font_index, float font_size, + int first_unicode_codepoint_in_range, int num_chars_in_range, stbtt_packedchar *chardata_for_range) +{ + stbtt_pack_range range; + range.first_unicode_codepoint_in_range = first_unicode_codepoint_in_range; + range.array_of_unicode_codepoints = NULL; + range.num_chars = num_chars_in_range; + range.chardata_for_range = chardata_for_range; + range.font_size = font_size; + return stbtt_PackFontRanges(spc, fontdata, font_index, &range, 1); +} + +STBTT_DEF void stbtt_GetPackedQuad(stbtt_packedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int align_to_integer) +{ + float ipw = 1.0f / pw, iph = 1.0f / ph; + stbtt_packedchar *b = chardata + char_index; + + if (align_to_integer) { + float x = (float) STBTT_ifloor((*xpos + b->xoff) + 0.5f); + float y = (float) STBTT_ifloor((*ypos + b->yoff) + 0.5f); + q->x0 = x; + q->y0 = y; + q->x1 = x + b->xoff2 - b->xoff; + q->y1 = y + b->yoff2 - b->yoff; + } else { + q->x0 = *xpos + b->xoff; + q->y0 = *ypos + b->yoff; + q->x1 = *xpos + b->xoff2; + q->y1 = *ypos + b->yoff2; + } + + q->s0 = b->x0 * ipw; + q->t0 = b->y0 * iph; + q->s1 = b->x1 * ipw; + q->t1 = b->y1 * iph; + + *xpos += b->xadvance; +} + + +////////////////////////////////////////////////////////////////////////////// +// +// font name matching -- recommended not to use this +// + +// check if a utf8 string contains a prefix which is the utf16 string; if so return length of matching utf8 string +static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(const stbtt_uint8 *s1, stbtt_int32 len1, const stbtt_uint8 *s2, stbtt_int32 len2) +{ + stbtt_int32 i=0; + + // convert utf16 to utf8 and compare the results while converting + while (len2) { + stbtt_uint16 ch = s2[0]*256 + s2[1]; + if (ch < 0x80) { + if (i >= len1) return -1; + if (s1[i++] != ch) return -1; + } else if (ch < 0x800) { + if (i+1 >= len1) return -1; + if (s1[i++] != 0xc0 + (ch >> 6)) return -1; + if (s1[i++] != 0x80 + (ch & 0x3f)) return -1; + } else if (ch >= 0xd800 && ch < 0xdc00) { + stbtt_uint32 c; + stbtt_uint16 ch2 = s2[2]*256 + s2[3]; + if (i+3 >= len1) return -1; + c = ((ch - 0xd800) << 10) + (ch2 - 0xdc00) + 0x10000; + if (s1[i++] != 0xf0 + (c >> 18)) return -1; + if (s1[i++] != 0x80 + ((c >> 12) & 0x3f)) return -1; + if (s1[i++] != 0x80 + ((c >> 6) & 0x3f)) return -1; + if (s1[i++] != 0x80 + ((c ) & 0x3f)) return -1; + s2 += 2; // plus another 2 below + len2 -= 2; + } else if (ch >= 0xdc00 && ch < 0xe000) { + return -1; + } else { + if (i+2 >= len1) return -1; + if (s1[i++] != 0xe0 + (ch >> 12)) return -1; + if (s1[i++] != 0x80 + ((ch >> 6) & 0x3f)) return -1; + if (s1[i++] != 0x80 + ((ch ) & 0x3f)) return -1; + } + s2 += 2; + len2 -= 2; + } + return i; +} + +STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2) +{ + return len1 == stbtt__CompareUTF8toUTF16_bigendian_prefix((const stbtt_uint8*) s1, len1, (const stbtt_uint8*) s2, len2); +} + +// returns results in whatever encoding you request... but note that 2-byte encodings +// will be BIG-ENDIAN... use stbtt_CompareUTF8toUTF16_bigendian() to compare +STBTT_DEF const char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *length, int platformID, int encodingID, int languageID, int nameID) +{ + stbtt_int32 i,count,stringOffset; + stbtt_uint8 *fc = font->data; + stbtt_uint32 offset = font->fontstart; + stbtt_uint32 nm = stbtt__find_table(fc, offset, "name"); + if (!nm) return NULL; + + count = ttUSHORT(fc+nm+2); + stringOffset = nm + ttUSHORT(fc+nm+4); + for (i=0; i < count; ++i) { + stbtt_uint32 loc = nm + 6 + 12 * i; + if (platformID == ttUSHORT(fc+loc+0) && encodingID == ttUSHORT(fc+loc+2) + && languageID == ttUSHORT(fc+loc+4) && nameID == ttUSHORT(fc+loc+6)) { + *length = ttUSHORT(fc+loc+8); + return (const char *) (fc+stringOffset+ttUSHORT(fc+loc+10)); + } + } + return NULL; +} + +static int stbtt__matchpair(stbtt_uint8 *fc, stbtt_uint32 nm, stbtt_uint8 *name, stbtt_int32 nlen, stbtt_int32 target_id, stbtt_int32 next_id) +{ + stbtt_int32 i; + stbtt_int32 count = ttUSHORT(fc+nm+2); + stbtt_int32 stringOffset = nm + ttUSHORT(fc+nm+4); + + for (i=0; i < count; ++i) { + stbtt_uint32 loc = nm + 6 + 12 * i; + stbtt_int32 id = ttUSHORT(fc+loc+6); + if (id == target_id) { + // find the encoding + stbtt_int32 platform = ttUSHORT(fc+loc+0), encoding = ttUSHORT(fc+loc+2), language = ttUSHORT(fc+loc+4); + + // is this a Unicode encoding? + if (platform == 0 || (platform == 3 && encoding == 1) || (platform == 3 && encoding == 10)) { + stbtt_int32 slen = ttUSHORT(fc+loc+8); + stbtt_int32 off = ttUSHORT(fc+loc+10); + + // check if there's a prefix match + stbtt_int32 matchlen = stbtt__CompareUTF8toUTF16_bigendian_prefix(name, nlen, fc+stringOffset+off,slen); + if (matchlen >= 0) { + // check for target_id+1 immediately following, with same encoding & language + if (i+1 < count && ttUSHORT(fc+loc+12+6) == next_id && ttUSHORT(fc+loc+12) == platform && ttUSHORT(fc+loc+12+2) == encoding && ttUSHORT(fc+loc+12+4) == language) { + slen = ttUSHORT(fc+loc+12+8); + off = ttUSHORT(fc+loc+12+10); + if (slen == 0) { + if (matchlen == nlen) + return 1; + } else if (matchlen < nlen && name[matchlen] == ' ') { + ++matchlen; + if (stbtt_CompareUTF8toUTF16_bigendian((char*) (name+matchlen), nlen-matchlen, (char*)(fc+stringOffset+off),slen)) + return 1; + } + } else { + // if nothing immediately following + if (matchlen == nlen) + return 1; + } + } + } + + // @TODO handle other encodings + } + } + return 0; +} + +static int stbtt__matches(stbtt_uint8 *fc, stbtt_uint32 offset, stbtt_uint8 *name, stbtt_int32 flags) +{ + stbtt_int32 nlen = (stbtt_int32) STBTT_strlen((char *) name); + stbtt_uint32 nm,hd; + if (!stbtt__isfont(fc+offset)) return 0; + + // check italics/bold/underline flags in macStyle... + if (flags) { + hd = stbtt__find_table(fc, offset, "head"); + if ((ttUSHORT(fc+hd+44) & 7) != (flags & 7)) return 0; + } + + nm = stbtt__find_table(fc, offset, "name"); + if (!nm) return 0; + + if (flags) { + // if we checked the macStyle flags, then just check the family and ignore the subfamily + if (stbtt__matchpair(fc, nm, name, nlen, 16, -1)) return 1; + if (stbtt__matchpair(fc, nm, name, nlen, 1, -1)) return 1; + if (stbtt__matchpair(fc, nm, name, nlen, 3, -1)) return 1; + } else { + if (stbtt__matchpair(fc, nm, name, nlen, 16, 17)) return 1; + if (stbtt__matchpair(fc, nm, name, nlen, 1, 2)) return 1; + if (stbtt__matchpair(fc, nm, name, nlen, 3, -1)) return 1; + } + + return 0; +} + +STBTT_DEF int stbtt_FindMatchingFont(const unsigned char *font_collection, const char *name_utf8, stbtt_int32 flags) +{ + stbtt_int32 i; + for (i=0;;++i) { + stbtt_int32 off = stbtt_GetFontOffsetForIndex(font_collection, i); + if (off < 0) return off; + if (stbtt__matches((stbtt_uint8 *) font_collection, off, (stbtt_uint8*) name_utf8, flags)) + return off; + } +} + +#endif // STB_TRUETYPE_IMPLEMENTATION + + +// FULL VERSION HISTORY +// +// 1.11 (2016-04-02) fix unused-variable warning +// 1.10 (2016-04-02) allow user-defined fabs() replacement +// fix memory leak if fontsize=0.0 +// fix warning from duplicate typedef +// 1.09 (2016-01-16) warning fix; avoid crash on outofmem; use alloc userdata for PackFontRanges +// 1.08 (2015-09-13) document stbtt_Rasterize(); fixes for vertical & horizontal edges +// 1.07 (2015-08-01) allow PackFontRanges to accept arrays of sparse codepoints; +// allow PackFontRanges to pack and render in separate phases; +// fix stbtt_GetFontOFfsetForIndex (never worked for non-0 input?); +// fixed an assert() bug in the new rasterizer +// replace assert() with STBTT_assert() in new rasterizer +// 1.06 (2015-07-14) performance improvements (~35% faster on x86 and x64 on test machine) +// also more precise AA rasterizer, except if shapes overlap +// remove need for STBTT_sort +// 1.05 (2015-04-15) fix misplaced definitions for STBTT_STATIC +// 1.04 (2015-04-15) typo in example +// 1.03 (2015-04-12) STBTT_STATIC, fix memory leak in new packing, various fixes +// 1.02 (2014-12-10) fix various warnings & compile issues w/ stb_rect_pack, C++ +// 1.01 (2014-12-08) fix subpixel position when oversampling to exactly match +// non-oversampled; STBTT_POINT_SIZE for packed case only +// 1.00 (2014-12-06) add new PackBegin etc. API, w/ support for oversampling +// 0.99 (2014-09-18) fix multiple bugs with subpixel rendering (ryg) +// 0.9 (2014-08-07) support certain mac/iOS fonts without an MS platformID +// 0.8b (2014-07-07) fix a warning +// 0.8 (2014-05-25) fix a few more warnings +// 0.7 (2013-09-25) bugfix: subpixel glyph bug fixed in 0.5 had come back +// 0.6c (2012-07-24) improve documentation +// 0.6b (2012-07-20) fix a few more warnings +// 0.6 (2012-07-17) fix warnings; added stbtt_ScaleForMappingEmToPixels, +// stbtt_GetFontBoundingBox, stbtt_IsGlyphEmpty +// 0.5 (2011-12-09) bugfixes: +// subpixel glyph renderer computed wrong bounding box +// first vertex of shape can be off-curve (FreeSans) +// 0.4b (2011-12-03) fixed an error in the font baking example +// 0.4 (2011-12-01) kerning, subpixel rendering (tor) +// bugfixes for: +// codepoint-to-glyph conversion using table fmt=12 +// codepoint-to-glyph conversion using table fmt=4 +// stbtt_GetBakedQuad with non-square texture (Zer) +// updated Hello World! sample to use kerning and subpixel +// fixed some warnings +// 0.3 (2009-06-24) cmap fmt=12, compound shapes (MM) +// userdata, malloc-from-userdata, non-zero fill (stb) +// 0.2 (2009-03-11) Fix unsigned/signed char warnings +// 0.1 (2009-03-09) First public release +// diff --git a/source/samples/OpenGL/OpenGLSample.cpp b/source/samples/OpenGL/OpenGLSample.cpp index 5f4084bd..b0e4ccc4 100644 --- a/source/samples/OpenGL/OpenGLSample.cpp +++ b/source/samples/OpenGL/OpenGLSample.cpp @@ -70,6 +70,7 @@ int main() // Create a Gwork skin Gwk::Skin::TexturedBase* skin = new Gwk::Skin::TexturedBase(renderer); skin->Init("DefaultSkin.png"); + skin->SetDefaultFont("OpenSans.ttf", 11); // Create a Canvas (it's root, on which all other Gwork panels are created) Gwk::Controls::Canvas* canvas = new Gwk::Controls::Canvas(skin); From edeb52e1f1bae86982b3b8eff8e3e3192713a4b9 Mon Sep 17 00:00:00 2001 From: BQ Date: Wed, 18 May 2016 13:54:04 +0100 Subject: [PATCH 21/54] GL text appears. --- source/platform/renderers/OpenGL/OpenGL.cpp | 54 +++++++++++++-------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/source/platform/renderers/OpenGL/OpenGL.cpp b/source/platform/renderers/OpenGL/OpenGL.cpp index dec305e4..13db8e35 100644 --- a/source/platform/renderers/OpenGL/OpenGL.cpp +++ b/source/platform/renderers/OpenGL/OpenGL.cpp @@ -244,6 +244,8 @@ namespace Gwk return c; } + static const int texsz = 128; + void OpenGL::LoadFont(Gwk::Font* font) { std::string fontName(font->facename); @@ -251,10 +253,13 @@ namespace Gwk if (fontName.find(".ttf") == std::string::npos) fontName += ".ttf"; + font->realsize = font->size*Scale(); + FILE* f = fopen(fontName.c_str(), "rb"); if (!f) { font->data = nullptr; + font->facename = ""; return; } @@ -266,29 +271,33 @@ namespace Gwk unsigned char* ttfdata = new unsigned char[fsz]; fread(ttfdata, 1, fsz, f); - const int texsz = 512; unsigned char *font_bmp = new unsigned char[texsz * texsz]; - font->render_data = new stbtt_bakedchar['z' - ' ' + 1]; + font->render_data = new stbtt_bakedchar[96]; - stbtt_BakeFontBitmap(ttfdata, 0, - font->realsize, // height - font_bmp, texsz, texsz, - ' ','z', // range to bake - static_cast(font->render_data)); + const int bfret = + stbtt_BakeFontBitmap(ttfdata, 0, + font->realsize, // height + font_bmp, texsz, texsz, + 32,96, // range to bake + static_cast(font->render_data)); delete [] ttfdata; font->data = new GLuint; glGenTextures(1, static_cast(font->data)); glBindTexture(GL_TEXTURE_2D, *static_cast(font->data)); - glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 512,512, 0, GL_ALPHA, GL_UNSIGNED_BYTE, + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, + texsz,texsz, 0, + GL_ALPHA, GL_UNSIGNED_BYTE, font_bmp); delete [] font_bmp; - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); } void OpenGL::FreeFont(Gwk::Font* font) { + // TODO - unbind texture delete [] static_cast(font->data); delete [] static_cast(font->render_data); } @@ -296,36 +305,39 @@ namespace Gwk void OpenGL::RenderText(Gwk::Font* font, Gwk::Point pos, const Gwk::String& text) { -// return; + if (font->facename.empty()) + return; if (!font->data) - { LoadFont(font); - } Texture tex; tex.data = font->data; - + float x = pos.x, y = pos.y; const char *pc = text.c_str(); size_t slen = text.length(); while (slen > 0) { - stbtt_aligned_quad q; - stbtt_GetBakedQuad(static_cast(font->render_data), - 512,512, - *pc - 32, - &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 - Rect r(q.x0, q.y0, q.x1 - q.x0, q.y1 - q.y0); - DrawTexturedRect(&tex, r, q.s0,q.t0, q.s1,q.t1); + if (*pc >= 32 && *pc <= 127) + { + stbtt_aligned_quad q; + stbtt_GetBakedQuad(static_cast(font->render_data), + texsz,texsz, + *pc - 32, + &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 + + Rect r(q.x0, q.y1+10, q.x1 - q.x0, q.y1 - q.y0); + DrawTexturedRect(&tex, r, q.s0,q.t0, q.s1,q.t1); + } ++pc, --slen; } } Gwk::Point OpenGL::MeasureText(Gwk::Font* font, const Gwk::String& text) { - return Point(); + return Point(100,20); } bool OpenGL::InitializeContext(Gwk::WindowProvider* window) From 25bd7d2bfaae12d3994eeb1f93a2fd3228fc8289 Mon Sep 17 00:00:00 2001 From: BQ Date: Wed, 18 May 2016 14:02:15 +0100 Subject: [PATCH 22/54] Text measurement. --- source/platform/renderers/OpenGL/OpenGL.cpp | 30 +++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/source/platform/renderers/OpenGL/OpenGL.cpp b/source/platform/renderers/OpenGL/OpenGL.cpp index 13db8e35..1dfade4a 100644 --- a/source/platform/renderers/OpenGL/OpenGL.cpp +++ b/source/platform/renderers/OpenGL/OpenGL.cpp @@ -328,7 +328,7 @@ namespace Gwk *pc - 32, &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 - Rect r(q.x0, q.y1+10, q.x1 - q.x0, q.y1 - q.y0); + Rect r(q.x0, q.y1, q.x1 - q.x0, q.y1 - q.y0); DrawTexturedRect(&tex, r, q.s0,q.t0, q.s1,q.t1); } ++pc, --slen; @@ -337,7 +337,33 @@ namespace Gwk Gwk::Point OpenGL::MeasureText(Gwk::Font* font, const Gwk::String& text) { - return Point(100,20); + Point sz; + + if (!font->data || font->facename.empty()) + return sz; + + float x = 0.f, y = 0.f; + const char *pc = text.c_str(); + size_t slen = text.length(); + + while (slen > 0) + { + if (*pc >= 32 && *pc <= 127) + { + stbtt_aligned_quad q; + stbtt_GetBakedQuad(static_cast(font->render_data), + texsz,texsz, + *pc - 32, + &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 + + Rect r(q.x0, q.y1+10, q.x1 - q.x0, q.y1 - q.y0); + sz.x = r.x + r.w; + sz.y = std::max(sz.y, r.h); + } + ++pc, --slen; + } + + return sz; } bool OpenGL::InitializeContext(Gwk::WindowProvider* window) From 23822c2c0bd29a8b2a0b29aad091f88210d458fc Mon Sep 17 00:00:00 2001 From: BQ Date: Wed, 18 May 2016 14:49:44 +0100 Subject: [PATCH 23/54] Fonts working as bitmaps. - Could be better quality but works. - Improvement involves caching bitmaps. Too much work for now. --- source/platform/renderers/OpenGL/OpenGL.cpp | 46 +++++++++++---------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/source/platform/renderers/OpenGL/OpenGL.cpp b/source/platform/renderers/OpenGL/OpenGL.cpp index 1dfade4a..dffbd2ef 100644 --- a/source/platform/renderers/OpenGL/OpenGL.cpp +++ b/source/platform/renderers/OpenGL/OpenGL.cpp @@ -25,6 +25,10 @@ namespace Gwk { namespace Renderer { + // See "Font Size in Pixels or Points" in "stb_truetype.h" + const float c_pixToPoints = 1.333f; + + static const int c_texsz = 256; // TODO - fix this hack. OpenGL::OpenGL(const Rect& viewRect) : m_viewRect(viewRect) @@ -244,8 +248,6 @@ namespace Gwk return c; } - static const int texsz = 128; - void OpenGL::LoadFont(Gwk::Font* font) { std::string fontName(font->facename); @@ -253,7 +255,7 @@ namespace Gwk if (fontName.find(".ttf") == std::string::npos) fontName += ".ttf"; - font->realsize = font->size*Scale(); + font->realsize = font->size * Scale() * c_pixToPoints; FILE* f = fopen(fontName.c_str(), "rb"); if (!f) @@ -271,16 +273,15 @@ namespace Gwk unsigned char* ttfdata = new unsigned char[fsz]; fread(ttfdata, 1, fsz, f); - unsigned char *font_bmp = new unsigned char[texsz * texsz]; + unsigned char *font_bmp = new unsigned char[c_texsz * c_texsz]; font->render_data = new stbtt_bakedchar[96]; - const int bfret = - stbtt_BakeFontBitmap(ttfdata, 0, - font->realsize, // height - font_bmp, texsz, texsz, - 32,96, // range to bake - static_cast(font->render_data)); + stbtt_BakeFontBitmap(ttfdata, 0, + font->realsize, // height + font_bmp, c_texsz, c_texsz, + 32,96, // range to bake + static_cast(font->render_data)); delete [] ttfdata; font->data = new GLuint; @@ -289,7 +290,7 @@ namespace Gwk glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, - texsz,texsz, 0, + c_texsz,c_texsz, 0, GL_ALPHA, GL_UNSIGNED_BYTE, font_bmp); delete [] font_bmp; @@ -310,7 +311,7 @@ namespace Gwk if (!font->data) LoadFont(font); - + Texture tex; tex.data = font->data; @@ -318,17 +319,18 @@ namespace Gwk const char *pc = text.c_str(); size_t slen = text.length(); + const float height = font->realsize / c_pixToPoints; while (slen > 0) { if (*pc >= 32 && *pc <= 127) { stbtt_aligned_quad q; stbtt_GetBakedQuad(static_cast(font->render_data), - texsz,texsz, + c_texsz,c_texsz, *pc - 32, &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 - Rect r(q.x0, q.y1, q.x1 - q.x0, q.y1 - q.y0); + Rect r(q.x0, height + q.y0, q.x1 - q.x0, q.y1 - q.y0); DrawTexturedRect(&tex, r, q.s0,q.t0, q.s1,q.t1); } ++pc, --slen; @@ -337,11 +339,14 @@ namespace Gwk Gwk::Point OpenGL::MeasureText(Gwk::Font* font, const Gwk::String& text) { - Point sz; - - if (!font->data || font->facename.empty()) + Point sz(0, font->realsize * c_pixToPoints); + + if (font->facename.empty()) return sz; + if (!font->data) + LoadFont(font); + float x = 0.f, y = 0.f; const char *pc = text.c_str(); size_t slen = text.length(); @@ -352,13 +357,12 @@ namespace Gwk { stbtt_aligned_quad q; stbtt_GetBakedQuad(static_cast(font->render_data), - texsz,texsz, + c_texsz,c_texsz, *pc - 32, &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 - Rect r(q.x0, q.y1+10, q.x1 - q.x0, q.y1 - q.y0); - sz.x = r.x + r.w; - sz.y = std::max(sz.y, r.h); + sz.x = q.x1; + sz.y = std::max(sz.y, int(q.y1 - q.y0)); } ++pc, --slen; } From c37edcbf2393a18fbd1666de2f957f9f71f2f554 Mon Sep 17 00:00:00 2001 From: BQ Date: Wed, 18 May 2016 14:52:56 +0100 Subject: [PATCH 24/54] Fix indenting. Only indent headers. --- .../platform/renderers/Allegro5/Allegro5.cpp | 642 ++++++------- .../platform/renderers/Direct2D/Direct2D.cpp | 852 +++++++++--------- .../platform/renderers/DirectX9/DirectX9.cpp | 840 ++++++++--------- source/platform/renderers/GDIPlus/GDIPlus.cpp | 413 ++++----- .../OpenGL/DebugFont/OpenGL_DebugFont.cpp | 220 ++--- source/platform/renderers/OpenGL/OpenGL.cpp | 803 ++++++++--------- source/platform/renderers/SDL2/SDL2.cpp | 459 +++++----- 7 files changed, 2115 insertions(+), 2114 deletions(-) diff --git a/source/platform/renderers/Allegro5/Allegro5.cpp b/source/platform/renderers/Allegro5/Allegro5.cpp index 72440055..355c1c7e 100644 --- a/source/platform/renderers/Allegro5/Allegro5.cpp +++ b/source/platform/renderers/Allegro5/Allegro5.cpp @@ -16,332 +16,332 @@ namespace Gwk { - namespace Renderer +namespace Renderer +{ +// +// Allegro texture cache. +// +class AllegroCTT : public ICacheToTexture +{ +public: + + AllegroCTT() : m_oSWindowldTarget(nullptr) {} + ~AllegroCTT() {} + + void Initialize() {} + void ShutDown(); + void SetRenderer(Gwk::Renderer::Base* renderer) { m_renderer = renderer; } + + void SetupCacheTexture(CacheHandle control); + void FinishCacheTexture(CacheHandle control); + + void DrawCachedControlTexture(CacheHandle control); + void CreateControlCacheTexture(CacheHandle control, const Point& size); + void UpdateControlCacheTexture(CacheHandle control) {} + + // TODO What destroys the cached textures? Does this assume they always exist? + +private: + + Gwk::Renderer::Base *m_renderer; + + struct CacheEntry { - // - // Allegro texture cache. - // - class AllegroCTT : public ICacheToTexture - { - public: - - AllegroCTT() : m_oSWindowldTarget(nullptr) {} - ~AllegroCTT() {} - - void Initialize() {} - void ShutDown(); - void SetRenderer(Gwk::Renderer::Base* renderer) { m_renderer = renderer; } - - void SetupCacheTexture(CacheHandle control); - void FinishCacheTexture(CacheHandle control); - - void DrawCachedControlTexture(CacheHandle control); - void CreateControlCacheTexture(CacheHandle control, const Point& size); - void UpdateControlCacheTexture(CacheHandle control) {} - - // TODO What destroys the cached textures? Does this assume they always exist? - - private: - - Gwk::Renderer::Base *m_renderer; - - struct CacheEntry - { - ALLEGRO_BITMAP *m_bitmap; - }; - - typedef std::map< CacheHandle, CacheEntry > CacheMap; - CacheMap m_cache; - - ALLEGRO_BITMAP *m_oSWindowldTarget; - }; - - void AllegroCTT::ShutDown() - { - // TODO: - Delete the cached textures we created. - // Note: This doesn't get called at the moment because Gwork currently crashes - // if we delete the renderer on clean up. - } - - void AllegroCTT::CreateControlCacheTexture(CacheHandle control, const Point& size) - { - // If we haven't seen this control before, create a new entry. - if (m_cache.find(control) == m_cache.end()) - { - CacheEntry newEntry = { al_create_bitmap(size.x, size.y) }; - m_cache.insert(std::pair(control, newEntry)); - } - } - - void AllegroCTT::SetupCacheTexture(CacheHandle control) - { - CacheMap::iterator it = m_cache.find(control); - assert(it != m_cache.end()); - if (it != m_cache.end()) - { - // Prepare for rendering. - assert(m_oSWindowldTarget==nullptr); - m_oSWindowldTarget = al_get_target_bitmap(); - al_set_target_bitmap((*it).second.m_bitmap); - al_clear_to_color(al_map_rgb_f(1.f,1.f,1.f)); - } - } - - void AllegroCTT::FinishCacheTexture(CacheHandle control) - { - // Prepare for rendering. - al_set_target_bitmap(m_oSWindowldTarget); - m_oSWindowldTarget = nullptr; - } - - void AllegroCTT::DrawCachedControlTexture(CacheHandle control) - { - CacheMap::iterator it = m_cache.find(control); - assert(it != m_cache.end()); - if (it != m_cache.end()) - { - ALLEGRO_BITMAP *bmp = (*it).second.m_bitmap; - const Gwk::Point &pos = m_renderer->GetRenderOffset(); - al_draw_bitmap(bmp, pos.x, pos.y, 0); - } - } - - //------------------------------------------------------------------------------- - - Allegro::Allegro() - : m_ctt(new AllegroCTT) - { - m_ctt->SetRenderer(this); - m_ctt->Initialize(); - } - - Allegro::~Allegro() - { - } - - void Allegro::SetDrawColor(Gwk::Color color) - { - m_color = al_map_rgba(color.r, color.g, color.b, color.a); - } - - void Allegro::LoadFont(Gwk::Font* font) - { - font->realsize = font->size*Scale(); - std::string fontName(font->facename); - - if (fontName.find(".ttf") == std::string::npos) - fontName += ".ttf"; - - ALLEGRO_FONT* afont = al_load_font(fontName.c_str(), - font->realsize, - ALLEGRO_TTF_NO_KERNING); - font->data = afont; - } - - void Allegro::FreeFont(Gwk::Font* font) - { - if (font->data) - { - al_destroy_font((ALLEGRO_FONT*)font->data); - font->data = nullptr; - } - } - - void Allegro::RenderText(Gwk::Font* font, Gwk::Point pos, - const Gwk::String& text) - { - ALLEGRO_FONT *afont = (ALLEGRO_FONT*)font->data; - Translate(pos.x, pos.y); - al_draw_text(afont, m_color, pos.x, pos.y, ALLEGRO_ALIGN_LEFT, text.c_str()); - } - - Gwk::Point Allegro::MeasureText(Gwk::Font* font, const Gwk::String& text) - { - ALLEGRO_FONT* afont = (ALLEGRO_FONT*)font->data; - - // If the font doesn't exist, or the font size should be changed - if (!afont || font->realsize != font->size*Scale()) - { - FreeFont(font); - LoadFont(font); - afont = (ALLEGRO_FONT*)font->data; - } - - if (!afont) - return Gwk::Point(0, 0); - - return Point(al_get_text_width(afont, text.c_str()), al_get_font_line_height(afont)); - } - - void Allegro::StartClip() - { - Gwk::Rect rect = ClipRegion(); - al_set_clipping_rectangle(rect.x, rect.y, rect.w, rect.h); - } - - void Allegro::EndClip() - { - ALLEGRO_BITMAP* targ = al_get_target_bitmap(); - al_set_clipping_rectangle(0, 0, - al_get_bitmap_width(targ), al_get_bitmap_height(targ)); - } - - void Allegro::LoadTexture(Gwk::Texture* texture) - { - if (!texture) - return; - - if (texture->data) - FreeTexture(texture); - - ALLEGRO_BITMAP* bmp = al_load_bitmap(texture->name.c_str()); - - if (bmp) - { - texture->data = bmp; - texture->width = al_get_bitmap_width(bmp); - texture->height = al_get_bitmap_height(bmp); - texture->failed = false; - } - else - { - texture->data = nullptr; - texture->failed = true; - } - } - - void Allegro::FreeTexture(Gwk::Texture* texture) - { - al_destroy_bitmap((ALLEGRO_BITMAP*)texture->data); - texture->data = nullptr; - } - - void Allegro::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, - float u1, float v1, - float u2, float v2) - { - ALLEGRO_BITMAP* bmp = (ALLEGRO_BITMAP*)texture->data; - - if (!bmp) - return DrawMissingImage(rect); - - Translate(rect); - const unsigned int w = texture->width; - const unsigned int h = texture->height; - al_draw_scaled_bitmap(bmp, - u1*w, v1*h, (u2-u1)*w, (v2-v1)*h, // source - rect.x, rect.y, rect.w, rect.h, // destination - 0); - } - - Gwk::Color Allegro::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, - const Gwk::Color& col_default) - { - ALLEGRO_BITMAP* bmp = (ALLEGRO_BITMAP*)texture->data; - - if (!bmp) - return col_default; - - ALLEGRO_COLOR col = al_get_pixel(bmp, x, y); - Gwk::Color gcol; - al_unmap_rgba(col, &gcol.r, &gcol.g, &gcol.b, &gcol.a); - return gcol; - } - - void Allegro::DrawFilledRect(Gwk::Rect rect) - { - Translate(rect); - const float fx = rect.x+0.5f, fy = rect.y+0.5f; - al_draw_filled_rectangle(fx, fy, fx+rect.w, fy+rect.h, m_color); - } - - void Allegro::DrawLinedRect(Gwk::Rect rect) - { - Translate(rect); - // Width of 0 draws a line, not a rect of width 1. - const float fx = rect.x+0.5f, fy = rect.y+0.5f; - al_draw_rectangle(fx, fy, fx+rect.w, fy+rect.h, m_color, 0.f); - } - - void Allegro::DrawShavedCornerRect(Gwk::Rect rect, bool bSlight) - { - // Draw INSIDE the w/h. - rect.w -= 1; - rect.h -= 1; - + ALLEGRO_BITMAP *m_bitmap; + }; + + typedef std::map< CacheHandle, CacheEntry > CacheMap; + CacheMap m_cache; + + ALLEGRO_BITMAP *m_oSWindowldTarget; +}; + +void AllegroCTT::ShutDown() +{ + // TODO: - Delete the cached textures we created. + // Note: This doesn't get called at the moment because Gwork currently crashes + // if we delete the renderer on clean up. +} + +void AllegroCTT::CreateControlCacheTexture(CacheHandle control, const Point& size) +{ + // If we haven't seen this control before, create a new entry. + if (m_cache.find(control) == m_cache.end()) + { + CacheEntry newEntry = { al_create_bitmap(size.x, size.y) }; + m_cache.insert(std::pair(control, newEntry)); + } +} + +void AllegroCTT::SetupCacheTexture(CacheHandle control) +{ + CacheMap::iterator it = m_cache.find(control); + assert(it != m_cache.end()); + if (it != m_cache.end()) + { + // Prepare for rendering. + assert(m_oSWindowldTarget==nullptr); + m_oSWindowldTarget = al_get_target_bitmap(); + al_set_target_bitmap((*it).second.m_bitmap); + al_clear_to_color(al_map_rgb_f(1.f,1.f,1.f)); + } +} + +void AllegroCTT::FinishCacheTexture(CacheHandle control) +{ + // Prepare for rendering. + al_set_target_bitmap(m_oSWindowldTarget); + m_oSWindowldTarget = nullptr; +} + +void AllegroCTT::DrawCachedControlTexture(CacheHandle control) +{ + CacheMap::iterator it = m_cache.find(control); + assert(it != m_cache.end()); + if (it != m_cache.end()) + { + ALLEGRO_BITMAP *bmp = (*it).second.m_bitmap; + const Gwk::Point &pos = m_renderer->GetRenderOffset(); + al_draw_bitmap(bmp, pos.x, pos.y, 0); + } +} + +//------------------------------------------------------------------------------- + +Allegro::Allegro() +: m_ctt(new AllegroCTT) +{ + m_ctt->SetRenderer(this); + m_ctt->Initialize(); +} + +Allegro::~Allegro() +{ +} + +void Allegro::SetDrawColor(Gwk::Color color) +{ + m_color = al_map_rgba(color.r, color.g, color.b, color.a); +} + +void Allegro::LoadFont(Gwk::Font* font) +{ + font->realsize = font->size*Scale(); + std::string fontName(font->facename); + + if (fontName.find(".ttf") == std::string::npos) + fontName += ".ttf"; + + ALLEGRO_FONT* afont = al_load_font(fontName.c_str(), + font->realsize, + ALLEGRO_TTF_NO_KERNING); + font->data = afont; +} + +void Allegro::FreeFont(Gwk::Font* font) +{ + if (font->data) + { + al_destroy_font((ALLEGRO_FONT*)font->data); + font->data = nullptr; + } +} + +void Allegro::RenderText(Gwk::Font* font, Gwk::Point pos, + const Gwk::String& text) +{ + ALLEGRO_FONT *afont = (ALLEGRO_FONT*)font->data; + Translate(pos.x, pos.y); + al_draw_text(afont, m_color, pos.x, pos.y, ALLEGRO_ALIGN_LEFT, text.c_str()); +} + +Gwk::Point Allegro::MeasureText(Gwk::Font* font, const Gwk::String& text) +{ + ALLEGRO_FONT* afont = (ALLEGRO_FONT*)font->data; + + // If the font doesn't exist, or the font size should be changed + if (!afont || font->realsize != font->size*Scale()) + { + FreeFont(font); + LoadFont(font); + afont = (ALLEGRO_FONT*)font->data; + } + + if (!afont) + return Gwk::Point(0, 0); + + return Point(al_get_text_width(afont, text.c_str()), al_get_font_line_height(afont)); +} + +void Allegro::StartClip() +{ + Gwk::Rect rect = ClipRegion(); + al_set_clipping_rectangle(rect.x, rect.y, rect.w, rect.h); +} + +void Allegro::EndClip() +{ + ALLEGRO_BITMAP* targ = al_get_target_bitmap(); + al_set_clipping_rectangle(0, 0, + al_get_bitmap_width(targ), al_get_bitmap_height(targ)); +} + +void Allegro::LoadTexture(Gwk::Texture* texture) +{ + if (!texture) + return; + + if (texture->data) + FreeTexture(texture); + + ALLEGRO_BITMAP* bmp = al_load_bitmap(texture->name.c_str()); + + if (bmp) + { + texture->data = bmp; + texture->width = al_get_bitmap_width(bmp); + texture->height = al_get_bitmap_height(bmp); + texture->failed = false; + } + else + { + texture->data = nullptr; + texture->failed = true; + } +} + +void Allegro::FreeTexture(Gwk::Texture* texture) +{ + al_destroy_bitmap((ALLEGRO_BITMAP*)texture->data); + texture->data = nullptr; +} + +void Allegro::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, + float u1, float v1, + float u2, float v2) +{ + ALLEGRO_BITMAP* bmp = (ALLEGRO_BITMAP*)texture->data; + + if (!bmp) + return DrawMissingImage(rect); + + Translate(rect); + const unsigned int w = texture->width; + const unsigned int h = texture->height; + al_draw_scaled_bitmap(bmp, + u1*w, v1*h, (u2-u1)*w, (v2-v1)*h, // source + rect.x, rect.y, rect.w, rect.h, // destination + 0); +} + +Gwk::Color Allegro::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, + const Gwk::Color& col_default) +{ + ALLEGRO_BITMAP* bmp = (ALLEGRO_BITMAP*)texture->data; + + if (!bmp) + return col_default; + + ALLEGRO_COLOR col = al_get_pixel(bmp, x, y); + Gwk::Color gcol; + al_unmap_rgba(col, &gcol.r, &gcol.g, &gcol.b, &gcol.a); + return gcol; +} + +void Allegro::DrawFilledRect(Gwk::Rect rect) +{ + Translate(rect); + const float fx = rect.x+0.5f, fy = rect.y+0.5f; + al_draw_filled_rectangle(fx, fy, fx+rect.w, fy+rect.h, m_color); +} + +void Allegro::DrawLinedRect(Gwk::Rect rect) +{ + Translate(rect); + // Width of 0 draws a line, not a rect of width 1. + const float fx = rect.x+0.5f, fy = rect.y+0.5f; + al_draw_rectangle(fx, fy, fx+rect.w, fy+rect.h, m_color, 0.f); +} + +void Allegro::DrawShavedCornerRect(Gwk::Rect rect, bool bSlight) +{ + // Draw INSIDE the w/h. + rect.w -= 1; + rect.h -= 1; + #define SET_VERT(I, X,Y) vtx[I].x = (X), vtx[I].y = (Y), vtx[I].color = m_color #define ADD_LINE(I, X0,Y0, X1,Y1) SET_VERT(I, X0,Y0); SET_VERT(I+1, X1,Y1) - const float fx = rect.x+0.5f, fy = rect.y+0.5f; - const float fw = rect.w, fh = rect.h; - - if (bSlight) - { - // DrawFilledRect(Gwk::Rect(rect.x+1, rect.y, rect.w-1, 1)); - // DrawFilledRect(Gwk::Rect(rect.x+1, rect.y+rect.h, rect.w-1, 1)); - // DrawFilledRect(Gwk::Rect(rect.x, rect.y+1, 1, rect.h-1)); - // DrawFilledRect(Gwk::Rect(rect.x+rect.w, rect.y+1, 1, rect.h-1)); - - ALLEGRO_VERTEX vtx[4*2]; - ADD_LINE(0, fx+1.f,fy, fx+fw-1.f,fy ); // top - ADD_LINE(2, fx+fw,fy+1.f, fx+fw,fy+fh-1.f); // right - ADD_LINE(4, fx+fw-1.f,fy+fh, fx+1.f,fy+fh ); // bottom - ADD_LINE(6, fx,fy+fh-1.f, fx,fy+1.f ); // left - al_draw_prim(vtx, nullptr, nullptr, 0, 7, ALLEGRO_PRIM_LINE_LOOP); - } - else - { - // DrawPixel(rect.x+1, rect.y+1); - // DrawPixel(rect.x+rect.w-1, rect.y+1); - // DrawPixel(rect.x+1, rect.y+rect.h-1); - // DrawPixel(rect.x+rect.w-1, rect.y+rect.h-1); - // DrawFilledRect(Gwk::Rect(rect.x+2, rect.y, rect.w-3, 1)); - // DrawFilledRect(Gwk::Rect(rect.x+2, rect.y+rect.h, rect.w-3, 1)); - // DrawFilledRect(Gwk::Rect(rect.x, rect.y+2, 1, rect.h-3)); - // DrawFilledRect(Gwk::Rect(rect.x+rect.w, rect.y+2, 1, rect.h-3)); - - ALLEGRO_VERTEX vtx[4*2]; - ADD_LINE(0, fx+2.f,fy, fx+fw-2.f,fy ); // top - ADD_LINE(2, fx+fw,fy+2.f, fx+fw,fy+fh-2.f ); // right - ADD_LINE(4, fx+fw-2.f,fy+fh, fx+2.f,fy+fh ); // bottom - ADD_LINE(6, fx,fy+fh-2.f, fx,fy+2.f ); // left - al_draw_prim(vtx, nullptr, nullptr, 0, 7, ALLEGRO_PRIM_LINE_LOOP); - } - + const float fx = rect.x+0.5f, fy = rect.y+0.5f; + const float fw = rect.w, fh = rect.h; + + if (bSlight) + { + // DrawFilledRect(Gwk::Rect(rect.x+1, rect.y, rect.w-1, 1)); + // DrawFilledRect(Gwk::Rect(rect.x+1, rect.y+rect.h, rect.w-1, 1)); + // DrawFilledRect(Gwk::Rect(rect.x, rect.y+1, 1, rect.h-1)); + // DrawFilledRect(Gwk::Rect(rect.x+rect.w, rect.y+1, 1, rect.h-1)); + + ALLEGRO_VERTEX vtx[4*2]; + ADD_LINE(0, fx+1.f,fy, fx+fw-1.f,fy ); // top + ADD_LINE(2, fx+fw,fy+1.f, fx+fw,fy+fh-1.f); // right + ADD_LINE(4, fx+fw-1.f,fy+fh, fx+1.f,fy+fh ); // bottom + ADD_LINE(6, fx,fy+fh-1.f, fx,fy+1.f ); // left + al_draw_prim(vtx, nullptr, nullptr, 0, 7, ALLEGRO_PRIM_LINE_LOOP); + } + else + { + // DrawPixel(rect.x+1, rect.y+1); + // DrawPixel(rect.x+rect.w-1, rect.y+1); + // DrawPixel(rect.x+1, rect.y+rect.h-1); + // DrawPixel(rect.x+rect.w-1, rect.y+rect.h-1); + // DrawFilledRect(Gwk::Rect(rect.x+2, rect.y, rect.w-3, 1)); + // DrawFilledRect(Gwk::Rect(rect.x+2, rect.y+rect.h, rect.w-3, 1)); + // DrawFilledRect(Gwk::Rect(rect.x, rect.y+2, 1, rect.h-3)); + // DrawFilledRect(Gwk::Rect(rect.x+rect.w, rect.y+2, 1, rect.h-3)); + + ALLEGRO_VERTEX vtx[4*2]; + ADD_LINE(0, fx+2.f,fy, fx+fw-2.f,fy ); // top + ADD_LINE(2, fx+fw,fy+2.f, fx+fw,fy+fh-2.f ); // right + ADD_LINE(4, fx+fw-2.f,fy+fh, fx+2.f,fy+fh ); // bottom + ADD_LINE(6, fx,fy+fh-2.f, fx,fy+2.f ); // left + al_draw_prim(vtx, nullptr, nullptr, 0, 7, ALLEGRO_PRIM_LINE_LOOP); + } + #undef SET_VERT #undef ADD_LINE - } - - // Unfortunately I think we need to lock the target texture to use this. The default - // is that a rect of size (1,1) will be drawn. - // - // void Allegro::DrawPixel(int x, int y) - // { - // al_put_pixel(x+0.5f, y+0.5f, m_color); - // } - - bool Allegro::BeginContext(Gwk::WindowProvider* window) - { - al_clear_to_color(al_map_rgba_f(0.f, 0.f, 0.f, 0.f)); - return true; - } - - bool Allegro::EndContext(Gwk::WindowProvider* window) - { - return true; - } - - bool Allegro::PresentContext(Gwk::WindowProvider* window) - { - al_flip_display(); - return true; - } - - ICacheToTexture* Allegro::GetCTT() - { - return m_ctt; - } +} - - } // Renderer +// Unfortunately I think we need to lock the target texture to use this. The default +// is that a rect of size (1,1) will be drawn. +// +// void Allegro::DrawPixel(int x, int y) +// { +// al_put_pixel(x+0.5f, y+0.5f, m_color); +// } + +bool Allegro::BeginContext(Gwk::WindowProvider* window) +{ + al_clear_to_color(al_map_rgba_f(0.f, 0.f, 0.f, 0.f)); + return true; +} + +bool Allegro::EndContext(Gwk::WindowProvider* window) +{ + return true; +} + +bool Allegro::PresentContext(Gwk::WindowProvider* window) +{ + al_flip_display(); + return true; +} + +ICacheToTexture* Allegro::GetCTT() +{ + return m_ctt; +} + + +} // Renderer } // Gwork diff --git a/source/platform/renderers/Direct2D/Direct2D.cpp b/source/platform/renderers/Direct2D/Direct2D.cpp index 5a34af0c..9537333d 100644 --- a/source/platform/renderers/Direct2D/Direct2D.cpp +++ b/source/platform/renderers/Direct2D/Direct2D.cpp @@ -26,490 +26,490 @@ struct TextureData namespace Gwk { - namespace Renderer +namespace Renderer +{ +// self-hosting constructor +Direct2D::Direct2D() : m_color(D2D1::ColorF::White) +{ + m_rT = nullptr; + m_dWriteFactory = nullptr; + m_wICFactory = nullptr; +} + +Direct2D::Direct2D(ID2D1RenderTarget* rT, IDWriteFactory* dWriteFactory, + IWICImagingFactory* wICFactory) : m_color(D2D1::ColorF::White) +{ + DeviceAcquired(rT); + m_dWriteFactory = dWriteFactory; + m_wICFactory = wICFactory; +} + +Direct2D::~Direct2D() +{ +} + +void Direct2D::Begin() +{ +} + +void Direct2D::End() +{ +} + +void Direct2D::DrawFilledRect(Gwk::Rect rect) +{ + Translate(rect); + + if (m_solidColorBrush) { - // self-hosting constructor - Direct2D::Direct2D() : m_color(D2D1::ColorF::White) - { - m_rT = nullptr; - m_dWriteFactory = nullptr; - m_wICFactory = nullptr; - } + m_rT->FillRectangle(D2D1::RectF(rect.x, rect.y, rect.x+rect.w, + rect.y+rect.h), m_solidColorBrush); + } +} - Direct2D::Direct2D(ID2D1RenderTarget* rT, IDWriteFactory* dWriteFactory, - IWICImagingFactory* wICFactory) : m_color(D2D1::ColorF::White) - { - DeviceAcquired(rT); - m_dWriteFactory = dWriteFactory; - m_wICFactory = wICFactory; - } +void Direct2D::SetDrawColor(Gwk::Color color) +{ + m_color = D2D1::ColorF(color.r/255.0f, color.g/255.0f, color.b/255.0f, color.a/255.0f); + m_solidColorBrush->SetColor(m_color); +} - Direct2D::~Direct2D() - { - } +bool Direct2D::InternalLoadFont(Gwk::Font* font) +{ + IDWriteTextFormat* textFormat = nullptr; + HRESULT hr = m_dWriteFactory->CreateTextFormat( + font->facename.c_str(), + nullptr, + font->bold ? DWRITE_FONT_WEIGHT_BOLD : DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, + font->size, + L"", + &textFormat + ); + + if (SUCCEEDED(hr)) + { + FontData* fontData = new FontData(); + fontData->textFormat = textFormat; + font->data = fontData; + font->realsize = font->size*Scale(); + return true; + } - void Direct2D::Begin() - { - } + return false; +} - void Direct2D::End() - { - } +void Direct2D::LoadFont(Gwk::Font* font) +{ + if (InternalLoadFont(font)) + m_fontList.push_back(font); +} - void Direct2D::DrawFilledRect(Gwk::Rect rect) - { - Translate(rect); +void Direct2D::InternalFreeFont(Gwk::Font* font, bool bRemove) +{ + if (bRemove) + m_fontList.remove(font); - if (m_solidColorBrush) - { - m_rT->FillRectangle(D2D1::RectF(rect.x, rect.y, rect.x+rect.w, - rect.y+rect.h), m_solidColorBrush); - } - } + if (!font->data) + return; - void Direct2D::SetDrawColor(Gwk::Color color) - { - m_color = D2D1::ColorF(color.r/255.0f, color.g/255.0f, color.b/255.0f, color.a/255.0f); - m_solidColorBrush->SetColor(m_color); - } + FontData* fontData = (FontData*)font->data; + fontData->textFormat->Release(); + delete fontData; + font->data = nullptr; +} - bool Direct2D::InternalLoadFont(Gwk::Font* font) - { - IDWriteTextFormat* textFormat = nullptr; - HRESULT hr = m_dWriteFactory->CreateTextFormat( - font->facename.c_str(), - nullptr, - font->bold ? DWRITE_FONT_WEIGHT_BOLD : DWRITE_FONT_WEIGHT_NORMAL, - DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, - font->size, - L"", - &textFormat - ); - - if (SUCCEEDED(hr)) - { - FontData* fontData = new FontData(); - fontData->textFormat = textFormat; - font->data = fontData; - font->realsize = font->size*Scale(); - return true; - } - - return false; - } +void Direct2D::FreeFont(Gwk::Font* font) +{ + InternalFreeFont(font); +} - void Direct2D::LoadFont(Gwk::Font* font) - { - if (InternalLoadFont(font)) - m_fontList.push_back(font); - } +void Direct2D::RenderText(Gwk::Font* font, Gwk::Point pos, + const Gwk::UnicodeString& text) +{ + // If the font doesn't exist, or the font size should be changed + if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) + { + InternalFreeFont(font, false); + InternalLoadFont(font); + } - void Direct2D::InternalFreeFont(Gwk::Font* font, bool bRemove) - { - if (bRemove) - m_fontList.remove(font); + FontData* fontData = (FontData*)font->data; + Translate(pos.x, pos.y); - if (!font->data) - return; + if (m_solidColorBrush) + { + m_rT->DrawTextW(text.c_str(), text.length(), fontData->textFormat, + D2D1::RectF(pos.x, pos.y, pos.x+50000, + pos.y+50000), m_solidColorBrush); + } +} - FontData* fontData = (FontData*)font->data; - fontData->textFormat->Release(); - delete fontData; - font->data = nullptr; - } +Gwk::Point Direct2D::MeasureText(Gwk::Font* font, const Gwk::UnicodeString& text) +{ + // If the font doesn't exist, or the font size should be changed + if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) + { + InternalFreeFont(font, false); + InternalLoadFont(font); + } - void Direct2D::FreeFont(Gwk::Font* font) - { - InternalFreeFont(font); - } + FontData* fontData = (FontData*)font->data; + Gwk::Point size; + IDWriteTextLayout* layout; + DWRITE_TEXT_METRICS metrics; + m_dWriteFactory->CreateTextLayout(text.c_str(), + text.length(), fontData->textFormat, 50000, 50000, + &layout); + layout->GetMetrics(&metrics); + layout->Release(); + return Gwk::Point(metrics.widthIncludingTrailingWhitespace, metrics.height); +} - void Direct2D::RenderText(Gwk::Font* font, Gwk::Point pos, - const Gwk::UnicodeString& text) - { - // If the font doesn't exist, or the font size should be changed - if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) - { - InternalFreeFont(font, false); - InternalLoadFont(font); - } - - FontData* fontData = (FontData*)font->data; - Translate(pos.x, pos.y); - - if (m_solidColorBrush) - { - m_rT->DrawTextW(text.c_str(), text.length(), fontData->textFormat, - D2D1::RectF(pos.x, pos.y, pos.x+50000, - pos.y+50000), m_solidColorBrush); - } - } +void Direct2D::DeviceLost() +{ + if (m_solidColorBrush != nullptr) + { + m_solidColorBrush->Release(); + m_solidColorBrush = nullptr; + } - Gwk::Point Direct2D::MeasureText(Gwk::Font* font, const Gwk::UnicodeString& text) - { - // If the font doesn't exist, or the font size should be changed - if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) - { - InternalFreeFont(font, false); - InternalLoadFont(font); - } - - FontData* fontData = (FontData*)font->data; - Gwk::Point size; - IDWriteTextLayout* layout; - DWRITE_TEXT_METRICS metrics; - m_dWriteFactory->CreateTextLayout(text.c_str(), - text.length(), fontData->textFormat, 50000, 50000, - &layout); - layout->GetMetrics(&metrics); - layout->Release(); - return Gwk::Point(metrics.widthIncludingTrailingWhitespace, metrics.height); - } + for (Texture::List::const_iterator tex_it = m_textureList.begin(); + tex_it != m_textureList.end(); + ++tex_it) + { + InternalFreeTexture(*tex_it, false); + } +} - void Direct2D::DeviceLost() - { - if (m_solidColorBrush != nullptr) - { - m_solidColorBrush->Release(); - m_solidColorBrush = nullptr; - } - - for (Texture::List::const_iterator tex_it = m_textureList.begin(); - tex_it != m_textureList.end(); - ++tex_it) - { - InternalFreeTexture(*tex_it, false); - } - } +void Direct2D::DeviceAcquired(ID2D1RenderTarget* rT) +{ + m_rT = rT; + HRESULT hr = m_rT->CreateSolidColorBrush(m_color, &m_solidColorBrush); - void Direct2D::DeviceAcquired(ID2D1RenderTarget* rT) - { - m_rT = rT; - HRESULT hr = m_rT->CreateSolidColorBrush(m_color, &m_solidColorBrush); - - for (Texture::List::const_iterator tex_it = m_textureList.begin(); - tex_it != m_textureList.end(); - ++tex_it) - { - InternalLoadTexture(*tex_it); - } - } + for (Texture::List::const_iterator tex_it = m_textureList.begin(); + tex_it != m_textureList.end(); + ++tex_it) + { + InternalLoadTexture(*tex_it); + } +} - void Direct2D::StartClip() - { - Gwk::Rect rect = ClipRegion(); - D2D1_RECT_F r = - D2D1::RectF(rect.x*Scale(), rect.y*Scale(), - (rect.x+rect.w)*Scale(), (rect.y+rect.h)*Scale()); - m_rT->PushAxisAlignedClip(r, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); - } +void Direct2D::StartClip() +{ + Gwk::Rect rect = ClipRegion(); + D2D1_RECT_F r = + D2D1::RectF(rect.x*Scale(), rect.y*Scale(), + (rect.x+rect.w)*Scale(), (rect.y+rect.h)*Scale()); + m_rT->PushAxisAlignedClip(r, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); +} - void Direct2D::EndClip() - { - m_rT->PopAxisAlignedClip(); - } +void Direct2D::EndClip() +{ + m_rT->PopAxisAlignedClip(); +} - void Direct2D::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, float u1, - float v1, float u2, float v2) - { - TextureData* texData = (TextureData*)texture->data; - - // Missing image, not loaded properly? - if (!texData || texData->bitmap == nullptr) - return DrawMissingImage(rect); - - Translate(rect); - m_rT->DrawBitmap(texData->bitmap, - D2D1::RectF(rect.x, rect.y, rect.x+rect.w, rect.y+rect.h), - 1.0f, D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, - D2D1::RectF(u1*texture->width, v1*texture->height, u2* - texture->width, v2*texture->height) - ); - } +void Direct2D::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, float u1, + float v1, float u2, float v2) +{ + TextureData* texData = (TextureData*)texture->data; + + // Missing image, not loaded properly? + if (!texData || texData->bitmap == nullptr) + return DrawMissingImage(rect); + + Translate(rect); + m_rT->DrawBitmap(texData->bitmap, + D2D1::RectF(rect.x, rect.y, rect.x+rect.w, rect.y+rect.h), + 1.0f, D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, + D2D1::RectF(u1*texture->width, v1*texture->height, u2* + texture->width, v2*texture->height) + ); +} - bool Direct2D::InternalLoadTexture(Gwk::Texture* texture) - { - IWICBitmapDecoder* decoder = nullptr; - IWICBitmapFrameDecode* source = nullptr; - IWICFormatConverter* converter = nullptr; - ID2D1Bitmap* d2DBitmap = nullptr; - HRESULT hr = m_wICFactory->CreateDecoderFromFilename( - texture->name.GetUnicode().c_str(), - nullptr, - GENERIC_READ, - WICDecodeMetadataCacheOnLoad, - &decoder - ); - - if (SUCCEEDED(hr)) - hr = decoder->GetFrame(0, &source); - - if (SUCCEEDED(hr)) - { - // Convert the image format to 32bppPBGRA - // (DXGI_FORMAT_B8G8R8A8_UNORM + D2D1_ALPHA_MODE_PREMULTIPLIED). - hr = m_wICFactory->CreateFormatConverter(&converter); - } - - if (SUCCEEDED(hr)) - { - hr = converter->Initialize( - source, - GUID_WICPixelFormat32bppPBGRA, - WICBitmapDitherTypeNone, - nullptr, - 0.f, - WICBitmapPaletteTypeMedianCut - ); - } - - if (SUCCEEDED(hr)) - { - hr = m_rT->CreateBitmapFromWicBitmap( - converter, - nullptr, - &d2DBitmap - ); - } - - if (SUCCEEDED(hr)) - { - TextureData* texdata = new TextureData(); - texdata->wICBitmap = source; - texdata->bitmap = d2DBitmap; - texture->data = texdata; - D2D1_SIZE_F size = texdata->bitmap->GetSize(); - texture->width = size.width; - texture->height = size.height; - texture->failed = false; - } - else - { - texture->failed = true; - } - - if (decoder != nullptr) - decoder->Release(); - - if (converter != nullptr) - converter->Release(); - - return SUCCEEDED(hr); - } +bool Direct2D::InternalLoadTexture(Gwk::Texture* texture) +{ + IWICBitmapDecoder* decoder = nullptr; + IWICBitmapFrameDecode* source = nullptr; + IWICFormatConverter* converter = nullptr; + ID2D1Bitmap* d2DBitmap = nullptr; + HRESULT hr = m_wICFactory->CreateDecoderFromFilename( + texture->name.GetUnicode().c_str(), + nullptr, + GENERIC_READ, + WICDecodeMetadataCacheOnLoad, + &decoder + ); + + if (SUCCEEDED(hr)) + hr = decoder->GetFrame(0, &source); + + if (SUCCEEDED(hr)) + { + // Convert the image format to 32bppPBGRA + // (DXGI_FORMAT_B8G8R8A8_UNORM + D2D1_ALPHA_MODE_PREMULTIPLIED). + hr = m_wICFactory->CreateFormatConverter(&converter); + } - void Direct2D::LoadTexture(Gwk::Texture* texture) - { - if (InternalLoadTexture(texture)) - m_textureList.push_back(texture); - } + if (SUCCEEDED(hr)) + { + hr = converter->Initialize( + source, + GUID_WICPixelFormat32bppPBGRA, + WICBitmapDitherTypeNone, + nullptr, + 0.f, + WICBitmapPaletteTypeMedianCut + ); + } - void Direct2D::InternalFreeTexture(Gwk::Texture* texture, bool bRemove) - { - if (bRemove) - m_textureList.remove(texture); + if (SUCCEEDED(hr)) + { + hr = m_rT->CreateBitmapFromWicBitmap( + converter, + nullptr, + &d2DBitmap + ); + } - if (texture->data != nullptr) - { - TextureData* texdata = (TextureData*)texture->data; + if (SUCCEEDED(hr)) + { + TextureData* texdata = new TextureData(); + texdata->wICBitmap = source; + texdata->bitmap = d2DBitmap; + texture->data = texdata; + D2D1_SIZE_F size = texdata->bitmap->GetSize(); + texture->width = size.width; + texture->height = size.height; + texture->failed = false; + } + else + { + texture->failed = true; + } - if (texdata->wICBitmap != nullptr) - texdata->wICBitmap->Release(); + if (decoder != nullptr) + decoder->Release(); - if (texdata->bitmap != nullptr) - texdata->bitmap->Release(); + if (converter != nullptr) + converter->Release(); - delete texdata; - } + return SUCCEEDED(hr); +} - texture->data = nullptr; - } +void Direct2D::LoadTexture(Gwk::Texture* texture) +{ + if (InternalLoadTexture(texture)) + m_textureList.push_back(texture); +} - void Direct2D::FreeTexture(Gwk::Texture* texture) - { - InternalFreeTexture(texture); - } +void Direct2D::InternalFreeTexture(Gwk::Texture* texture, bool bRemove) +{ + if (bRemove) + m_textureList.remove(texture); - Gwk::Color Direct2D::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, - const Gwk::Color& col_default) - { - TextureData* texData = (TextureData*)texture->data; - - if (!texData || texData->bitmap == nullptr) - return col_default; - - WICRect sourceRect; - sourceRect.X = x; - sourceRect.Y = y; - sourceRect.Width = sourceRect.Height = 1; - // these bitmaps are always in GUID_WICPixelFormat32bppPBGRA - byte pixelBuffer[4*1*1]; - texData->wICBitmap->CopyPixels(&sourceRect, 4, 4*texture->width*texture->height, - pixelBuffer); - return Gwk::Color(pixelBuffer[2], pixelBuffer[1], pixelBuffer[0], pixelBuffer[3]); - } + if (texture->data != nullptr) + { + TextureData* texdata = (TextureData*)texture->data; - void Direct2D::DrawLinedRect(Gwk::Rect rect) - { - Translate(rect); + if (texdata->wICBitmap != nullptr) + texdata->wICBitmap->Release(); - if (m_solidColorBrush) - { - m_rT->DrawRectangle(D2D1::RectF(rect.x, rect.y, rect.x+rect.w, - rect.y+rect.h), m_solidColorBrush); - } - } + if (texdata->bitmap != nullptr) + texdata->bitmap->Release(); - void Direct2D::DrawShavedCornerRect(Gwk::Rect rect, bool bSlight) - { - Translate(rect); - - if (m_solidColorBrush) - { - m_rT->DrawRoundedRectangle(D2D1::RoundedRect(D2D1::RectF(rect.x, rect.y, rect.x+ - rect.w, - rect.y+rect.h), 10.f, - 10.f), m_solidColorBrush); - } - } + delete texdata; + } - void Direct2D::Release() - { - Texture::List::iterator tex_it = m_textureList.begin(); + texture->data = nullptr; +} - while (tex_it != m_textureList.end()) - { - FreeTexture(*tex_it); - tex_it = m_textureList.begin(); - } +void Direct2D::FreeTexture(Gwk::Texture* texture) +{ + InternalFreeTexture(texture); +} - Font::List::iterator it = m_fontList.begin(); +Gwk::Color Direct2D::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, + const Gwk::Color& col_default) +{ + TextureData* texData = (TextureData*)texture->data; + + if (!texData || texData->bitmap == nullptr) + return col_default; + + WICRect sourceRect; + sourceRect.X = x; + sourceRect.Y = y; + sourceRect.Width = sourceRect.Height = 1; + // these bitmaps are always in GUID_WICPixelFormat32bppPBGRA + byte pixelBuffer[4*1*1]; + texData->wICBitmap->CopyPixels(&sourceRect, 4, 4*texture->width*texture->height, + pixelBuffer); + return Gwk::Color(pixelBuffer[2], pixelBuffer[1], pixelBuffer[0], pixelBuffer[3]); +} - while (it != m_fontList.end()) - { - FreeFont(*it); - it = m_fontList.begin(); - } - } +void Direct2D::DrawLinedRect(Gwk::Rect rect) +{ + Translate(rect); - bool Direct2D::InternalCreateDeviceResources() - { - HRESULT hr = S_OK; - - if (!m_rT) - { - RECT rc; - GetClientRect(m_hWND, &rc); - D2D1_SIZE_U size = D2D1::SizeU( - rc.right-rc.left, - rc.bottom-rc.top - ); - ID2D1HwndRenderTarget* rT; - // Create a Direct2D render target. - hr = m_d2DFactory->CreateHwndRenderTarget( - D2D1::RenderTargetProperties(), - D2D1::HwndRenderTargetProperties(m_hWND, size), - &rT - ); - - if (SUCCEEDED(hr)) - { - rT->SetTextAntialiasMode(D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE); - DeviceAcquired(rT); - } - } - - return SUCCEEDED(hr); - } + if (m_solidColorBrush) + { + m_rT->DrawRectangle(D2D1::RectF(rect.x, rect.y, rect.x+rect.w, + rect.y+rect.h), m_solidColorBrush); + } +} - void Direct2D::InternalReleaseDeviceResources() - { - if (m_rT != nullptr) - { - m_rT->Release(); - m_rT = nullptr; - } +void Direct2D::DrawShavedCornerRect(Gwk::Rect rect, bool bSlight) +{ + Translate(rect); + + if (m_solidColorBrush) + { + m_rT->DrawRoundedRectangle(D2D1::RoundedRect(D2D1::RectF(rect.x, rect.y, rect.x+ + rect.w, + rect.y+rect.h), 10.f, + 10.f), m_solidColorBrush); + } +} + +void Direct2D::Release() +{ + Texture::List::iterator tex_it = m_textureList.begin(); + + while (tex_it != m_textureList.end()) + { + FreeTexture(*tex_it); + tex_it = m_textureList.begin(); + } + + Font::List::iterator it = m_fontList.begin(); + + while (it != m_fontList.end()) + { + FreeFont(*it); + it = m_fontList.begin(); + } +} + +bool Direct2D::InternalCreateDeviceResources() +{ + HRESULT hr = S_OK; + + if (!m_rT) + { + RECT rc; + GetClientRect(m_hWND, &rc); + D2D1_SIZE_U size = D2D1::SizeU( + rc.right-rc.left, + rc.bottom-rc.top + ); + ID2D1HwndRenderTarget* rT; + // Create a Direct2D render target. + hr = m_d2DFactory->CreateHwndRenderTarget( + D2D1::RenderTargetProperties(), + D2D1::HwndRenderTargetProperties(m_hWND, size), + &rT + ); + + if (SUCCEEDED(hr)) + { + rT->SetTextAntialiasMode(D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE); + DeviceAcquired(rT); } + } - bool Direct2D::InitializeContext(Gwk::WindowProvider* window) - { - m_hWND = (HWND)window->GetWindow(); - HRESULT hr = D2D1CreateFactory( - D2D1_FACTORY_TYPE_SINGLE_THREADED, - &m_d2DFactory - ); + return SUCCEEDED(hr); +} - if (FAILED(hr)) - return false; +void Direct2D::InternalReleaseDeviceResources() +{ + if (m_rT != nullptr) + { + m_rT->Release(); + m_rT = nullptr; + } +} - hr = DWriteCreateFactory( - DWRITE_FACTORY_TYPE_SHARED, - __uuidof(IDWriteFactory), - reinterpret_cast(&m_dWriteFactory) - ); +bool Direct2D::InitializeContext(Gwk::WindowProvider* window) +{ + m_hWND = (HWND)window->GetWindow(); + HRESULT hr = D2D1CreateFactory( + D2D1_FACTORY_TYPE_SINGLE_THREADED, + &m_d2DFactory + ); - if (FAILED(hr)) - return false; + if (FAILED(hr)) + return false; - hr = CoInitialize(nullptr); + hr = DWriteCreateFactory( + DWRITE_FACTORY_TYPE_SHARED, + __uuidof(IDWriteFactory), + reinterpret_cast(&m_dWriteFactory) + ); - if (FAILED(hr)) - return false; + if (FAILED(hr)) + return false; - hr = CoCreateInstance( - CLSID_WICImagingFactory, - nullptr, - CLSCTX_INPROC_SERVER, - IID_IWICImagingFactory, - reinterpret_cast(&m_wICFactory) - ); + hr = CoInitialize(nullptr); - if (FAILED(hr)) - return false; + if (FAILED(hr)) + return false; - return InternalCreateDeviceResources(); - } + hr = CoCreateInstance( + CLSID_WICImagingFactory, + nullptr, + CLSCTX_INPROC_SERVER, + IID_IWICImagingFactory, + reinterpret_cast(&m_wICFactory) + ); - bool Direct2D::ShutdownContext(Gwk::WindowProvider* window) - { - InternalReleaseDeviceResources(); - DeviceLost(); - return true; - } + if (FAILED(hr)) + return false; - bool Direct2D::PresentContext(Gwk::WindowProvider* window) - { - return true; - } + return InternalCreateDeviceResources(); +} - bool Direct2D::ResizedContext(Gwk::WindowProvider* window, int w, int h) - { - HRESULT hr = ((ID2D1HwndRenderTarget*)m_rT)->Resize(D2D1::SizeU(w, h)); - return SUCCEEDED(hr); - } +bool Direct2D::ShutdownContext(Gwk::WindowProvider* window) +{ + InternalReleaseDeviceResources(); + DeviceLost(); + return true; +} - bool Direct2D::BeginContext(Gwk::WindowProvider* window) - { - if (SUCCEEDED(InternalCreateDeviceResources())) - { - m_rT->BeginDraw(); - return true; - } +bool Direct2D::PresentContext(Gwk::WindowProvider* window) +{ + return true; +} - return false; - } +bool Direct2D::ResizedContext(Gwk::WindowProvider* window, int w, int h) +{ + HRESULT hr = ((ID2D1HwndRenderTarget*)m_rT)->Resize(D2D1::SizeU(w, h)); + return SUCCEEDED(hr); +} - bool Direct2D::EndContext(Gwk::WindowProvider* window) - { - HRESULT hr = m_rT->EndDraw(); +bool Direct2D::BeginContext(Gwk::WindowProvider* window) +{ + if (SUCCEEDED(InternalCreateDeviceResources())) + { + m_rT->BeginDraw(); + return true; + } - if (hr == D2DERR_RECREATE_TARGET) - { - InternalReleaseDeviceResources(); - DeviceLost(); - } + return false; +} - return SUCCEEDED(hr); - } +bool Direct2D::EndContext(Gwk::WindowProvider* window) +{ + HRESULT hr = m_rT->EndDraw(); + if (hr == D2DERR_RECREATE_TARGET) + { + InternalReleaseDeviceResources(); + DeviceLost(); } + + return SUCCEEDED(hr); +} + +} } diff --git a/source/platform/renderers/DirectX9/DirectX9.cpp b/source/platform/renderers/DirectX9/DirectX9.cpp index e57715d5..84a14905 100644 --- a/source/platform/renderers/DirectX9/DirectX9.cpp +++ b/source/platform/renderers/DirectX9/DirectX9.cpp @@ -16,430 +16,430 @@ struct FontData namespace Gwk { - namespace Renderer +namespace Renderer +{ +DirectX9::DirectX9(IDirect3DDevice9* device) +{ + m_D3D = nullptr; + m_device = device; + m_vertNum = 0; + + for (int i = 0; i < MaxVerts; i++) + { + m_verts[ i ].z = 0.5f; + m_verts[ i ].rhw = 1.0f; + } +} + +DirectX9::~DirectX9() +{ +} + +void DirectX9::Begin() +{ + m_device->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE); + m_device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); + m_device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); + m_device->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR); + m_device->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR); + m_device->SetSamplerState(0, D3DSAMP_MIPFILTER, D3DTEXF_NONE); + m_device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); + m_device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); + m_device->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_MODULATE); + m_device->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + m_device->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_CURRENT); + m_device->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE); + m_device->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); + m_device->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_CURRENT); + m_device->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_DISABLE); + m_device->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_DISABLE); +} + +void DirectX9::End() +{ + Flush(); +} + +void DirectX9::Flush() +{ + if (m_vertNum > 0) + { + m_device->SetFVF(D3DFVF_VERTEXFORMAT2D); + m_device->DrawPrimitiveUP(D3DPT_TRIANGLELIST, m_vertNum/3, &m_verts[0], + sizeof(VertexFormat)); + m_vertNum = 0; + } +} + +void DirectX9::AddVert(int x, int y) +{ + if (m_vertNum >= MaxVerts-1) + Flush(); + + m_verts[ m_vertNum ].x = (float)x; + m_verts[ m_vertNum ].y = (float)y; + m_verts[ m_vertNum ].color = m_color; + m_vertNum++; +} + +void DirectX9::AddVert(int x, int y, float u, float v) +{ + if (m_vertNum >= MaxVerts-1) + Flush(); + + m_verts[ m_vertNum ].x = -0.5f+(float)x; + m_verts[ m_vertNum ].y = -0.5f+(float)y; + m_verts[ m_vertNum ].u = u; + m_verts[ m_vertNum ].v = v; + m_verts[ m_vertNum ].color = m_color; + m_vertNum++; +} + +void DirectX9::DrawFilledRect(Gwk::Rect rect) +{ + if (m_currentTexture != nullptr) { - DirectX9::DirectX9(IDirect3DDevice9* device) - { - m_D3D = nullptr; - m_device = device; - m_vertNum = 0; - - for (int i = 0; i < MaxVerts; i++) - { - m_verts[ i ].z = 0.5f; - m_verts[ i ].rhw = 1.0f; - } - } - - DirectX9::~DirectX9() - { - } - - void DirectX9::Begin() - { - m_device->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE); - m_device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); - m_device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); - m_device->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR); - m_device->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR); - m_device->SetSamplerState(0, D3DSAMP_MIPFILTER, D3DTEXF_NONE); - m_device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); - m_device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); - m_device->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_MODULATE); - m_device->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE); - m_device->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_CURRENT); - m_device->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE); - m_device->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); - m_device->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_CURRENT); - m_device->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_DISABLE); - m_device->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_DISABLE); - } - - void DirectX9::End() - { - Flush(); - } - - void DirectX9::Flush() - { - if (m_vertNum > 0) - { - m_device->SetFVF(D3DFVF_VERTEXFORMAT2D); - m_device->DrawPrimitiveUP(D3DPT_TRIANGLELIST, m_vertNum/3, &m_verts[0], - sizeof(VertexFormat)); - m_vertNum = 0; - } - } - - void DirectX9::AddVert(int x, int y) - { - if (m_vertNum >= MaxVerts-1) - Flush(); - - m_verts[ m_vertNum ].x = (float)x; - m_verts[ m_vertNum ].y = (float)y; - m_verts[ m_vertNum ].color = m_color; - m_vertNum++; - } - - void DirectX9::AddVert(int x, int y, float u, float v) - { - if (m_vertNum >= MaxVerts-1) - Flush(); - - m_verts[ m_vertNum ].x = -0.5f+(float)x; - m_verts[ m_vertNum ].y = -0.5f+(float)y; - m_verts[ m_vertNum ].u = u; - m_verts[ m_vertNum ].v = v; - m_verts[ m_vertNum ].color = m_color; - m_vertNum++; - } - - void DirectX9::DrawFilledRect(Gwk::Rect rect) - { - if (m_currentTexture != nullptr) - { - Flush(); - m_device->SetTexture(0, nullptr); - m_currentTexture = nullptr; - } - - Translate(rect); - AddVert(rect.x, rect.y); - AddVert(rect.x+rect.w, rect.y); - AddVert(rect.x, rect.y+rect.h); - AddVert(rect.x+rect.w, rect.y); - AddVert(rect.x+rect.w, rect.y+rect.h); - AddVert(rect.x, rect.y+rect.h); - } - - void DirectX9::SetDrawColor(Gwk::Color color) - { - m_color = D3DCOLOR_ARGB(color.a, color.r, color.g, color.b); - } - - void DirectX9::LoadFont(Gwk::Font* font) - { - m_fontList.push_back(font); - // Scale the font according to canvas - font->realsize = font->size*Scale(); - D3DXFONT_DESC fd; - memset(&fd, 0, sizeof(fd)); - const std::wstring wfontname( Utility::Widen(font->facename) ); - wcscpy_s(fd.FaceName, LF_FACESIZE, wfontname.c_str()); - fd.Width = 0; - fd.MipLevels = 1; - fd.CharSet = DEFAULT_CHARSET; - fd.Height = font->realsize* -1.0f; - fd.OutputPrecision = OUT_DEFAULT_PRECIS; - fd.Italic = 0; - fd.Weight = font->bold ? FW_BOLD : FW_NORMAL; + Flush(); + m_device->SetTexture(0, nullptr); + m_currentTexture = nullptr; + } + + Translate(rect); + AddVert(rect.x, rect.y); + AddVert(rect.x+rect.w, rect.y); + AddVert(rect.x, rect.y+rect.h); + AddVert(rect.x+rect.w, rect.y); + AddVert(rect.x+rect.w, rect.y+rect.h); + AddVert(rect.x, rect.y+rect.h); +} + +void DirectX9::SetDrawColor(Gwk::Color color) +{ + m_color = D3DCOLOR_ARGB(color.a, color.r, color.g, color.b); +} + +void DirectX9::LoadFont(Gwk::Font* font) +{ + m_fontList.push_back(font); + // Scale the font according to canvas + font->realsize = font->size*Scale(); + D3DXFONT_DESC fd; + memset(&fd, 0, sizeof(fd)); + const std::wstring wfontname( Utility::Widen(font->facename) ); + wcscpy_s(fd.FaceName, LF_FACESIZE, wfontname.c_str()); + fd.Width = 0; + fd.MipLevels = 1; + fd.CharSet = DEFAULT_CHARSET; + fd.Height = font->realsize* -1.0f; + fd.OutputPrecision = OUT_DEFAULT_PRECIS; + fd.Italic = 0; + fd.Weight = font->bold ? FW_BOLD : FW_NORMAL; #ifdef CLEARTYPE_QUALITY - fd.Quality = font->realsize < 14 ? DEFAULT_QUALITY : CLEARTYPE_QUALITY; + fd.Quality = font->realsize < 14 ? DEFAULT_QUALITY : CLEARTYPE_QUALITY; #else - fd.Quality = PROOF_QUALITY; + fd.Quality = PROOF_QUALITY; #endif - fd.PitchAndFamily = DEFAULT_PITCH|FF_DONTCARE; - LPD3DXFONT d3DXFont; - HRESULT hr = D3DXCreateFontIndirect(m_device, &fd, &d3DXFont); - FontData* fontData = new FontData(); - fontData->font = d3DXFont; - // ID3DXFont doesn't measure trailing spaces, so we measure the - // width of a space here and store it - // in the font data - then we can add it to the width when we - // measure text with trailing spaces. - { - RECT rctA = {0, 0, 0, 0}; - fontData->font->DrawTextW(nullptr, L"A", -1, &rctA, - DT_CALCRECT|DT_LEFT|DT_TOP|DT_SINGLELINE, 0); - RECT rctSpc = {0, 0, 0, 0}; - fontData->font->DrawTextW(nullptr, L"A A", -1, &rctSpc, - DT_CALCRECT|DT_LEFT|DT_TOP|DT_SINGLELINE, 0); - fontData->iSpaceWidth = rctSpc.right-rctA.right*2; - } - font->data = fontData; - } - - void DirectX9::FreeFont(Gwk::Font* font) - { - m_fontList.remove(font); - - if (!font->data) - return; - - FontData* fontData = (FontData*)font->data; - - if (fontData->font) - { - fontData->font->Release(); - fontData->font = nullptr; - } - - delete fontData; - font->data = nullptr; - } - - void DirectX9::RenderText(Gwk::Font* font, Gwk::Point pos, - const Gwk::String& text) - { - Flush(); - - // If the font doesn't exist, or the font size should be changed - if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) - { - FreeFont(font); - LoadFont(font); - } - - const std::wstring wideText(Utility::Widen(text)); - - FontData* fontData = (FontData*)font->data; - Translate(pos.x, pos.y); - RECT ClipRect = { pos.x, pos.y, 0, 0 }; - fontData->font->DrawTextW(nullptr, - wideText.c_str(), -1, &ClipRect, DT_LEFT|DT_TOP|DT_NOCLIP|DT_SINGLELINE, - m_color); - } - - Gwk::Point DirectX9::MeasureText(Gwk::Font* font, const Gwk::String& text) - { - // If the font doesn't exist, or the font size should be changed - if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) - { - FreeFont(font); - LoadFont(font); - } - - FontData* fontData = (FontData*)font->data; - Gwk::Point size; - - if (text.empty()) - { - RECT rct = {0, 0, 0, 0}; - fontData->font->DrawTextW(nullptr, L"W", -1, &rct, DT_CALCRECT, 0); - return Gwk::Point(0, rct.bottom); - } - - const std::wstring wideText(Utility::Widen(text)); - - RECT rct = {0, 0, 0, 0}; - fontData->font->DrawTextW(nullptr, - wideText.c_str(), -1, &rct, DT_CALCRECT|DT_LEFT|DT_TOP|DT_SINGLELINE, - 0); - - for (int i = wideText.length()-1; i >= 0 && wideText[i] == L' '; i--) - { - rct.right += fontData->iSpaceWidth; - } - - return Gwk::Point(rct.right/Scale(), rct.bottom/Scale()); - } - - void DirectX9::StartClip() - { - Flush(); - m_device->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE); - const Gwk::Rect& rect = ClipRegion(); - RECT r; - r.left = ceil(((float)rect.x)*Scale()); - r.right = ceil(((float)(rect.x+rect.w))*Scale()); - r.top = ceil((float)rect.y*Scale()); - r.bottom = ceil(((float)(rect.y+rect.h))*Scale()); - m_device->SetScissorRect(&r); - } - - void DirectX9::EndClip() - { - Flush(); - m_device->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE); - } - - void DirectX9::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, float u1, - float v1, float u2, float v2) - { - IDirect3DTexture9* image = (IDirect3DTexture9*)texture->data; - - // Missing image, not loaded properly? - if (!image) - return DrawMissingImage(rect); - - Translate(rect); - - if (m_currentTexture != image) - { - Flush(); - m_device->SetTexture(0, image); - m_currentTexture = image; - } - - AddVert(rect.x, rect.y, u1, v1); - AddVert(rect.x+rect.w, rect.y, u2, v1); - AddVert(rect.x, rect.y+rect.h, u1, v2); - AddVert(rect.x+rect.w, rect.y, u2, v1); - AddVert(rect.x+rect.w, rect.y+rect.h, u2, v2); - AddVert(rect.x, rect.y+rect.h, u1, v2); - } - - void DirectX9::LoadTexture(Gwk::Texture* texture) - { - IDirect3DTexture9* ptr = nullptr; - D3DXIMAGE_INFO ImageInfo; - const std::wstring wtexName( Utility::Widen(texture->name) ); - HRESULT hr = D3DXCreateTextureFromFileExW(m_device, - wtexName.c_str(), - 0, 0, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, - D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, &ImageInfo, nullptr, - &ptr); - - if (hr != S_OK) - return; - - texture->data = ptr; - texture->width = ImageInfo.Width; - texture->height = ImageInfo.Height; - } - - void DirectX9::FreeTexture(Gwk::Texture* texture) - { - IDirect3DTexture9* image = (IDirect3DTexture9*)texture->data; - - if (!image) - return; - - image->Release(); - texture->data = nullptr; - } - - Gwk::Color DirectX9::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, - const Gwk::Color& col_default) - { - IDirect3DTexture9* image = (IDirect3DTexture9*)texture->data; - - if (!image) - return col_default; - - IDirect3DSurface9* surface = nullptr; - - if (image->GetSurfaceLevel(0, &surface) != S_OK) - return col_default; - - if (!surface) - return col_default; - - D3DLOCKED_RECT lockedRect; - surface->LockRect(&lockedRect, nullptr, D3DLOCK_READONLY); - DWORD* pixels = (DWORD*)lockedRect.bits; - D3DXCOLOR color = pixels[lockedRect.Pitch/sizeof(DWORD)*y+x]; - surface->UnlockRect(); - surface->Release(); - return Gwk::Color(color.r*255, color.g*255, color.b*255, color.a*255); - } - - void DirectX9::Release() - { - Font::List::iterator it = m_fontList.begin(); - - while (it != m_fontList.end()) - { - FreeFont(*it); - it = m_fontList.begin(); - } - } - - void DirectX9::FillPresentParameters(Gwk::WindowProvider* window, - D3DPRESENT_PARAMETERS& Params) - { - HWND hWND = (HWND)window->GetWindow(); - RECT ClientRect; - GetClientRect(hWND, &ClientRect); - ZeroMemory(&Params, sizeof(Params)); - Params.Windowed = true; - Params.SwapEffect = D3DSWAPEFFECT_DISCARD; - Params.BackBufferWidth = ClientRect.right; - Params.BackBufferHeight = ClientRect.bottom; - Params.FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT; - Params.BackBufferFormat = D3DFMT_X8R8G8B8; - Params.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; - } - - bool DirectX9::InitializeContext(Gwk::WindowProvider* window) - { - HWND hWND = (HWND)window->GetWindow(); - m_D3D = Direct3DCreate9(D3D_SDK_VERSION); - - if (!m_D3D) - return false; - - D3DCAPS9 D3DCaps; - m_D3D->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &D3DCaps); - DWORD BehaviourFlags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; - - if (D3DCaps.VertexProcessingCaps != 0) - BehaviourFlags = D3DCREATE_HARDWARE_VERTEXPROCESSING; - - D3DPRESENT_PARAMETERS Params; - FillPresentParameters(window, Params); - HRESULT hr = m_D3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hWND, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &Params, - &m_device); - - if (FAILED(hr)) - return false; - - return true; - } - - bool DirectX9::ShutdownContext(Gwk::WindowProvider* window) - { - if (m_device) - { - m_device->Release(); - m_device = nullptr; - } - - if (m_D3D) - { - m_D3D->Release(); - m_D3D = nullptr; - } - - return true; - } - - bool DirectX9::PresentContext(Gwk::WindowProvider* window) - { - m_device->Present(nullptr, nullptr, nullptr, nullptr); - return true; - } - - bool DirectX9::ResizedContext(Gwk::WindowProvider* window, int w, int h) - { - // Force setting the current texture again - m_currentTexture = nullptr; - // Free any unmanaged resources (fonts) - Release(); - // Get the new window size from the HWND - D3DPRESENT_PARAMETERS Params; - FillPresentParameters(window, Params); - // And reset the device! - m_device->Reset(&Params); - return true; - } - - bool DirectX9::BeginContext(Gwk::WindowProvider* window) - { - m_device->BeginScene(); - m_device->Clear(0, nullptr, D3DCLEAR_TARGET|D3DCLEAR_ZBUFFER|D3DCLEAR_STENCIL, D3DCOLOR_XRGB( - 128, 128, - 128), 1, 0); - return true; - } - - bool DirectX9::EndContext(Gwk::WindowProvider* window) - { - m_device->EndScene(); - return true; - } + fd.PitchAndFamily = DEFAULT_PITCH|FF_DONTCARE; + LPD3DXFONT d3DXFont; + HRESULT hr = D3DXCreateFontIndirect(m_device, &fd, &d3DXFont); + FontData* fontData = new FontData(); + fontData->font = d3DXFont; + // ID3DXFont doesn't measure trailing spaces, so we measure the + // width of a space here and store it + // in the font data - then we can add it to the width when we + // measure text with trailing spaces. + { + RECT rctA = {0, 0, 0, 0}; + fontData->font->DrawTextW(nullptr, L"A", -1, &rctA, + DT_CALCRECT|DT_LEFT|DT_TOP|DT_SINGLELINE, 0); + RECT rctSpc = {0, 0, 0, 0}; + fontData->font->DrawTextW(nullptr, L"A A", -1, &rctSpc, + DT_CALCRECT|DT_LEFT|DT_TOP|DT_SINGLELINE, 0); + fontData->iSpaceWidth = rctSpc.right-rctA.right*2; + } + font->data = fontData; +} + +void DirectX9::FreeFont(Gwk::Font* font) +{ + m_fontList.remove(font); + + if (!font->data) + return; + + FontData* fontData = (FontData*)font->data; + + if (fontData->font) + { + fontData->font->Release(); + fontData->font = nullptr; + } + + delete fontData; + font->data = nullptr; +} + +void DirectX9::RenderText(Gwk::Font* font, Gwk::Point pos, + const Gwk::String& text) +{ + Flush(); + + // If the font doesn't exist, or the font size should be changed + if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) + { + FreeFont(font); + LoadFont(font); + } + + const std::wstring wideText(Utility::Widen(text)); + + FontData* fontData = (FontData*)font->data; + Translate(pos.x, pos.y); + RECT ClipRect = { pos.x, pos.y, 0, 0 }; + fontData->font->DrawTextW(nullptr, + wideText.c_str(), -1, &ClipRect, DT_LEFT|DT_TOP|DT_NOCLIP|DT_SINGLELINE, + m_color); +} + +Gwk::Point DirectX9::MeasureText(Gwk::Font* font, const Gwk::String& text) +{ + // If the font doesn't exist, or the font size should be changed + if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) + { + FreeFont(font); + LoadFont(font); + } + + FontData* fontData = (FontData*)font->data; + Gwk::Point size; + + if (text.empty()) + { + RECT rct = {0, 0, 0, 0}; + fontData->font->DrawTextW(nullptr, L"W", -1, &rct, DT_CALCRECT, 0); + return Gwk::Point(0, rct.bottom); + } + + const std::wstring wideText(Utility::Widen(text)); + + RECT rct = {0, 0, 0, 0}; + fontData->font->DrawTextW(nullptr, + wideText.c_str(), -1, &rct, DT_CALCRECT|DT_LEFT|DT_TOP|DT_SINGLELINE, + 0); + + for (int i = wideText.length()-1; i >= 0 && wideText[i] == L' '; i--) + { + rct.right += fontData->iSpaceWidth; + } + + return Gwk::Point(rct.right/Scale(), rct.bottom/Scale()); +} + +void DirectX9::StartClip() +{ + Flush(); + m_device->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE); + const Gwk::Rect& rect = ClipRegion(); + RECT r; + r.left = ceil(((float)rect.x)*Scale()); + r.right = ceil(((float)(rect.x+rect.w))*Scale()); + r.top = ceil((float)rect.y*Scale()); + r.bottom = ceil(((float)(rect.y+rect.h))*Scale()); + m_device->SetScissorRect(&r); +} + +void DirectX9::EndClip() +{ + Flush(); + m_device->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE); +} + +void DirectX9::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, float u1, + float v1, float u2, float v2) +{ + IDirect3DTexture9* image = (IDirect3DTexture9*)texture->data; + + // Missing image, not loaded properly? + if (!image) + return DrawMissingImage(rect); + + Translate(rect); + + if (m_currentTexture != image) + { + Flush(); + m_device->SetTexture(0, image); + m_currentTexture = image; + } + + AddVert(rect.x, rect.y, u1, v1); + AddVert(rect.x+rect.w, rect.y, u2, v1); + AddVert(rect.x, rect.y+rect.h, u1, v2); + AddVert(rect.x+rect.w, rect.y, u2, v1); + AddVert(rect.x+rect.w, rect.y+rect.h, u2, v2); + AddVert(rect.x, rect.y+rect.h, u1, v2); +} + +void DirectX9::LoadTexture(Gwk::Texture* texture) +{ + IDirect3DTexture9* ptr = nullptr; + D3DXIMAGE_INFO ImageInfo; + const std::wstring wtexName( Utility::Widen(texture->name) ); + HRESULT hr = D3DXCreateTextureFromFileExW(m_device, + wtexName.c_str(), + 0, 0, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, + D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, &ImageInfo, nullptr, + &ptr); + + if (hr != S_OK) + return; + + texture->data = ptr; + texture->width = ImageInfo.Width; + texture->height = ImageInfo.Height; +} + +void DirectX9::FreeTexture(Gwk::Texture* texture) +{ + IDirect3DTexture9* image = (IDirect3DTexture9*)texture->data; + + if (!image) + return; + + image->Release(); + texture->data = nullptr; +} + +Gwk::Color DirectX9::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, + const Gwk::Color& col_default) +{ + IDirect3DTexture9* image = (IDirect3DTexture9*)texture->data; + + if (!image) + return col_default; + IDirect3DSurface9* surface = nullptr; + + if (image->GetSurfaceLevel(0, &surface) != S_OK) + return col_default; + + if (!surface) + return col_default; + + D3DLOCKED_RECT lockedRect; + surface->LockRect(&lockedRect, nullptr, D3DLOCK_READONLY); + DWORD* pixels = (DWORD*)lockedRect.bits; + D3DXCOLOR color = pixels[lockedRect.Pitch/sizeof(DWORD)*y+x]; + surface->UnlockRect(); + surface->Release(); + return Gwk::Color(color.r*255, color.g*255, color.b*255, color.a*255); +} + +void DirectX9::Release() +{ + Font::List::iterator it = m_fontList.begin(); + + while (it != m_fontList.end()) + { + FreeFont(*it); + it = m_fontList.begin(); } } + +void DirectX9::FillPresentParameters(Gwk::WindowProvider* window, + D3DPRESENT_PARAMETERS& Params) +{ + HWND hWND = (HWND)window->GetWindow(); + RECT ClientRect; + GetClientRect(hWND, &ClientRect); + ZeroMemory(&Params, sizeof(Params)); + Params.Windowed = true; + Params.SwapEffect = D3DSWAPEFFECT_DISCARD; + Params.BackBufferWidth = ClientRect.right; + Params.BackBufferHeight = ClientRect.bottom; + Params.FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT; + Params.BackBufferFormat = D3DFMT_X8R8G8B8; + Params.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; +} + +bool DirectX9::InitializeContext(Gwk::WindowProvider* window) +{ + HWND hWND = (HWND)window->GetWindow(); + m_D3D = Direct3DCreate9(D3D_SDK_VERSION); + + if (!m_D3D) + return false; + + D3DCAPS9 D3DCaps; + m_D3D->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &D3DCaps); + DWORD BehaviourFlags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; + + if (D3DCaps.VertexProcessingCaps != 0) + BehaviourFlags = D3DCREATE_HARDWARE_VERTEXPROCESSING; + + D3DPRESENT_PARAMETERS Params; + FillPresentParameters(window, Params); + HRESULT hr = m_D3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hWND, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &Params, + &m_device); + + if (FAILED(hr)) + return false; + + return true; +} + +bool DirectX9::ShutdownContext(Gwk::WindowProvider* window) +{ + if (m_device) + { + m_device->Release(); + m_device = nullptr; + } + + if (m_D3D) + { + m_D3D->Release(); + m_D3D = nullptr; + } + + return true; +} + +bool DirectX9::PresentContext(Gwk::WindowProvider* window) +{ + m_device->Present(nullptr, nullptr, nullptr, nullptr); + return true; +} + +bool DirectX9::ResizedContext(Gwk::WindowProvider* window, int w, int h) +{ + // Force setting the current texture again + m_currentTexture = nullptr; + // Free any unmanaged resources (fonts) + Release(); + // Get the new window size from the HWND + D3DPRESENT_PARAMETERS Params; + FillPresentParameters(window, Params); + // And reset the device! + m_device->Reset(&Params); + return true; +} + +bool DirectX9::BeginContext(Gwk::WindowProvider* window) +{ + m_device->BeginScene(); + m_device->Clear(0, nullptr, D3DCLEAR_TARGET|D3DCLEAR_ZBUFFER|D3DCLEAR_STENCIL, D3DCOLOR_XRGB( + 128, 128, + 128), 1, 0); + return true; +} + +bool DirectX9::EndContext(Gwk::WindowProvider* window) +{ + m_device->EndScene(); + return true; +} + +} +} diff --git a/source/platform/renderers/GDIPlus/GDIPlus.cpp b/source/platform/renderers/GDIPlus/GDIPlus.cpp index 1ee3960c..a67d4a0a 100644 --- a/source/platform/renderers/GDIPlus/GDIPlus.cpp +++ b/source/platform/renderers/GDIPlus/GDIPlus.cpp @@ -12,213 +12,214 @@ namespace Gwk { - namespace Renderer +namespace Renderer +{ + +GDIPlus::GDIPlus(HWND hWND) +{ + m_hWND = hWND; + m_hDC = nullptr; + graphics = nullptr; + m_width = 0; + m_height = 0; + // Initialize GDI+. + Gdiplus::GdiplusStartupInput gdiplusStartupInput; + Gdiplus::GdiplusStartup(&m_gdiplusToken, &gdiplusStartupInput, nullptr); +} + +GDIPlus::~GDIPlus() +{ + Gdiplus::GdiplusShutdown(m_gdiplusToken); +} + +void GDIPlus::Begin() +{ + m_hDC = GetDC(m_hWND); + graphics = Gdiplus::Graphics::FromHDC(m_hDC); +} + +void GDIPlus::End() +{ + if (graphics) { - GDIPlus::GDIPlus(HWND hWND) - { - m_hWND = hWND; - m_hDC = nullptr; - graphics = nullptr; - m_width = 0; - m_height = 0; - // Initialize GDI+. - Gdiplus::GdiplusStartupInput gdiplusStartupInput; - Gdiplus::GdiplusStartup(&m_gdiplusToken, &gdiplusStartupInput, nullptr); - } - - GDIPlus::~GDIPlus() - { - Gdiplus::GdiplusShutdown(m_gdiplusToken); - } - - void GDIPlus::Begin() - { - m_hDC = GetDC(m_hWND); - graphics = Gdiplus::Graphics::FromHDC(m_hDC); - } - - void GDIPlus::End() - { - if (graphics) - { - delete graphics; - graphics = nullptr; - } - - ReleaseDC(m_hWND, m_hDC); - m_hDC = nullptr; - } - - void GDIPlus::DrawFilledRect(Gwk::Rect rect) - { - Translate(rect); - Gdiplus::SolidBrush solidBrush(m_colour); - graphics->FillRectangle(&solidBrush, rect.x, rect.y, rect.w, rect.h); - } - - void GDIPlus::SetDrawColor(Gwk::Color color) - { - m_colour = Gdiplus::Color(color.a, color.r, color.g, color.b); - } - - void GDIPlus::LoadFont(Gwk::Font* font) - { - Gdiplus::FontStyle fs = Gdiplus::FontStyleRegular; - font->realsize = font->size*Scale(); - Gdiplus::Font* font = new Gdiplus::Font(Utility::Widen(font->facename).c_str(), - font->realsize, fs, Gdiplus::UnitPixel, nullptr); - font->data = font; - } - - void GDIPlus::FreeFont(Gwk::Font* font) - { - if (!font->data) - return; - - Gdiplus::Font* font = ((Gdiplus::Font*)font->data); - delete font; - font->data = nullptr; - } - - void GDIPlus::RenderText(Gwk::Font* font, Gwk::Point pos, - const Gwk::String& text) - { - Translate(pos.x, pos.y); - - // If the font doesn't exist, or the font size should be changed - if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) - { - FreeFont(font); - LoadFont(font); - } - - Gdiplus::StringFormat strFormat(Gdiplus::StringFormat::GenericDefault()); - Gdiplus::SolidBrush solidBrush(m_colour); - Gdiplus::RectF r(pos.x, pos.y, 1000, 1000); - Gdiplus::Font* gDIFont = (Gdiplus::Font*)font->data; - const std::wstring wtext( Utility::Widen(text) ); - graphics->DrawString(wtext.c_str(), wtext.length()+1, - gDIFont, r, &strFormat, &solidBrush); - } - - Gwk::Point GDIPlus::MeasureText(Gwk::Font* font, const Gwk::String& text) - { - Gwk::Point p(1, 1); - - if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) - { - FreeFont(font); - LoadFont(font); - } - - Gdiplus::StringFormat strFormat(Gdiplus::StringFormat::GenericDefault()); - strFormat.SetFormatFlags( - Gdiplus::StringFormatFlagsMeasureTrailingSpaces|strFormat.GetFormatFlags()); - Gdiplus::SizeF size; - Gdiplus::Graphics g(m_hWND); - Gdiplus::Font* gDIFont = (Gdiplus::Font*)font->data; - const std::wstring wtext( Utility::Widen(text) ); - g.MeasureString(wtext.c_str(), -1, gDIFont, Gdiplus::SizeF(10000, 10000), - &strFormat, &size); - return Gwk::Point(size.Width+1, size.Height+1); - } - - void GDIPlus::StartClip() - { - const Gwk::Rect& rect = ClipRegion(); - graphics->SetClip(Gdiplus::Rect(rect.x*Scale(), rect.y*Scale(), rect.w*Scale(), rect.h* - Scale()), Gdiplus::CombineModeReplace); - } - - void GDIPlus::EndClip() - { - graphics->ResetClip(); - } - - void GDIPlus::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect targetRect, float u1, - float v1, float u2, float v2) - { - Gdiplus::Bitmap* image = (Gdiplus::Bitmap*)texture->data; - - // Missing image, not loaded properly? - if (!image || image->GetType() == Gdiplus::ImageTypeUnknown) - return DrawMissingImage(targetRect); - - Translate(targetRect); - Gdiplus::RectF TargetRect(targetRect.x, targetRect.y, targetRect.w, targetRect.h); - // Convert UV to pixel coords - float fW = image->GetWidth(); - float fH = image->GetHeight(); - u1 *= fW; - v1 *= fH; - u2 *= fW; - u2 -= u1; - v2 *= fH; - v2 -= v1; - graphics->DrawImage(image, TargetRect, u1, v1, u2, v2, Gdiplus::UnitPixel); - } - - void GDIPlus::LoadTexture(Gwk::Texture* texture) - { - Gdiplus::Bitmap* image = new Gdiplus::Bitmap(Utility::Widen(texture->name).c_str()); - texture->data = image; - texture->width = image->GetWidth(); - texture->height = image->GetHeight(); - } - - void GDIPlus::FreeTexture(Gwk::Texture* texture) - { - Gdiplus::Bitmap* image = (Gdiplus::Bitmap*)texture->data; - - if (!image) - return; - - delete image; - } - - Gwk::Color GDIPlus::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, - const Gwk::Color& col_default) - { - Gdiplus::Bitmap* image = (Gdiplus::Bitmap*)texture->data; - - if (!image) - return col_default; - - Gdiplus::Color c; - image->GetPixel(x, y, &c); - return Gwk::Color(c.GetR(), c.GetG(), c.GetB(), c.GetA()); - } - - bool GDIPlus::InitializeContext(Gwk::WindowProvider* window) - { - m_hWND = (HWND)window->GetWindow(); - return true; - } - - bool GDIPlus::ShutdownContext(Gwk::WindowProvider* window) - { - return true; - } - - bool GDIPlus::PresentContext(Gwk::WindowProvider* window) - { - return true; - } - - bool GDIPlus::ResizedContext(Gwk::WindowProvider* window, int w, int h) - { - return true; - } - - bool GDIPlus::BeginContext(Gwk::WindowProvider* window) - { - return true; - } - - bool GDIPlus::EndContext(Gwk::WindowProvider* window) - { - return true; - } + delete graphics; + graphics = nullptr; + } + + ReleaseDC(m_hWND, m_hDC); + m_hDC = nullptr; +} + +void GDIPlus::DrawFilledRect(Gwk::Rect rect) +{ + Translate(rect); + Gdiplus::SolidBrush solidBrush(m_colour); + graphics->FillRectangle(&solidBrush, rect.x, rect.y, rect.w, rect.h); +} +void GDIPlus::SetDrawColor(Gwk::Color color) +{ + m_colour = Gdiplus::Color(color.a, color.r, color.g, color.b); +} + +void GDIPlus::LoadFont(Gwk::Font* font) +{ + Gdiplus::FontStyle fs = Gdiplus::FontStyleRegular; + font->realsize = font->size*Scale(); + Gdiplus::Font* font = new Gdiplus::Font(Utility::Widen(font->facename).c_str(), + font->realsize, fs, Gdiplus::UnitPixel, nullptr); + font->data = font; +} + +void GDIPlus::FreeFont(Gwk::Font* font) +{ + if (!font->data) + return; + + Gdiplus::Font* font = ((Gdiplus::Font*)font->data); + delete font; + font->data = nullptr; +} + +void GDIPlus::RenderText(Gwk::Font* font, Gwk::Point pos, + const Gwk::String& text) +{ + Translate(pos.x, pos.y); + + // If the font doesn't exist, or the font size should be changed + if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) + { + FreeFont(font); + LoadFont(font); + } + + Gdiplus::StringFormat strFormat(Gdiplus::StringFormat::GenericDefault()); + Gdiplus::SolidBrush solidBrush(m_colour); + Gdiplus::RectF r(pos.x, pos.y, 1000, 1000); + Gdiplus::Font* gDIFont = (Gdiplus::Font*)font->data; + const std::wstring wtext( Utility::Widen(text) ); + graphics->DrawString(wtext.c_str(), wtext.length()+1, + gDIFont, r, &strFormat, &solidBrush); +} + +Gwk::Point GDIPlus::MeasureText(Gwk::Font* font, const Gwk::String& text) +{ + Gwk::Point p(1, 1); + + if (!font->data || fabs(font->realsize-font->size*Scale()) > 2) + { + FreeFont(font); + LoadFont(font); } + + Gdiplus::StringFormat strFormat(Gdiplus::StringFormat::GenericDefault()); + strFormat.SetFormatFlags( + Gdiplus::StringFormatFlagsMeasureTrailingSpaces|strFormat.GetFormatFlags()); + Gdiplus::SizeF size; + Gdiplus::Graphics g(m_hWND); + Gdiplus::Font* gDIFont = (Gdiplus::Font*)font->data; + const std::wstring wtext( Utility::Widen(text) ); + g.MeasureString(wtext.c_str(), -1, gDIFont, Gdiplus::SizeF(10000, 10000), + &strFormat, &size); + return Gwk::Point(size.Width+1, size.Height+1); +} + +void GDIPlus::StartClip() +{ + const Gwk::Rect& rect = ClipRegion(); + graphics->SetClip(Gdiplus::Rect(rect.x*Scale(), rect.y*Scale(), rect.w*Scale(), rect.h* + Scale()), Gdiplus::CombineModeReplace); +} + +void GDIPlus::EndClip() +{ + graphics->ResetClip(); +} + +void GDIPlus::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect targetRect, float u1, + float v1, float u2, float v2) +{ + Gdiplus::Bitmap* image = (Gdiplus::Bitmap*)texture->data; + + // Missing image, not loaded properly? + if (!image || image->GetType() == Gdiplus::ImageTypeUnknown) + return DrawMissingImage(targetRect); + + Translate(targetRect); + Gdiplus::RectF TargetRect(targetRect.x, targetRect.y, targetRect.w, targetRect.h); + // Convert UV to pixel coords + float fW = image->GetWidth(); + float fH = image->GetHeight(); + u1 *= fW; + v1 *= fH; + u2 *= fW; + u2 -= u1; + v2 *= fH; + v2 -= v1; + graphics->DrawImage(image, TargetRect, u1, v1, u2, v2, Gdiplus::UnitPixel); +} + +void GDIPlus::LoadTexture(Gwk::Texture* texture) +{ + Gdiplus::Bitmap* image = new Gdiplus::Bitmap(Utility::Widen(texture->name).c_str()); + texture->data = image; + texture->width = image->GetWidth(); + texture->height = image->GetHeight(); +} + +void GDIPlus::FreeTexture(Gwk::Texture* texture) +{ + Gdiplus::Bitmap* image = (Gdiplus::Bitmap*)texture->data; + + if (!image) + return; + + delete image; +} + +Gwk::Color GDIPlus::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, + const Gwk::Color& col_default) +{ + Gdiplus::Bitmap* image = (Gdiplus::Bitmap*)texture->data; + + if (!image) + return col_default; + + Gdiplus::Color c; + image->GetPixel(x, y, &c); + return Gwk::Color(c.GetR(), c.GetG(), c.GetB(), c.GetA()); +} + +bool GDIPlus::InitializeContext(Gwk::WindowProvider* window) +{ + m_hWND = (HWND)window->GetWindow(); + return true; +} + +bool GDIPlus::ShutdownContext(Gwk::WindowProvider* window) +{ + return true; +} + +bool GDIPlus::PresentContext(Gwk::WindowProvider* window) +{ + return true; +} + +bool GDIPlus::ResizedContext(Gwk::WindowProvider* window, int w, int h) +{ + return true; +} + +bool GDIPlus::BeginContext(Gwk::WindowProvider* window) +{ + return true; +} + +bool GDIPlus::EndContext(Gwk::WindowProvider* window) +{ + return true; +} + +} } diff --git a/source/platform/renderers/OpenGL/DebugFont/OpenGL_DebugFont.cpp b/source/platform/renderers/OpenGL/DebugFont/OpenGL_DebugFont.cpp index c3c205eb..2d2e52e6 100644 --- a/source/platform/renderers/OpenGL/DebugFont/OpenGL_DebugFont.cpp +++ b/source/platform/renderers/OpenGL/DebugFont/OpenGL_DebugFont.cpp @@ -12,135 +12,135 @@ namespace Gwk { - namespace Renderer - { - OpenGL_DebugFont::OpenGL_DebugFont() - { - m_fLetterSpacing = 1.0f/16.0f; - m_fFontScale[0] = 1.5f; - m_fFontScale[1] = 1.5f; - m_fontTexture = nullptr; - } +namespace Renderer +{ +OpenGL_DebugFont::OpenGL_DebugFont() +{ + m_fLetterSpacing = 1.0f/16.0f; + m_fFontScale[0] = 1.5f; + m_fFontScale[1] = 1.5f; + m_fontTexture = nullptr; +} - void OpenGL_DebugFont::Init() - { - CreateDebugFont(); - } +void OpenGL_DebugFont::Init() +{ + CreateDebugFont(); +} - OpenGL_DebugFont::~OpenGL_DebugFont() - { - DestroyDebugFont(); - } +OpenGL_DebugFont::~OpenGL_DebugFont() +{ + DestroyDebugFont(); +} - void OpenGL_DebugFont::CreateDebugFont() - { - if (m_fontTexture) - return; - - m_fontTexture = new Gwk::Texture(); - // Create a little texture pointer.. - GLuint* pglTexture = new GLuint; - // Sort out our Gwork texture - m_fontTexture->data = pglTexture; - m_fontTexture->width = 256; - m_fontTexture->height = 256; - // Create the opengl texture - glGenTextures(1, pglTexture); - glBindTexture(GL_TEXTURE_2D, *pglTexture); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - unsigned char* texdata = new unsigned char[256*256*4]; - - for (int i = 0; i < 256*256; i++) - { - texdata[i*4] = sGworkFontData[i]; - texdata[i*4+1] = sGworkFontData[i]; - texdata[i*4+2] = sGworkFontData[i]; - texdata[i*4+3] = sGworkFontData[i]; - } +void OpenGL_DebugFont::CreateDebugFont() +{ + if (m_fontTexture) + return; + + m_fontTexture = new Gwk::Texture(); + // Create a little texture pointer.. + GLuint* pglTexture = new GLuint; + // Sort out our Gwork texture + m_fontTexture->data = pglTexture; + m_fontTexture->width = 256; + m_fontTexture->height = 256; + // Create the opengl texture + glGenTextures(1, pglTexture); + glBindTexture(GL_TEXTURE_2D, *pglTexture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + unsigned char* texdata = new unsigned char[256*256*4]; + + for (int i = 0; i < 256*256; i++) + { + texdata[i*4] = sGworkFontData[i]; + texdata[i*4+1] = sGworkFontData[i]; + texdata[i*4+2] = sGworkFontData[i]; + texdata[i*4+3] = sGworkFontData[i]; + } - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_fontTexture->width, m_fontTexture->height, - 0, GL_RGBA, GL_UNSIGNED_BYTE, (const GLvoid*)texdata); - delete[]texdata; - } + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_fontTexture->width, m_fontTexture->height, + 0, GL_RGBA, GL_UNSIGNED_BYTE, (const GLvoid*)texdata); + delete[]texdata; +} - void OpenGL_DebugFont::DestroyDebugFont() - { - if (!m_fontTexture) - return; +void OpenGL_DebugFont::DestroyDebugFont() +{ + if (!m_fontTexture) + return; - GLuint* tex = (GLuint*)m_fontTexture->data; + GLuint* tex = (GLuint*)m_fontTexture->data; - if (!tex) - return; + if (!tex) + return; - glDeleteTextures(1, tex); - delete tex; - m_fontTexture->data = nullptr; - delete m_fontTexture; - m_fontTexture = nullptr; - } + glDeleteTextures(1, tex); + delete tex; + m_fontTexture->data = nullptr; + delete m_fontTexture; + m_fontTexture = nullptr; +} - void OpenGL_DebugFont::RenderText(Gwk::Font* font, Gwk::Point pos, - const Gwk::String& text) - { - float fSize = font->size*Scale(); +void OpenGL_DebugFont::RenderText(Gwk::Font* font, Gwk::Point pos, + const Gwk::String& text) +{ + float fSize = font->size*Scale(); - if (!text.length()) - return; + if (!text.length()) + return; - float yOffset = 0.0f; + float yOffset = 0.0f; - for (unsigned int i = 0; i < text.length(); i++) - { - char ch = text[i]; - float curSpacing = sGworkDebugFontSpacing[ch]*m_fLetterSpacing*fSize*m_fFontScale[0]; - Gwk::Rect r(pos.x+yOffset, pos.y-fSize*0.5, (fSize*m_fFontScale[0]), - fSize*m_fFontScale[1]); - - if (m_fontTexture) - { - float uv_texcoords[8] = {0., 0., 1., 1.}; - - if (ch >= 0) - { - float cx = (ch%16)/16.0; - float cy = (ch/16)/16.0; - uv_texcoords[0] = cx; - uv_texcoords[1] = cy; - uv_texcoords[4] = float(cx+1.0f/16.0f); - uv_texcoords[5] = float(cy+1.0f/16.0f); - } - - DrawTexturedRect(m_fontTexture, r, uv_texcoords[0], uv_texcoords[5], - uv_texcoords[4], uv_texcoords[1]); - yOffset += curSpacing; - } - else - { - DrawFilledRect(r); - yOffset += curSpacing; - } - } - } + for (unsigned int i = 0; i < text.length(); i++) + { + char ch = text[i]; + float curSpacing = sGworkDebugFontSpacing[ch]*m_fLetterSpacing*fSize*m_fFontScale[0]; + Gwk::Rect r(pos.x+yOffset, pos.y-fSize*0.5, (fSize*m_fFontScale[0]), + fSize*m_fFontScale[1]); - Gwk::Point OpenGL_DebugFont::MeasureText(Gwk::Font* font, - const Gwk::String& text) + if (m_fontTexture) { - Gwk::Point p; - float fSize = font->size*Scale(); - float spacing = 0.0f; + float uv_texcoords[8] = {0., 0., 1., 1.}; - for (unsigned int i = 0; i < text.length(); i++) + if (ch >= 0) { - char ch = text[i]; - spacing += sGworkDebugFontSpacing[ch]; + float cx = (ch%16)/16.0; + float cy = (ch/16)/16.0; + uv_texcoords[0] = cx; + uv_texcoords[1] = cy; + uv_texcoords[4] = float(cx+1.0f/16.0f); + uv_texcoords[5] = float(cy+1.0f/16.0f); } - p.x = spacing*m_fLetterSpacing*fSize*m_fFontScale[0]; - p.y = font->size*Scale(); - return p; + DrawTexturedRect(m_fontTexture, r, uv_texcoords[0], uv_texcoords[5], + uv_texcoords[4], uv_texcoords[1]); + yOffset += curSpacing; + } + else + { + DrawFilledRect(r); + yOffset += curSpacing; } + } +} + +Gwk::Point OpenGL_DebugFont::MeasureText(Gwk::Font* font, + const Gwk::String& text) +{ + Gwk::Point p; + float fSize = font->size*Scale(); + float spacing = 0.0f; + for (unsigned int i = 0; i < text.length(); i++) + { + char ch = text[i]; + spacing += sGworkDebugFontSpacing[ch]; } + + p.x = spacing*m_fLetterSpacing*fSize*m_fFontScale[0]; + p.y = font->size*Scale(); + return p; +} + +} } diff --git a/source/platform/renderers/OpenGL/OpenGL.cpp b/source/platform/renderers/OpenGL/OpenGL.cpp index dffbd2ef..8a29322e 100644 --- a/source/platform/renderers/OpenGL/OpenGL.cpp +++ b/source/platform/renderers/OpenGL/OpenGL.cpp @@ -23,450 +23,451 @@ namespace Gwk { - namespace Renderer +namespace Renderer +{ + +// See "Font Size in Pixels or Points" in "stb_truetype.h" +const float c_pixToPoints = 1.333f; + +static const int c_texsz = 256; // TODO - fix this hack. + +OpenGL::OpenGL(const Rect& viewRect) +: m_viewRect(viewRect) +, m_vertNum(0) +, m_context(nullptr) +{ + for (int i = 0; i < MaxVerts; i++) { - // See "Font Size in Pixels or Points" in "stb_truetype.h" - const float c_pixToPoints = 1.333f; - - static const int c_texsz = 256; // TODO - fix this hack. - - OpenGL::OpenGL(const Rect& viewRect) - : m_viewRect(viewRect) - , m_vertNum(0) - , m_context(nullptr) - { - for (int i = 0; i < MaxVerts; i++) - { - m_vertices[ i ].z = 0.5f; - } - } + m_vertices[ i ].z = 0.5f; + } +} - OpenGL::~OpenGL() - { - } +OpenGL::~OpenGL() +{ +} - void OpenGL::Init() - { - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(m_viewRect.x, m_viewRect.x + m_viewRect.w, - m_viewRect.y, m_viewRect.y + m_viewRect.h, - -1.0, 1.0); - glMatrixMode(GL_MODELVIEW); - glViewport(m_viewRect.x, m_viewRect.y, m_viewRect.w, m_viewRect.h); - } +void OpenGL::Init() +{ + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(m_viewRect.x, m_viewRect.x + m_viewRect.w, + m_viewRect.y, m_viewRect.y + m_viewRect.h, + -1.0, 1.0); + glMatrixMode(GL_MODELVIEW); + glViewport(m_viewRect.x, m_viewRect.y, m_viewRect.w, m_viewRect.h); +} - void OpenGL::Begin() - { - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glAlphaFunc(GL_GREATER, 1.0f); - glEnable(GL_BLEND); - } +void OpenGL::Begin() +{ + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glAlphaFunc(GL_GREATER, 1.0f); + glEnable(GL_BLEND); +} - void OpenGL::End() - { - Flush(); - } +void OpenGL::End() +{ + Flush(); +} - void OpenGL::Flush() - { - if (m_vertNum == 0) - return; - - glVertexPointer(3, GL_FLOAT, sizeof(Vertex), (void*)&m_vertices[0].x); - glEnableClientState(GL_VERTEX_ARRAY); - glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(Vertex), (void*)&m_vertices[0].r); - glEnableClientState(GL_COLOR_ARRAY); - glTexCoordPointer(2, GL_FLOAT, sizeof(Vertex), (void*)&m_vertices[0].u); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glDrawArrays(GL_TRIANGLES, 0, (GLsizei)m_vertNum); - - m_vertNum = 0; - glFlush(); - } +void OpenGL::Flush() +{ + if (m_vertNum == 0) + return; + + glVertexPointer(3, GL_FLOAT, sizeof(Vertex), (void*)&m_vertices[0].x); + glEnableClientState(GL_VERTEX_ARRAY); + glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(Vertex), (void*)&m_vertices[0].r); + glEnableClientState(GL_COLOR_ARRAY); + glTexCoordPointer(2, GL_FLOAT, sizeof(Vertex), (void*)&m_vertices[0].u); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glDrawArrays(GL_TRIANGLES, 0, (GLsizei)m_vertNum); + + m_vertNum = 0; + glFlush(); +} - void OpenGL::AddVert(int x, int y, float u, float v) - { - if (m_vertNum >= MaxVerts-1) - Flush(); - - // OpenGL origin is bottom-left. Gwork origin is top-left. - m_vertices[ m_vertNum ].x = float(x); - m_vertices[ m_vertNum ].y = float(m_viewRect.h - y); - m_vertices[ m_vertNum ].u = u; - m_vertices[ m_vertNum ].v = v; - m_vertices[ m_vertNum ].r = m_color.r; - m_vertices[ m_vertNum ].g = m_color.g; - m_vertices[ m_vertNum ].b = m_color.b; - m_vertices[ m_vertNum ].a = m_color.a; - m_vertNum++; - } +void OpenGL::AddVert(int x, int y, float u, float v) +{ + if (m_vertNum >= MaxVerts-1) + Flush(); + + // OpenGL origin is bottom-left. Gwork origin is top-left. + m_vertices[ m_vertNum ].x = float(x); + m_vertices[ m_vertNum ].y = float(m_viewRect.h - y); + m_vertices[ m_vertNum ].u = u; + m_vertices[ m_vertNum ].v = v; + m_vertices[ m_vertNum ].r = m_color.r; + m_vertices[ m_vertNum ].g = m_color.g; + m_vertices[ m_vertNum ].b = m_color.b; + m_vertices[ m_vertNum ].a = m_color.a; + m_vertNum++; +} - void OpenGL::DrawFilledRect(Gwk::Rect rect) - { - GLboolean texturesOn; - glGetBooleanv(GL_TEXTURE_2D, &texturesOn); - - if (texturesOn) - { - Flush(); - glDisable(GL_TEXTURE_2D); - } - - Translate(rect); - AddVert(rect.x, rect.y); - AddVert(rect.x+rect.w, rect.y); - AddVert(rect.x, rect.y+rect.h); - AddVert(rect.x+rect.w, rect.y); - AddVert(rect.x+rect.w, rect.y+rect.h); - AddVert(rect.x, rect.y+rect.h); - } +void OpenGL::DrawFilledRect(Gwk::Rect rect) +{ + GLboolean texturesOn; + glGetBooleanv(GL_TEXTURE_2D, &texturesOn); - void OpenGL::SetDrawColor(Gwk::Color color) - { - glColor4ubv((GLubyte*)&color); - m_color = color; - } + if (texturesOn) + { + Flush(); + glDisable(GL_TEXTURE_2D); + } - void OpenGL::StartClip() - { - Flush(); - Gwk::Rect rect = ClipRegion(); - - // OpenGL's coords are from the bottom left - rect.y = m_viewRect.h - (rect.y + rect.h); + Translate(rect); + AddVert(rect.x, rect.y); + AddVert(rect.x+rect.w, rect.y); + AddVert(rect.x, rect.y+rect.h); + AddVert(rect.x+rect.w, rect.y); + AddVert(rect.x+rect.w, rect.y+rect.h); + AddVert(rect.x, rect.y+rect.h); +} - glScissor(rect.x * Scale(), rect.y * Scale(), - rect.w * Scale(), rect.h * Scale()); - glEnable(GL_SCISSOR_TEST); - } +void OpenGL::SetDrawColor(Gwk::Color color) +{ + glColor4ubv((GLubyte*)&color); + m_color = color; +} - void OpenGL::EndClip() - { - Flush(); - glDisable(GL_SCISSOR_TEST); - } +void OpenGL::StartClip() +{ + Flush(); + Gwk::Rect rect = ClipRegion(); + + // OpenGL's coords are from the bottom left + rect.y = m_viewRect.h - (rect.y + rect.h); + + glScissor(rect.x * Scale(), rect.y * Scale(), + rect.w * Scale(), rect.h * Scale()); + glEnable(GL_SCISSOR_TEST); +} - void OpenGL::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, - float u1, float v1, float u2, float v2) - { - GLuint* tex = (GLuint*)texture->data; - - // Missing image, not loaded properly? - if (!tex) - return DrawMissingImage(rect); - - Translate(rect); - GLuint boundtex; - GLboolean texturesOn; - glGetBooleanv(GL_TEXTURE_2D, &texturesOn); - glGetIntegerv(GL_TEXTURE_BINDING_2D, (GLint*)&boundtex); - - if (!texturesOn || *tex != boundtex) - { - Flush(); - glBindTexture(GL_TEXTURE_2D, *tex); - glEnable(GL_TEXTURE_2D); - } - - AddVert(rect.x, rect.y, u1, v1); - AddVert(rect.x+rect.w, rect.y, u2, v1); - AddVert(rect.x, rect.y+rect.h, u1, v2); - AddVert(rect.x+rect.w, rect.y, u2, v1); - AddVert(rect.x+rect.w, rect.y+rect.h, u2, v2); - AddVert(rect.x, rect.y+rect.h, u1, v2); - } +void OpenGL::EndClip() +{ + Flush(); + glDisable(GL_SCISSOR_TEST); +} - void OpenGL::LoadTexture(Gwk::Texture* texture) - { - const std::string &fileName = texture->name; - - int x,y,n; - unsigned char *data = stbi_load(fileName.c_str(), &x, &y, &n, 4); - - // Image failed to load.. - if (!data) - { - texture->failed = true; - return; - } - - // Create a little texture pointer.. - GLuint* pglTexture = new GLuint; - - texture->data = pglTexture; - texture->width = x; - texture->height = y; - - // Create the opengl texture - glGenTextures(1, pglTexture); - glBindTexture(GL_TEXTURE_2D, *pglTexture); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - GLenum format = GL_RGBA; - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->width, texture->height, 0, format, - GL_UNSIGNED_BYTE, (const GLvoid*)data); - - stbi_image_free(data); - } +void OpenGL::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, + float u1, float v1, float u2, float v2) +{ + GLuint* tex = (GLuint*)texture->data; - void OpenGL::FreeTexture(Gwk::Texture* texture) - { - GLuint* tex = (GLuint*)texture->data; + // Missing image, not loaded properly? + if (!tex) + return DrawMissingImage(rect); - if (!tex) - return; + Translate(rect); + GLuint boundtex; + GLboolean texturesOn; + glGetBooleanv(GL_TEXTURE_2D, &texturesOn); + glGetIntegerv(GL_TEXTURE_BINDING_2D, (GLint*)&boundtex); - glDeleteTextures(1, tex); - delete tex; - texture->data = nullptr; - } + if (!texturesOn || *tex != boundtex) + { + Flush(); + glBindTexture(GL_TEXTURE_2D, *tex); + glEnable(GL_TEXTURE_2D); + } + + AddVert(rect.x, rect.y, u1, v1); + AddVert(rect.x+rect.w, rect.y, u2, v1); + AddVert(rect.x, rect.y+rect.h, u1, v2); + AddVert(rect.x+rect.w, rect.y, u2, v1); + AddVert(rect.x+rect.w, rect.y+rect.h, u2, v2); + AddVert(rect.x, rect.y+rect.h, u1, v2); +} - Gwk::Color OpenGL::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, - const Gwk::Color& col_default) - { - GLuint* tex = (GLuint*)texture->data; +void OpenGL::LoadTexture(Gwk::Texture* texture) +{ + const std::string &fileName = texture->name; + + int x,y,n; + unsigned char *data = stbi_load(fileName.c_str(), &x, &y, &n, 4); + + // Image failed to load.. + if (!data) + { + texture->failed = true; + return; + } - if (!tex) - return col_default; + // Create a little texture pointer.. + GLuint* pglTexture = new GLuint; + + texture->data = pglTexture; + texture->width = x; + texture->height = y; + + // Create the opengl texture + glGenTextures(1, pglTexture); + glBindTexture(GL_TEXTURE_2D, *pglTexture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + GLenum format = GL_RGBA; + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->width, texture->height, 0, format, + GL_UNSIGNED_BYTE, (const GLvoid*)data); + + stbi_image_free(data); +} - unsigned int iPixelSize = sizeof(unsigned char)*4; - glBindTexture(GL_TEXTURE_2D, *tex); - unsigned char* data = - (unsigned char*)malloc(iPixelSize * texture->width * texture->height); - glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); - unsigned int iOffset = (y*texture->width+x)*4; - - Color c(data[0+iOffset], data[1+iOffset], data[2+iOffset], data[3+iOffset]); +void OpenGL::FreeTexture(Gwk::Texture* texture) +{ + GLuint* tex = (GLuint*)texture->data; - // Retrieving the entire texture for a single pixel read - // is kind of a waste - maybe cache this pointer in the texture - // data and then release later on? It's never called during runtime - // - only during initialization. - free(data); - - return c; - } + if (!tex) + return; - void OpenGL::LoadFont(Gwk::Font* font) - { - std::string fontName(font->facename); - - if (fontName.find(".ttf") == std::string::npos) - fontName += ".ttf"; - - font->realsize = font->size * Scale() * c_pixToPoints; - - FILE* f = fopen(fontName.c_str(), "rb"); - if (!f) - { - font->data = nullptr; - font->facename = ""; - return; - } - - struct stat stat_buf; - int rc = stat(fontName.c_str(), &stat_buf); - size_t fsz = rc == 0 ? stat_buf.st_size : -1; - assert(fsz > 0); - - unsigned char* ttfdata = new unsigned char[fsz]; - fread(ttfdata, 1, fsz, f); - - unsigned char *font_bmp = new unsigned char[c_texsz * c_texsz]; - - font->render_data = new stbtt_bakedchar[96]; - - stbtt_BakeFontBitmap(ttfdata, 0, - font->realsize, // height - font_bmp, c_texsz, c_texsz, - 32,96, // range to bake - static_cast(font->render_data)); - delete [] ttfdata; - - font->data = new GLuint; - glGenTextures(1, static_cast(font->data)); - glBindTexture(GL_TEXTURE_2D, *static_cast(font->data)); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, - c_texsz,c_texsz, 0, - GL_ALPHA, GL_UNSIGNED_BYTE, - font_bmp); - delete [] font_bmp; - } - - void OpenGL::FreeFont(Gwk::Font* font) - { - // TODO - unbind texture - delete [] static_cast(font->data); - delete [] static_cast(font->render_data); - } - - void OpenGL::RenderText(Gwk::Font* font, Gwk::Point pos, - const Gwk::String& text) + glDeleteTextures(1, tex); + delete tex; + texture->data = nullptr; +} + +Gwk::Color OpenGL::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, + const Gwk::Color& col_default) +{ + GLuint* tex = (GLuint*)texture->data; + + if (!tex) + return col_default; + + unsigned int iPixelSize = sizeof(unsigned char)*4; + glBindTexture(GL_TEXTURE_2D, *tex); + unsigned char* data = + (unsigned char*)malloc(iPixelSize * texture->width * texture->height); + glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); + unsigned int iOffset = (y*texture->width+x)*4; + + Color c(data[0+iOffset], data[1+iOffset], data[2+iOffset], data[3+iOffset]); + + // Retrieving the entire texture for a single pixel read + // is kind of a waste - maybe cache this pointer in the texture + // data and then release later on? It's never called during runtime + // - only during initialization. + free(data); + + return c; +} + +void OpenGL::LoadFont(Gwk::Font* font) +{ + std::string fontName(font->facename); + + if (fontName.find(".ttf") == std::string::npos) + fontName += ".ttf"; + + font->realsize = font->size * Scale() * c_pixToPoints; + + FILE* f = fopen(fontName.c_str(), "rb"); + if (!f) + { + font->data = nullptr; + font->facename = ""; + return; + } + + struct stat stat_buf; + int rc = stat(fontName.c_str(), &stat_buf); + size_t fsz = rc == 0 ? stat_buf.st_size : -1; + assert(fsz > 0); + + unsigned char* ttfdata = new unsigned char[fsz]; + fread(ttfdata, 1, fsz, f); + + unsigned char *font_bmp = new unsigned char[c_texsz * c_texsz]; + + font->render_data = new stbtt_bakedchar[96]; + + stbtt_BakeFontBitmap(ttfdata, 0, + font->realsize, // height + font_bmp, c_texsz, c_texsz, + 32,96, // range to bake + static_cast(font->render_data)); + delete [] ttfdata; + + font->data = new GLuint; + glGenTextures(1, static_cast(font->data)); + glBindTexture(GL_TEXTURE_2D, *static_cast(font->data)); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, + c_texsz,c_texsz, 0, + GL_ALPHA, GL_UNSIGNED_BYTE, + font_bmp); + delete [] font_bmp; +} + +void OpenGL::FreeFont(Gwk::Font* font) +{ + // TODO - unbind texture + delete [] static_cast(font->data); + delete [] static_cast(font->render_data); +} + +void OpenGL::RenderText(Gwk::Font* font, Gwk::Point pos, + const Gwk::String& text) +{ + if (font->facename.empty()) + return; + + if (!font->data) + LoadFont(font); + + Texture tex; + tex.data = font->data; + + float x = pos.x, y = pos.y; + const char *pc = text.c_str(); + size_t slen = text.length(); + + const float height = font->realsize / c_pixToPoints; + while (slen > 0) + { + if (*pc >= 32 && *pc <= 127) { - if (font->facename.empty()) - return; - - if (!font->data) - LoadFont(font); - - Texture tex; - tex.data = font->data; - - float x = pos.x, y = pos.y; - const char *pc = text.c_str(); - size_t slen = text.length(); - - const float height = font->realsize / c_pixToPoints; - while (slen > 0) - { - if (*pc >= 32 && *pc <= 127) - { - stbtt_aligned_quad q; - stbtt_GetBakedQuad(static_cast(font->render_data), - c_texsz,c_texsz, - *pc - 32, - &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 - - Rect r(q.x0, height + q.y0, q.x1 - q.x0, q.y1 - q.y0); - DrawTexturedRect(&tex, r, q.s0,q.t0, q.s1,q.t1); - } - ++pc, --slen; - } + stbtt_aligned_quad q; + stbtt_GetBakedQuad(static_cast(font->render_data), + c_texsz,c_texsz, + *pc - 32, + &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 + + Rect r(q.x0, height + q.y0, q.x1 - q.x0, q.y1 - q.y0); + DrawTexturedRect(&tex, r, q.s0,q.t0, q.s1,q.t1); } + ++pc, --slen; + } +} - Gwk::Point OpenGL::MeasureText(Gwk::Font* font, const Gwk::String& text) +Gwk::Point OpenGL::MeasureText(Gwk::Font* font, const Gwk::String& text) +{ + Point sz(0, font->realsize * c_pixToPoints); + + if (font->facename.empty()) + return sz; + + if (!font->data) + LoadFont(font); + + float x = 0.f, y = 0.f; + const char *pc = text.c_str(); + size_t slen = text.length(); + + while (slen > 0) + { + if (*pc >= 32 && *pc <= 127) { - Point sz(0, font->realsize * c_pixToPoints); - - if (font->facename.empty()) - return sz; + stbtt_aligned_quad q; + stbtt_GetBakedQuad(static_cast(font->render_data), + c_texsz,c_texsz, + *pc - 32, + &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 - if (!font->data) - LoadFont(font); - - float x = 0.f, y = 0.f; - const char *pc = text.c_str(); - size_t slen = text.length(); - - while (slen > 0) - { - if (*pc >= 32 && *pc <= 127) - { - stbtt_aligned_quad q; - stbtt_GetBakedQuad(static_cast(font->render_data), - c_texsz,c_texsz, - *pc - 32, - &x, &y, &q, 1); // 1=opengl & d3d10+,0=d3d9 - - sz.x = q.x1; - sz.y = std::max(sz.y, int(q.y1 - q.y0)); - } - ++pc, --slen; - } - - return sz; + sz.x = q.x1; + sz.y = std::max(sz.y, int(q.y1 - q.y0)); } + ++pc, --slen; + } + + return sz; +} - bool OpenGL::InitializeContext(Gwk::WindowProvider* window) - { +bool OpenGL::InitializeContext(Gwk::WindowProvider* window) +{ #ifdef _WIN32 - HWND hwnd = (HWND)window->GetWindow(); - - if (!hwnd) - return false; - - HDC hDC = GetDC(hwnd); - // - // Set the pixel format - // - PIXELFORMATDESCRIPTOR pfd; - memset(&pfd, 0, sizeof(pfd)); - pfd.nSize = sizeof(pfd); - pfd.nVersion = 1; - pfd.dwFlags = PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|PFD_DOUBLEBUFFER; - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cColorBits = 24; - pfd.cDepthBits = 32; - pfd.iLayerType = PFD_MAIN_PLANE; - int iFormat = ChoosePixelFormat(hDC, &pfd); - SetPixelFormat(hDC, iFormat, &pfd); - HGLRC hRC; - hRC = wglCreateContext(hDC); - wglMakeCurrent(hDC, hRC); - RECT r; - - if (GetClientRect(hwnd, &r)) - { - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(r.left, r.right, r.bottom, r.top, -1.0, 1.0); - glMatrixMode(GL_MODELVIEW); - glViewport(0, 0, r.right-r.left, r.bottom-r.top); - } - - m_context = (void*)hRC; - return true; + HWND hwnd = (HWND)window->GetWindow(); + + if (!hwnd) + return false; + + HDC hDC = GetDC(hwnd); + // + // Set the pixel format + // + PIXELFORMATDESCRIPTOR pfd; + memset(&pfd, 0, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|PFD_DOUBLEBUFFER; + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.cColorBits = 24; + pfd.cDepthBits = 32; + pfd.iLayerType = PFD_MAIN_PLANE; + int iFormat = ChoosePixelFormat(hDC, &pfd); + SetPixelFormat(hDC, iFormat, &pfd); + HGLRC hRC; + hRC = wglCreateContext(hDC); + wglMakeCurrent(hDC, hRC); + RECT r; + + if (GetClientRect(hwnd, &r)) + { + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(r.left, r.right, r.bottom, r.top, -1.0, 1.0); + glMatrixMode(GL_MODELVIEW); + glViewport(0, 0, r.right-r.left, r.bottom-r.top); + } + + m_context = (void*)hRC; + return true; #endif // ifdef _WIN32 - return false; - } + return false; +} - bool OpenGL::ShutdownContext(Gwk::WindowProvider* window) - { +bool OpenGL::ShutdownContext(Gwk::WindowProvider* window) +{ #ifdef _WIN32 - wglDeleteContext((HGLRC)m_context); - return true; + wglDeleteContext((HGLRC)m_context); + return true; #endif - return false; - } + return false; +} - bool OpenGL::PresentContext(Gwk::WindowProvider* window) - { +bool OpenGL::PresentContext(Gwk::WindowProvider* window) +{ #ifdef _WIN32 - HWND hwnd = (HWND)window->GetWindow(); + HWND hwnd = (HWND)window->GetWindow(); - if (!hwnd) - return false; + if (!hwnd) + return false; - HDC hDC = GetDC(hwnd); - SwapBuffers(hDC); - return true; + HDC hDC = GetDC(hwnd); + SwapBuffers(hDC); + return true; #endif - return false; - } + return false; +} - bool OpenGL::ResizedContext(Gwk::WindowProvider* window, int w, int h) - { +bool OpenGL::ResizedContext(Gwk::WindowProvider* window, int w, int h) +{ #ifdef _WIN32 - RECT r; - - if (GetClientRect((HWND)window->GetWindow(), &r)) - { - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(r.left, r.right, r.bottom, r.top, -1.0, 1.0); - glMatrixMode(GL_MODELVIEW); - glViewport(0, 0, r.right-r.left, r.bottom-r.top); - } - - return true; + RECT r; + + if (GetClientRect((HWND)window->GetWindow(), &r)) + { + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(r.left, r.right, r.bottom, r.top, -1.0, 1.0); + glMatrixMode(GL_MODELVIEW); + glViewport(0, 0, r.right-r.left, r.bottom-r.top); + } + + return true; #endif // ifdef _WIN32 - return false; - } + return false; +} - bool OpenGL::BeginContext(Gwk::WindowProvider* window) - { - glClearColor(0.5f, 0.5f, 0.5f, 1.0f); - glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); - return true; - } +bool OpenGL::BeginContext(Gwk::WindowProvider* window) +{ + glClearColor(0.5f, 0.5f, 0.5f, 1.0f); + glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); + return true; +} - bool OpenGL::EndContext(Gwk::WindowProvider* window) - { - return true; - } +bool OpenGL::EndContext(Gwk::WindowProvider* window) +{ + return true; +} - } +} } diff --git a/source/platform/renderers/SDL2/SDL2.cpp b/source/platform/renderers/SDL2/SDL2.cpp index 68fad53f..b6c19e33 100644 --- a/source/platform/renderers/SDL2/SDL2.cpp +++ b/source/platform/renderers/SDL2/SDL2.cpp @@ -9,241 +9,240 @@ namespace Gwk { - namespace Renderer +namespace Renderer +{ + +SDL2::SDL2(SDL_Window *window) +: m_window(window) +, m_renderer(nullptr) +{ + m_renderer = SDL_CreateRenderer(m_window, -1, + SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC); +} + +SDL2::~SDL2() +{ + SDL_DestroyRenderer(m_renderer); +} + +void SDL2::SetDrawColor(Gwk::Color color) +{ + m_color.r = color.r; + m_color.g = color.g; + m_color.b = color.b; + m_color.a = color.a; + + SDL_SetRenderDrawColor(m_renderer, color.r, color.g, color.b, color.a); +} + +void SDL2::LoadFont(Gwk::Font* font) +{ + font->realsize = font->size*Scale(); + std::string fontFile(font->facename); + + if (fontFile.find(".ttf") == std::string::npos) + fontFile += ".ttf"; + + TTF_Font *tfont = TTF_OpenFont(fontFile.c_str(), font->realsize); + if (!tfont) { + printf("Font load error: %s\n", TTF_GetError()); + } + + font->data = tfont; +} - SDL2::SDL2(SDL_Window *window) - : m_window(window) - , m_renderer(nullptr) - { - m_renderer = SDL_CreateRenderer(m_window, -1, - SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC); - } - - SDL2::~SDL2() - { - SDL_DestroyRenderer(m_renderer); - } - - void SDL2::SetDrawColor(Gwk::Color color) - { - m_color.r = color.r; - m_color.g = color.g; - m_color.b = color.b; - m_color.a = color.a; - - SDL_SetRenderDrawColor(m_renderer, color.r, color.g, color.b, color.a); - } - - void SDL2::LoadFont(Gwk::Font* font) - { - font->realsize = font->size*Scale(); - std::string fontFile(font->facename); - - if (fontFile.find(".ttf") == std::string::npos) - fontFile += ".ttf"; - - TTF_Font *tfont = TTF_OpenFont(fontFile.c_str(), font->realsize); - if (!tfont) - { - printf("Font load error: %s\n", TTF_GetError()); - } - - font->data = tfont; - } - - void SDL2::FreeFont(Gwk::Font* font) - { - if (font->data) - { - TTF_CloseFont(static_cast(font->data)); - font->data = nullptr; - } - } - - void SDL2::RenderText(Gwk::Font* font, Gwk::Point pos, const Gwk::String& text) - { - TTF_Font *tfont = static_cast(font->data); - Translate(pos.x, pos.y); - - SDL_Surface *surf = TTF_RenderUTF8_Blended(tfont, text.c_str(), m_color); - SDL_Texture *texture = SDL_CreateTextureFromSurface(m_renderer, surf); - SDL_FreeSurface(surf); - - int w, h; - SDL_QueryTexture(texture, nullptr, nullptr, &w, &h); - const SDL_Rect dest = { pos.x,pos.y, w,h }; - - SDL_RenderCopy(m_renderer, texture, nullptr, &dest); - - SDL_DestroyTexture(texture); - } - - Gwk::Point SDL2::MeasureText(Gwk::Font* font, const Gwk::String& text) - { - TTF_Font *tfont = static_cast(font->data); - - // If the font doesn't exist, or the font size should be changed. - if (!tfont || font->realsize != font->size*Scale()) - { - FreeFont(font); - LoadFont(font); - tfont = static_cast(font->data); - } - - if (!tfont) - return Gwk::Point(0, 0); - - int w,h; - TTF_SizeUTF8(tfont, text.c_str(), &w,&h); - - return Point(w,h); - } - - void SDL2::StartClip() - { - const Gwk::Rect &rect = ClipRegion(); - const SDL_Rect clip = { rect.x, rect.y, rect.w,rect.h }; - +void SDL2::FreeFont(Gwk::Font* font) +{ + if (font->data) + { + TTF_CloseFont(static_cast(font->data)); + font->data = nullptr; + } +} + +void SDL2::RenderText(Gwk::Font* font, Gwk::Point pos, const Gwk::String& text) +{ + TTF_Font *tfont = static_cast(font->data); + Translate(pos.x, pos.y); + + SDL_Surface *surf = TTF_RenderUTF8_Blended(tfont, text.c_str(), m_color); + SDL_Texture *texture = SDL_CreateTextureFromSurface(m_renderer, surf); + SDL_FreeSurface(surf); + + int w, h; + SDL_QueryTexture(texture, nullptr, nullptr, &w, &h); + const SDL_Rect dest = { pos.x,pos.y, w,h }; + + SDL_RenderCopy(m_renderer, texture, nullptr, &dest); + + SDL_DestroyTexture(texture); +} + +Gwk::Point SDL2::MeasureText(Gwk::Font* font, const Gwk::String& text) +{ + TTF_Font *tfont = static_cast(font->data); + + // If the font doesn't exist, or the font size should be changed. + if (!tfont || font->realsize != font->size*Scale()) + { + FreeFont(font); + LoadFont(font); + tfont = static_cast(font->data); + } + + if (!tfont) + return Gwk::Point(0, 0); + + int w,h; + TTF_SizeUTF8(tfont, text.c_str(), &w,&h); + + return Point(w,h); +} + +void SDL2::StartClip() +{ + const Gwk::Rect &rect = ClipRegion(); + const SDL_Rect clip = { rect.x, rect.y, rect.w,rect.h }; + // TODO - BAD! There seems to be something wrong with clip rectangles in SDL2. // https://bugzilla.libsdl.org/show_bug.cgi?id=2700 // SDL_RenderSetClipRect(m_renderer, &clip); - } - - void SDL2::EndClip() - { - SDL_RenderSetClipRect(m_renderer, 0); - } - - void SDL2::LoadTexture(Gwk::Texture* texture) - { - if (!texture) - return; - - if (texture->data) - FreeTexture(texture); - - SDL_Texture *tex = nullptr; - if (texture->readable) - { - // You cannot find the format of a texture once loaded to read from it - // in SDL2 so we have to keep the surface to read from. - SDL_Surface *surf = IMG_Load(texture->name.c_str()); - tex = SDL_CreateTextureFromSurface(m_renderer, surf); - texture->surface = surf; - } - else - { - // Don't need to read. Just load straight into render format. - tex = IMG_LoadTexture(m_renderer, texture->name.c_str()); - } - - if (tex) - { - int w, h; - SDL_QueryTexture(tex, nullptr, nullptr, &w, &h); - - texture->data = tex; - texture->width = w; - texture->height = h; - texture->failed = false; - } - else - { - texture->data = nullptr; - texture->failed = true; - } - } - - void SDL2::FreeTexture(Gwk::Texture* texture) - { - SDL_DestroyTexture(static_cast(texture->data)); - texture->data = nullptr; - - if (texture->surface) - { - SDL_FreeSurface(static_cast(texture->surface)); - texture->surface = nullptr; - texture->readable = false; - } - } - - void SDL2::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, - float u1, float v1, float u2, float v2) - { - SDL_Texture *tex = static_cast(texture->data); - - if (!tex) - return DrawMissingImage(rect); - - Translate(rect); - - const unsigned int w = texture->width; - const unsigned int h = texture->height; - - const SDL_Rect source = { int(u1*w), int(v1*h), int((u2-u1)*w), int((v2-v1)*h) }, - dest = { rect.x, rect.y, rect.w, rect.h }; - - SDL_RenderCopy(m_renderer, tex, &source, &dest); - } - - Gwk::Color SDL2::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, - const Gwk::Color& col_default) - { - SDL_Surface *surf = static_cast(texture->surface); - - if (!texture->readable || !surf) - return col_default; - - if (SDL_MUSTLOCK(surf) != 0) - SDL_LockSurface(surf); - - const char *mem = static_cast(surf->pixels) + y*surf->pitch + x*sizeof(Uint32); - const Uint32 pix = *reinterpret_cast(mem); - - Gwk::Color col; - SDL_GetRGBA(pix, surf->format, &col.r, &col.g, &col.b, &col.a); - - if (SDL_MUSTLOCK(surf) != 0) - SDL_UnlockSurface(surf); - - return col; - } - - void SDL2::DrawFilledRect(Gwk::Rect rect) - { - Translate(rect); - - const SDL_Rect srect = { rect.x, rect.y, rect.w, rect.h }; - SDL_RenderFillRect(m_renderer, &srect); - } - - void SDL2::DrawLinedRect(Gwk::Rect rect) - { - Translate(rect); - - const SDL_Rect srect = { rect.x, rect.y, rect.w, rect.h }; - SDL_RenderDrawRect(m_renderer, &srect); - } - - bool SDL2::BeginContext(Gwk::WindowProvider* ) - { - SDL_RenderClear(m_renderer); - SDL_SetRenderDrawBlendMode(m_renderer, SDL_BLENDMODE_BLEND); - return true; - } - - bool SDL2::EndContext(Gwk::WindowProvider* window) - { - return true; - } - - bool SDL2::PresentContext(Gwk::WindowProvider* window) - { - SDL_RenderPresent(m_renderer); - return true; - } +} + +void SDL2::EndClip() +{ + SDL_RenderSetClipRect(m_renderer, 0); +} + +void SDL2::LoadTexture(Gwk::Texture* texture) +{ + if (!texture) + return; + + if (texture->data) + FreeTexture(texture); + + SDL_Texture *tex = nullptr; + if (texture->readable) + { + // You cannot find the format of a texture once loaded to read from it + // in SDL2 so we have to keep the surface to read from. + SDL_Surface *surf = IMG_Load(texture->name.c_str()); + tex = SDL_CreateTextureFromSurface(m_renderer, surf); + texture->surface = surf; + } + else + { + // Don't need to read. Just load straight into render format. + tex = IMG_LoadTexture(m_renderer, texture->name.c_str()); + } + if (tex) + { + int w, h; + SDL_QueryTexture(tex, nullptr, nullptr, &w, &h); - } // Renderer + texture->data = tex; + texture->width = w; + texture->height = h; + texture->failed = false; + } + else + { + texture->data = nullptr; + texture->failed = true; + } +} + +void SDL2::FreeTexture(Gwk::Texture* texture) +{ + SDL_DestroyTexture(static_cast(texture->data)); + texture->data = nullptr; + + if (texture->surface) + { + SDL_FreeSurface(static_cast(texture->surface)); + texture->surface = nullptr; + texture->readable = false; + } +} + +void SDL2::DrawTexturedRect(Gwk::Texture* texture, Gwk::Rect rect, + float u1, float v1, float u2, float v2) +{ + SDL_Texture *tex = static_cast(texture->data); + + if (!tex) + return DrawMissingImage(rect); + + Translate(rect); + + const unsigned int w = texture->width; + const unsigned int h = texture->height; + + const SDL_Rect source = { int(u1*w), int(v1*h), int((u2-u1)*w), int((v2-v1)*h) }, + dest = { rect.x, rect.y, rect.w, rect.h }; + + SDL_RenderCopy(m_renderer, tex, &source, &dest); +} + +Gwk::Color SDL2::PixelColour(Gwk::Texture* texture, unsigned int x, unsigned int y, + const Gwk::Color& col_default) +{ + SDL_Surface *surf = static_cast(texture->surface); + + if (!texture->readable || !surf) + return col_default; + + if (SDL_MUSTLOCK(surf) != 0) + SDL_LockSurface(surf); + + const char *mem = static_cast(surf->pixels) + y*surf->pitch + x*sizeof(Uint32); + const Uint32 pix = *reinterpret_cast(mem); + + Gwk::Color col; + SDL_GetRGBA(pix, surf->format, &col.r, &col.g, &col.b, &col.a); + + if (SDL_MUSTLOCK(surf) != 0) + SDL_UnlockSurface(surf); + + return col; +} + +void SDL2::DrawFilledRect(Gwk::Rect rect) +{ + Translate(rect); + + const SDL_Rect srect = { rect.x, rect.y, rect.w, rect.h }; + SDL_RenderFillRect(m_renderer, &srect); +} + +void SDL2::DrawLinedRect(Gwk::Rect rect) +{ + Translate(rect); + + const SDL_Rect srect = { rect.x, rect.y, rect.w, rect.h }; + SDL_RenderDrawRect(m_renderer, &srect); +} + +bool SDL2::BeginContext(Gwk::WindowProvider* ) +{ + SDL_RenderClear(m_renderer); + SDL_SetRenderDrawBlendMode(m_renderer, SDL_BLENDMODE_BLEND); + return true; +} + +bool SDL2::EndContext(Gwk::WindowProvider* window) +{ + return true; +} + +bool SDL2::PresentContext(Gwk::WindowProvider* window) +{ + SDL_RenderPresent(m_renderer); + return true; +} + +} // Renderer } // Gwork From de5cb176dbc0121289361368e37a184cf5e746a0 Mon Sep 17 00:00:00 2001 From: Billy Quith Date: Wed, 18 May 2016 15:01:40 +0100 Subject: [PATCH 25/54] Remove broken Renderers. --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 1a0aa6d6..f73b79d3 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,8 @@ Gwork (*pronounced "gw-orc"*) is a fork of the GUI library [GWEN][gwen]. It was to fix issues with GWEN and add new features. A number of rendering backends are provided for use, or as an example for your own: + * [Allegro5][al5] (cross-platform). - * TODO: Direct2D (Windows). - * TODO: DirectX9 (Windows). - * TODO: GDI+ (Windows). * OpenGL (cross-platform using GLFW). * [SDL2][sdl2] (cross-platform). * [SFML2][sfml2] (cross-platform). From fd657bc0768045553c2c934ce560a06944bfc647 Mon Sep 17 00:00:00 2001 From: BQ Date: Wed, 18 May 2016 15:02:29 +0100 Subject: [PATCH 26/54] Remove old project files. --- .../renderers/DirectX9/DirectX9Renderer.sln | 17 -- .../DirectX9/DirectX9Renderer.vcproj | 157 ------------------ 2 files changed, 174 deletions(-) delete mode 100644 source/platform/renderers/DirectX9/DirectX9Renderer.sln delete mode 100644 source/platform/renderers/DirectX9/DirectX9Renderer.vcproj diff --git a/source/platform/renderers/DirectX9/DirectX9Renderer.sln b/source/platform/renderers/DirectX9/DirectX9Renderer.sln deleted file mode 100644 index fd1d5c91..00000000 --- a/source/platform/renderers/DirectX9/DirectX9Renderer.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GWEN-Renderer-DirectX9", "DirectX9Renderer.vcproj", "{FF11886E-D46B-4F54-A8DA-FC96CCE95594}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FF11886E-D46B-4F54-A8DA-FC96CCE95594}.Release|Win32.ActiveCfg = Release|Win32 - {FF11886E-D46B-4F54-A8DA-FC96CCE95594}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/source/platform/renderers/DirectX9/DirectX9Renderer.vcproj b/source/platform/renderers/DirectX9/DirectX9Renderer.vcproj deleted file mode 100644 index 47848712..00000000 --- a/source/platform/renderers/DirectX9/DirectX9Renderer.vcproj +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 5c3f3b28c86c2d5f2c7cfbe9cfebaeb0b1e3e413 Mon Sep 17 00:00:00 2001 From: BQ Date: Fri, 20 May 2016 11:03:45 +0100 Subject: [PATCH 27/54] Use Allegro 5.2 - Update to current version. --- cmake/Config.cmake | 3 +-- cmake/Modules/{FindAllegro50.cmake => FindAllegro5.cmake} | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) rename cmake/Modules/{FindAllegro50.cmake => FindAllegro5.cmake} (89%) diff --git a/cmake/Config.cmake b/cmake/Config.cmake index bbb1a6e4..bf032523 100644 --- a/cmake/Config.cmake +++ b/cmake/Config.cmake @@ -61,8 +61,7 @@ endif(BUILD_SAMPLE) if(RENDER_ALLEGRO5) - # Use Allegro 5.0 as 5.1 is unstable. - find_package(Allegro50 REQUIRED) + find_package(Allegro5 REQUIRED) set(GWK_RENDER_NAME "Allegro5") set(GWK_RENDER_INCLUDES "${ALLEGRO5_INCLUDE_DIRS}") set(GWK_RENDER_LIBRARIES "${ALLEGRO5_LIBRARIES}") diff --git a/cmake/Modules/FindAllegro50.cmake b/cmake/Modules/FindAllegro5.cmake similarity index 89% rename from cmake/Modules/FindAllegro50.cmake rename to cmake/Modules/FindAllegro5.cmake index c4cde0b8..b278a182 100644 --- a/cmake/Modules/FindAllegro50.cmake +++ b/cmake/Modules/FindAllegro5.cmake @@ -1,4 +1,7 @@ -# Find Allegro 5.0 +# Find Allegro 5.x + +set(ALLEGRO_VERSION "5.2") # Required version +message("Looking for Allegro ${ALLEGRO_VERSION}") # Find headers find_path(ALLEGRO_INCLUDE @@ -28,7 +31,7 @@ mark_as_advanced(ALLEGRO_INCLUDE ALLEGRO_LIB_LIST) foreach(ALLEGRO_LIB_EACH ${ALLEGRO_LIB_LIST}) find_library(${ALLEGRO_LIB_EACH}_LIB NAMES - "${ALLEGRO_LIB_EACH}.5.0" + "${ALLEGRO_LIB_EACH}.${ALLEGRO_VERSION}" PATHS /usr/lib /usr/local/lib From 918f259d2976f669a3ac4570c902ab02ad0f99f8 Mon Sep 17 00:00:00 2001 From: BQ Date: Fri, 20 May 2016 11:07:32 +0100 Subject: [PATCH 28/54] Fix Allegro sample. - Fixes #21 --- source/gwork/include/Gwork/Skin.h | 1 + source/samples/Allegro5/Allegro5Sample.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/gwork/include/Gwork/Skin.h b/source/gwork/include/Gwork/Skin.h index 4fd158ec..63952f4f 100644 --- a/source/gwork/include/Gwork/Skin.h +++ b/source/gwork/include/Gwork/Skin.h @@ -10,6 +10,7 @@ #define GWK_SKIN_H #include +#include namespace Gwk { diff --git a/source/samples/Allegro5/Allegro5Sample.cpp b/source/samples/Allegro5/Allegro5Sample.cpp index bb10c9c4..d8be215d 100644 --- a/source/samples/Allegro5/Allegro5Sample.cpp +++ b/source/samples/Allegro5/Allegro5Sample.cpp @@ -65,7 +65,7 @@ int main(int argc, char** argv) canvas->SetBackgroundColor(Gwk::Color(150, 170, 170, 255)); // Create our unittest control (which is a Window with controls in it) - UnitTest* unit = new UnitTest(canvas); + auto unit = new TestFrame(canvas); unit->SetPos(10, 10); // Create a Windows Control helper From 1032dc38d78e1781f34a18a7346de8647ea7b159 Mon Sep 17 00:00:00 2001 From: Billy Quith Date: Fri, 20 May 2016 11:36:01 +0100 Subject: [PATCH 29/54] Note about cmake options. --- README.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f73b79d3..a37a109c 100644 --- a/README.md +++ b/README.md @@ -20,12 +20,20 @@ Get source code: * From git: `git clone https://github.com/billyquith/GWork.git gwork` or * [Download zip](https://github.com/billyquith/GWork/archive/gwork.zip) & unzip -CMake is used to generate the project files. +CMake is used to generate the project files. See `cmake -h` to see all the generators for +your platform. Only have one renderer per build directory. Choose renderer: + +* `-D RENDER_ALLEGRO5=ON` +* `-D RENDER_OPENGL=ON` +* `-D RENDER_SDL2=ON` +* `-D RENDER_SFML2=ON` + +For example to build SDL2 renderer using Ninja: ```bash cd gwork -mkdir build && cd build # put all build files in separate directory -cmake -G Ninja -DRENDER_SDL2=ON .. # create Ninja project files with SDL2 renderer +mkdir build && cd build # put all build files in separate directory +cmake -G Ninja -D RENDER_SDL2=ON .. # create Ninja project files with SDL2 renderer ``` Providing the dependencies are present, this will create a sample executable. When run it will From d5dc1467a4a8dea0ab7d5678a9a18bb8cc2ccb8d Mon Sep 17 00:00:00 2001 From: "Grant Gangi [bubble-tea]" Date: Sun, 22 May 2016 20:37:39 -0400 Subject: [PATCH 30/54] Add clipboard functionality for Allegro As of Allegro 5.1.12 there has been support for getting and setting clipboard text. --- source/platform/platforms/Allegro5Platform.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/source/platform/platforms/Allegro5Platform.cpp b/source/platform/platforms/Allegro5Platform.cpp index 0390c2eb..da268351 100644 --- a/source/platform/platforms/Allegro5Platform.cpp +++ b/source/platform/platforms/Allegro5Platform.cpp @@ -21,7 +21,7 @@ static Gwk::Input::Allegro g_gworkInput; static ALLEGRO_EVENT_QUEUE* g_event_queue = nullptr; static ALLEGRO_DISPLAY* g_display = nullptr; -static Gwk::String gs_ClipboardEmulator; +static Gwk::String gs_clipboard; static const ALLEGRO_SYSTEM_MOUSE_CURSOR g_cursorConversion[] = { @@ -50,13 +50,22 @@ void Gwk::Platform::SetCursor(unsigned char iCursor) Gwk::String Gwk::Platform::GetClipboardText() { - return gs_ClipboardEmulator; + if (al_clipboard_has_text(g_display) { + char* clip = al_get_clipboard_text(g_display); + + if (clip != NULL) { + gs_clipboard = clip; + al_free(clip); + } + } + + return gs_clipboard; } bool Gwk::Platform::SetClipboardText(const Gwk::String& str) { - gs_ClipboardEmulator = str; - return true; + gs_clipboard = str; + return al_set_clipboard_text(g_display, gs_clipboard.c_str()); } float Gwk::Platform::GetTimeInSeconds() From fba4bb6575114efcb5d32997189277844704df6b Mon Sep 17 00:00:00 2001 From: "Grant Gangi [bubble-tea]" Date: Mon, 23 May 2016 18:30:20 -0400 Subject: [PATCH 31/54] fixup! Add clipboard functionality for Allegro --- source/platform/platforms/Allegro5Platform.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/source/platform/platforms/Allegro5Platform.cpp b/source/platform/platforms/Allegro5Platform.cpp index da268351..1674bbd4 100644 --- a/source/platform/platforms/Allegro5Platform.cpp +++ b/source/platform/platforms/Allegro5Platform.cpp @@ -21,7 +21,6 @@ static Gwk::Input::Allegro g_gworkInput; static ALLEGRO_EVENT_QUEUE* g_event_queue = nullptr; static ALLEGRO_DISPLAY* g_display = nullptr; -static Gwk::String gs_clipboard; static const ALLEGRO_SYSTEM_MOUSE_CURSOR g_cursorConversion[] = { @@ -50,22 +49,25 @@ void Gwk::Platform::SetCursor(unsigned char iCursor) Gwk::String Gwk::Platform::GetClipboardText() { - if (al_clipboard_has_text(g_display) { + Gwk::String str; + + if (al_clipboard_has_text(g_display) ) + { char* clip = al_get_clipboard_text(g_display); - if (clip != NULL) { - gs_clipboard = clip; + if (clip != nullptr) + { + str = clip; al_free(clip); } } - return gs_clipboard; + return str; } bool Gwk::Platform::SetClipboardText(const Gwk::String& str) { - gs_clipboard = str; - return al_set_clipboard_text(g_display, gs_clipboard.c_str()); + return al_set_clipboard_text(g_display, str.c_str()); } float Gwk::Platform::GetTimeInSeconds() From bb66515cb036b68419cfd8988552daeb0e4c8a06 Mon Sep 17 00:00:00 2001 From: Bill Quith Date: Mon, 18 Jul 2016 11:14:01 +0100 Subject: [PATCH 32/54] Format for markdown --- LICENSE.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 12ab71ff..16bdcd84 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,8 @@ MIT License +----------- -Copyright (C) 2012 Garry Newman -Copyright (C) 2015-2016 Billy Quith +- Copyright (C) 2012 Garry Newman +- Copyright (C) 2015-2016 Bill Quith Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: From dadbf4fba08cd53ad212dc139eae80df985167e5 Mon Sep 17 00:00:00 2001 From: BQ Date: Mon, 18 Jul 2016 13:00:33 +0100 Subject: [PATCH 33/54] Fix input modifiers mistakenly inputting text. - Fixes issue #24. - Allegro mapping was using keycodes as ASCII instead of Allegro mapped values. --- source/gwork/include/Gwork/Controls/Canvas.h | 14 +++++-- source/gwork/source/Controls/Canvas.cpp | 5 ++- .../platform/include/Gwork/Input/Allegro5.h | 37 +++++++++++-------- source/platform/include/Gwork/Input/OpenGL.h | 2 +- source/platform/include/Gwork/Input/SDL13.h | 2 +- source/platform/include/Gwork/Input/SDL2.h | 2 +- source/platform/include/Gwork/Input/SFML2.h | 2 +- source/platform/include/Gwork/Input/Windows.h | 2 +- .../include/Gwork/InputEventListener.h | 5 ++- source/platform/include/Gwork/PlatformTypes.h | 2 +- 10 files changed, 45 insertions(+), 28 deletions(-) diff --git a/source/gwork/include/Gwork/Controls/Canvas.h b/source/gwork/include/Gwork/Controls/Canvas.h index cd7ebaa4..3b4cefe9 100644 --- a/source/gwork/include/Gwork/Controls/Canvas.h +++ b/source/gwork/include/Gwork/Controls/Canvas.h @@ -49,7 +49,7 @@ namespace Gwk // Internal. Do not call directly. virtual void Render(Skin::Base* render) override; - /// Childpanels call parent->GetCanvas() until they get to + /// Child panels call parent->GetCanvas() until they get to /// this top level function. virtual Controls::Canvas* GetCanvas() override { @@ -76,9 +76,17 @@ namespace Gwk /// \sect{Input} bool InputMouseMoved(int x, int y, int deltaX, int deltaY) override; - bool InputMouseButton(int iButton, bool bDown) override; - bool InputKey(int iKey, bool bDown) override; + bool InputMouseButton(int iButton, bool bDown) override; + /// A modifier key was inputted. + /// \param key - Key code + /// \param down - Key state. Pressed? + /// \return Event consumed? + bool InputModifierKey(int key, bool down) override; + /// A character was entered on the keyboard. + /// \param chr - Unicode character code. + /// \return Event consumed? bool InputCharacter(Gwk::UnicodeChar chr) override; + bool InputMouseWheel(int val) override; bool InputQuit() override { diff --git a/source/gwork/source/Controls/Canvas.cpp b/source/gwork/source/Controls/Canvas.cpp index 27482956..d07c8c38 100644 --- a/source/gwork/source/Controls/Canvas.cpp +++ b/source/gwork/source/Controls/Canvas.cpp @@ -199,7 +199,7 @@ bool Canvas::InputMouseButton(int iButton, bool bDown) return Gwk::Input::OnMouseClicked(this, iButton, bDown); } -bool Canvas::InputKey(int iKey, bool bDown) +bool Canvas::InputModifierKey(int iKey, bool bDown) { if (Hidden()) return false; @@ -218,7 +218,8 @@ bool Canvas::InputCharacter(Gwk::UnicodeChar chr) if (Hidden()) return false; - if (!iswprint(chr)) + // Check if character is printable, i.e. don't want hidden codes, like backspace. + if (!isprint(chr)) return false; // Handle Accelerators diff --git a/source/platform/include/Gwork/Input/Allegro5.h b/source/platform/include/Gwork/Input/Allegro5.h index 7e66509c..8f60f034 100644 --- a/source/platform/include/Gwork/Input/Allegro5.h +++ b/source/platform/include/Gwork/Input/Allegro5.h @@ -72,23 +72,28 @@ namespace Gwk case ALLEGRO_KEY_DELETE: return Gwk::Key::Delete; + case ALLEGRO_KEY_LSHIFT: + return Gwk::Key::Shift; + case ALLEGRO_KEY_LCTRL: return Gwk::Key::Control; case ALLEGRO_KEY_ALT: return Gwk::Key::Alt; - case ALLEGRO_KEY_LSHIFT: - return Gwk::Key::Shift; + case ALLEGRO_KEY_COMMAND: + return Gwk::Key::Command; + case ALLEGRO_KEY_RSHIFT: + return Gwk::Key::Shift; + case ALLEGRO_KEY_RCTRL: return Gwk::Key::Control; case ALLEGRO_KEY_ALTGR: return Gwk::Key::Alt; - - case ALLEGRO_KEY_RSHIFT: - return Gwk::Key::Shift; + + default: ; } return Gwk::Key::Invalid; @@ -116,8 +121,9 @@ namespace Gwk case ALLEGRO_EVENT_MOUSE_BUTTON_DOWN: case ALLEGRO_EVENT_MOUSE_BUTTON_UP: - return m_eventListener->InputMouseButton(event.mouse.button-1, - event.type == ALLEGRO_EVENT_MOUSE_BUTTON_DOWN); + return m_eventListener->InputMouseButton( + event.mouse.button-1, + event.type == ALLEGRO_EVENT_MOUSE_BUTTON_DOWN); case ALLEGRO_EVENT_KEY_CHAR: return m_eventListener->InputCharacter(event.keyboard.unichar); @@ -125,18 +131,20 @@ namespace Gwk case ALLEGRO_EVENT_KEY_DOWN: case ALLEGRO_EVENT_KEY_UP: { - bool bPressed = (event.type == ALLEGRO_EVENT_KEY_DOWN); + const bool bPressed = (event.type == ALLEGRO_EVENT_KEY_DOWN); - if (event.keyboard.keycode + if (event.keyboard.keycode != 0 && bPressed - && event.keyboard.keycode >= 'a' - && event.keyboard.keycode <= 'z') + && event.keyboard.keycode >= ALLEGRO_KEY_A + && event.keyboard.keycode <= ALLEGRO_KEY_Z) { return m_eventListener->InputCharacter(event.keyboard.keycode); } - const unsigned char iKey = TranslateKeyCode(event.keyboard.keycode); - return m_eventListener->InputKey(iKey, bPressed); + const unsigned char key = TranslateKeyCode(event.keyboard.keycode); + return key == Gwk::Key::Invalid + ? false + : m_eventListener->InputModifierKey(key, bPressed); } } @@ -150,8 +158,7 @@ namespace Gwk int m_mouseY; }; - - } } + #endif // ifndef GWK_INPUT_ALLEGRO_H diff --git a/source/platform/include/Gwork/Input/OpenGL.h b/source/platform/include/Gwork/Input/OpenGL.h index da5625b6..e9ed22e3 100644 --- a/source/platform/include/Gwork/Input/OpenGL.h +++ b/source/platform/include/Gwork/Input/OpenGL.h @@ -114,7 +114,7 @@ namespace Gwk return m_eventListener->InputCharacter(keyCode); const unsigned char iKey = TranslateKeyCode(keyCode); - return m_eventListener->InputKey(iKey, bPressed); + return m_eventListener->InputModifierKey(iKey, bPressed); } bool ProcessMouseMove(int x, int y) diff --git a/source/platform/include/Gwork/Input/SDL13.h b/source/platform/include/Gwork/Input/SDL13.h index 15b761b1..68460c71 100644 --- a/source/platform/include/Gwork/Input/SDL13.h +++ b/source/platform/include/Gwork/Input/SDL13.h @@ -127,7 +127,7 @@ namespace Gwk return false; } - return m_canvas->InputKey(iKey, E->state); + return m_canvas->InputModifierKey(iKey, E->state); } case SDL_TEXTINPUT: diff --git a/source/platform/include/Gwork/Input/SDL2.h b/source/platform/include/Gwork/Input/SDL2.h index cf528b4a..eb63e5bc 100644 --- a/source/platform/include/Gwork/Input/SDL2.h +++ b/source/platform/include/Gwork/Input/SDL2.h @@ -69,7 +69,7 @@ namespace Gwk default: return false; } - return m_canvas->InputKey(iKey, ke->state != 0); + return m_canvas->InputModifierKey(iKey, ke->state != 0); } case SDL_TEXTINPUT: diff --git a/source/platform/include/Gwork/Input/SFML2.h b/source/platform/include/Gwork/Input/SFML2.h index a997fa55..f348ff90 100644 --- a/source/platform/include/Gwork/Input/SFML2.h +++ b/source/platform/include/Gwork/Input/SFML2.h @@ -133,7 +133,7 @@ namespace Gwk return m_eventListener->InputCharacter(keyCode); const unsigned char iKey = TranslateKeyCode(keyCode); - return m_eventListener->InputKey(iKey, bPressed); + return m_eventListener->InputModifierKey(iKey, bPressed); } default: diff --git a/source/platform/include/Gwork/Input/Windows.h b/source/platform/include/Gwork/Input/Windows.h index 856a6d8d..6b163f81 100644 --- a/source/platform/include/Gwork/Input/Windows.h +++ b/source/platform/include/Gwork/Input/Windows.h @@ -148,7 +148,7 @@ namespace Gwk iKey = Gwk::Key::Down; if (iKey != -1) - return m_canvas->InputKey(iKey, bDown); + return m_canvas->InputModifierKey(iKey, bDown); break; } diff --git a/source/platform/include/Gwork/InputEventListener.h b/source/platform/include/Gwork/InputEventListener.h index 9d221b57..623147a1 100644 --- a/source/platform/include/Gwork/InputEventListener.h +++ b/source/platform/include/Gwork/InputEventListener.h @@ -33,7 +33,8 @@ namespace Gwk Down = 13, Escape = 14, Alt = 15, - KeysCount = 16 //!< number of keys + Command = 16, // Mac command/clover + KeysCount //!< number of keys }; } @@ -44,7 +45,7 @@ namespace Gwk virtual bool InputMouseMoved(int x, int y, int deltaX, int deltaY) = 0; virtual bool InputMouseButton(int iButton, bool bDown) = 0; - virtual bool InputKey(int iKey, bool bDown) = 0; + virtual bool InputModifierKey(int iKey, bool bDown) = 0; virtual bool InputCharacter(Gwk::UnicodeChar chr) = 0; virtual bool InputMouseWheel(int val) = 0; virtual bool InputQuit() = 0; diff --git a/source/platform/include/Gwork/PlatformTypes.h b/source/platform/include/Gwork/PlatformTypes.h index 256b0713..310e0019 100644 --- a/source/platform/include/Gwork/PlatformTypes.h +++ b/source/platform/include/Gwork/PlatformTypes.h @@ -32,7 +32,7 @@ namespace Gwk // See: http://www.utf8everywhere.org // typedef std::string String; - typedef char UnicodeChar; + typedef char UnicodeChar; // TODO - deal with multibyte UTF8 chars. namespace CursorType { From 2796edcdc8ddd1cf1fef1b7efcb794ab634e98b5 Mon Sep 17 00:00:00 2001 From: BQ Date: Mon, 18 Jul 2016 13:00:51 +0100 Subject: [PATCH 34/54] Tidy. --- source/gwork/include/Gwork/Controls/Text.h | 6 +++--- source/gwork/include/Gwork/Controls/TextBox.h | 4 ++-- source/gwork/source/BaseRender.cpp | 2 +- source/gwork/source/Controls/TextBox.cpp | 11 +++-------- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/source/gwork/include/Gwork/Controls/Text.h b/source/gwork/include/Gwork/Controls/Text.h index 2b4d7be2..1b600aa4 100644 --- a/source/gwork/include/Gwork/Controls/Text.h +++ b/source/gwork/include/Gwork/Controls/Text.h @@ -102,9 +102,9 @@ namespace Gwk virtual void RefreshSizeWrap(); Gwk::String m_string; - Gwk::Font* m_font; - Gwk::Color m_color; - Gwk::Color m_colorOverride; + Gwk::Font *m_font; + Gwk::Color m_color; + Gwk::Color m_colorOverride; bool m_bWrap; bool m_bTextChanged; diff --git a/source/gwork/include/Gwork/Controls/TextBox.h b/source/gwork/include/Gwork/Controls/TextBox.h index 61f8cb53..eee483db 100644 --- a/source/gwork/include/Gwork/Controls/TextBox.h +++ b/source/gwork/include/Gwork/Controls/TextBox.h @@ -56,8 +56,8 @@ namespace Gwk virtual void OnMouseDoubleClickLeft(int x, int y) override; - virtual void EraseSelection(); - virtual bool HasSelection(); + virtual void EraseSelection(); + virtual bool HasSelection(); virtual String GetSelection(); virtual void SetCursorPos(int i); diff --git a/source/gwork/source/BaseRender.cpp b/source/gwork/source/BaseRender.cpp index da591ab5..24f979e6 100644 --- a/source/gwork/source/BaseRender.cpp +++ b/source/gwork/source/BaseRender.cpp @@ -151,7 +151,7 @@ void Base::RenderText(Gwk::Font* font, Gwk::Point pos, const Gwk::String& text) if (chr == ' ') continue; - Gwk::Rect r(pos.x+i*fSize*0.4f, pos.y, fSize*0.4f-1.0f, fSize); + Gwk::Rect r(pos.x + i*fSize*0.4f, pos.y, fSize*0.4f - 1.0f, fSize); // // This isn't important, it's just me messing around changing diff --git a/source/gwork/source/Controls/TextBox.cpp b/source/gwork/source/Controls/TextBox.cpp index 01048633..7f961569 100644 --- a/source/gwork/source/Controls/TextBox.cpp +++ b/source/gwork/source/Controls/TextBox.cpp @@ -60,9 +60,7 @@ bool TextBox::OnChar(Gwk::UnicodeChar c) if (c == '\t') return false; - Gwk::String str; - str += c; - InsertText(str); + InsertText(String{c}); return true; } @@ -520,14 +518,11 @@ void TextBoxMultiline::Render(Skin::Base* skin) int iSelectionStartPos = (m_cursorPos < m_cursorEnd) ? m_cursorPos : m_cursorEnd; int iSelectionEndPos = (m_cursorPos < m_cursorEnd) ? m_cursorEnd : m_cursorPos; -// int iFirstChar = 0; -// int iLastChar = 0; skin->GetRender()->SetDrawColor(Gwk::Color(50, 170, 255, 200)); m_rectSelectionBounds.h = m_text->GetFont()->size+2; for (int iLine = iSelectionStartLine; iLine <= iSelectionEndLine; ++iLine) { -// ControlsInternal::Text* line = m_text->GetLine(iLine); Gwk::Rect box = m_text->GetLineBox(iLine); box.x += m_text->X(); box.y += m_text->Y(); @@ -547,11 +542,11 @@ void TextBoxMultiline::Render(Skin::Base* skin) if (iLine == iSelectionEndLine) { Gwk::Rect pos = GetCharacterPosition(iSelectionEndPos); - m_rectSelectionBounds.w = pos.x-m_rectSelectionBounds.x; + m_rectSelectionBounds.w = pos.x - m_rectSelectionBounds.x; } else { - m_rectSelectionBounds.w = box.x+box.w-m_rectSelectionBounds.x; + m_rectSelectionBounds.w = box.x + box.w - m_rectSelectionBounds.x; } if (m_rectSelectionBounds.w < 1) m_rectSelectionBounds.w = 1; From 6c5c955bf8764a7d7ef0ec81ad80b0f2d1cfd413 Mon Sep 17 00:00:00 2001 From: BQ Date: Mon, 18 Jul 2016 13:17:05 +0100 Subject: [PATCH 35/54] Clarify origin of std::isprint --- source/gwork/source/Controls/Canvas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/gwork/source/Controls/Canvas.cpp b/source/gwork/source/Controls/Canvas.cpp index d07c8c38..eb1658bc 100644 --- a/source/gwork/source/Controls/Canvas.cpp +++ b/source/gwork/source/Controls/Canvas.cpp @@ -219,7 +219,7 @@ bool Canvas::InputCharacter(Gwk::UnicodeChar chr) return false; // Check if character is printable, i.e. don't want hidden codes, like backspace. - if (!isprint(chr)) + if (!std::isprint(chr)) return false; // Handle Accelerators From a1f5402aeb0df52d2db8c27e7c3bff5171b500cd Mon Sep 17 00:00:00 2001 From: BQ Date: Sun, 31 Jul 2016 19:23:26 +0100 Subject: [PATCH 36/54] - Output bin/lib to root. - cmake -D doesn't like spaces - Readme: use Allegro 5 instead of SDL2 as clipping bug not fixed --- CMakeLists.txt | 8 +++----- README.md | 19 +++++++++---------- cmake/Config.cmake | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c69f1788..a512c422 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,11 +15,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") set_property(GLOBAL PROPERTY USE_FOLDERS ON) # output directory -set(CMAKE_BINARY_DIR "${CMAKE_HOME_DIRECTORY}/build") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) # exe -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) # .a -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) # .dylib -make_directory(${CMAKE_BINARY_DIR}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin) # exe +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin) # .dylib +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib) # .a make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) make_directory(${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) diff --git a/README.md b/README.md index a37a109c..086634f9 100644 --- a/README.md +++ b/README.md @@ -23,25 +23,25 @@ Get source code: CMake is used to generate the project files. See `cmake -h` to see all the generators for your platform. Only have one renderer per build directory. Choose renderer: -* `-D RENDER_ALLEGRO5=ON` -* `-D RENDER_OPENGL=ON` -* `-D RENDER_SDL2=ON` -* `-D RENDER_SFML2=ON` +* `-DRENDER_ALLEGRO5=ON` +* `-DRENDER_OPENGL=ON` +* `-DRENDER_SDL2=ON` +* `-DRENDER_SFML2=ON` For example to build SDL2 renderer using Ninja: ```bash cd gwork -mkdir build && cd build # put all build files in separate directory -cmake -G Ninja -D RENDER_SDL2=ON .. # create Ninja project files with SDL2 renderer +mkdir build && cd build # put all build files in separate directory +cmake -GNinja -DRENDER_ALLEGRO5=ON .. # create Ninja project files with SDL2 renderer ``` Providing the dependencies are present, this will create a sample executable. When run it will demonstrate all of the controls available: ```bash -ninja # build project -bin/GworkSDL2Sample # run sample +ninja # build project +bin/GworkAllegro5Sample # run sample ``` ## Changes from GWEN @@ -80,6 +80,7 @@ bin/GworkSDL2Sample # run sample Please [report problems to Github][7] or they'll get lost. +BQ [gwen]: https://github.com/garrynewman/GWEN [sdl2]: https://www.libsdl.org/ @@ -91,5 +92,3 @@ Please [report problems to Github][7] or they'll get lost. [6]: http://industriousone.com/premake [7]: https://github.com/billyquith/GWork/issues "Bugs/Issues" - -BQ diff --git a/cmake/Config.cmake b/cmake/Config.cmake index bf032523..b3f39541 100644 --- a/cmake/Config.cmake +++ b/cmake/Config.cmake @@ -108,6 +108,6 @@ endif(NOT GWK_RENDER_NAME) list(REMOVE_DUPLICATES GWK_RENDER_INCLUDES) list(REMOVE_DUPLICATES GWK_RENDER_LIBRARIES) -message("Using renderer ${GWK_RENDER_NAME}") +message("Using renderer ${GWK_RENDER_NAME} on platform ${GWK_PLATFORM_NAME}") message("${GWK_RENDER_NAME} includes: ${GWK_RENDER_INCLUDES}") message("${GWK_RENDER_NAME} libs: ${GWK_RENDER_LIBRARIES}") From 5f461bd661019a5f9556266ca664182e9865aef0 Mon Sep 17 00:00:00 2001 From: BQ Date: Sun, 31 Jul 2016 19:36:32 +0100 Subject: [PATCH 37/54] - Correct readme - simplify gitignore --- .gitignore | 196 +---------------------------------------------------- LICENSE.md | 15 +++- README.md | 16 ++--- 3 files changed, 23 insertions(+), 204 deletions(-) diff --git a/.gitignore b/.gitignore index 158d356a..6b8c9d53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,197 +1,7 @@ *.doxcfg -################# -## Cmake -################# - -CMakeCache.txt -CMakeFiles -CMakeScripts -Makefile -cmake_install.cmake -install_manifest.txt - -.ninja_deps -.ninja_log -*.ninja - -################# -## Eclipse -################# - -*.pydevproject -.project -.metadata -#bin/** -tmp/** -tmp/**/* -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results -**/[Dd]ebug/ -**/[Rr]elease/ -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.vspscc -.builds -**/*.dotCover - -## TODO: If you have NuGet Package Restore enabled, uncomment this -#**/packages/ - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf - -# Visual Studio profiler -*.psess -*.vsp - -# ReSharper is a .NET coding add-in -_ReSharper* - -# Installshield output folder -[Ee]xpress - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish - -# Others -#[Bb]in -[Oo]bj -sql -TestResults -*.Cache -ClientBin -stylecop.* -~$* -*.dbmdl -Generated_Code #added for RIA/Silverlight projects - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML - - -############ -## Windows -############ - -# Windows image file caches -Thumbs.db - -# Folder config file -Desktop.ini - - -############# -## Python -############# - -*.py[co] - -# Packages -*.egg -*.egg-info -dist -build -eggs -parts -#bin -var -sdist -develop-eggs -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg - -# Mac crap -.DS_Store -*.dylib -*.a - -############ -## Xcode -############ - -*.pbxproj -xcschemes -*.xcuserstate -*.xcsettings -*.xcworkspacedata -*.xcuserdatad -*Instruments.trace* - +bin/ +lib/ +build*/ # user build directory diff --git a/LICENSE.md b/LICENSE.md index 16bdcd84..5aaaf3ae 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -4,8 +4,17 @@ MIT License - Copyright (C) 2012 Garry Newman - Copyright (C) 2015-2016 Bill Quith -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, +sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all copies or +substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT +OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 086634f9..8d529993 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,12 @@ your platform. Only have one renderer per build directory. Choose renderer: * `-DRENDER_SDL2=ON` * `-DRENDER_SFML2=ON` -For example to build SDL2 renderer using Ninja: +For example to build Allegro 5 renderer using Ninja: ```bash cd gwork -mkdir build && cd build # put all build files in separate directory -cmake -GNinja -DRENDER_ALLEGRO5=ON .. # create Ninja project files with SDL2 renderer +mkdir build && cd build # put build files in subdirectory +cmake -GNinja -DRENDER_ALLEGRO5=ON .. # create Ninja project files ``` Providing the dependencies are present, this will create a sample executable. When run it will @@ -51,7 +51,6 @@ bin/GworkAllegro5Sample # run sample * CMake is used to generate project files instead of Premake. CMake is much more comprehensive. * [SDL2][sdl2] renderer added. -* C++11 used. * [UTF-8 everywhere][5]. Unicode support simplified. * `Gwen::UnicodeString` removed. This assumed that all Unicode was best as a wide encoding. This is not the case on all platforms. @@ -61,6 +60,7 @@ bin/GworkAllegro5Sample # run sample * Documentation: * Any existing GWEN comments and docs formatted for [doxygen](http://doxygen.org). * Docs currently very minimal as GWEN has almost no documentation. +* C++11 used. * Cache to texture optimisation implemented (Allegro only). * No dependency on Bootil (Garry's personal library). * Fixes for [Allegro][al5]. e.g. text rendering. @@ -74,11 +74,11 @@ bin/GworkAllegro5Sample # run sample Github, Google Code, etc use 8 space tabs. GWEN uses 4 space tabs. This messes up the indentation when reading code on Github. * Brackets: [Allman][2]/BSD indentation. -* Line length ~100 chars. Github has width around 100. Easier for - 3 way merge. Everything on regular screen. +* Line length ~100 chars. Github has width around 100. Easier for 3 way merge. Everything + on regular screen. * camelCase variables. -Please [report problems to Github][7] or they'll get lost. +Please [report problems to Github][issues] or they'll get lost. BQ @@ -86,9 +86,9 @@ BQ [sdl2]: https://www.libsdl.org/ [sfml2]: http://www.sfml-dev.org [al5]: http://alleg.sourceforge.net +[issues]: https://github.com/billyquith/GWork/issues "Bugs/Issues" [1]: http://www.codinghorror.com/blog/2009/04/death-to-the-space-infidels.html "Interesting article on consistency" [2]: http://en.wikipedia.org/wiki/Indent_style#Allman_style "Not uncommon" [5]: http://www.utf8everywhere.org "Why you should use UTF8 everywhere." [6]: http://industriousone.com/premake -[7]: https://github.com/billyquith/GWork/issues "Bugs/Issues" From 22800655fdc94d510685f8719f12243feaa314a7 Mon Sep 17 00:00:00 2001 From: BQ Date: Tue, 2 Aug 2016 09:59:07 +0100 Subject: [PATCH 38/54] Use DebugBreak to break into debugger - cross platform debug break to fix issue #25 --- LICENSE.md | 34 +++++++- source/gwork/CMakeLists.txt | 1 + source/gwork/source/DebugBreak.h | 136 +++++++++++++++++++++++++++++++ source/gwork/source/Utility.cpp | 11 ++- 4 files changed, 174 insertions(+), 8 deletions(-) create mode 100644 source/gwork/source/DebugBreak.h diff --git a/LICENSE.md b/LICENSE.md index 5aaaf3ae..62717675 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,5 +1,6 @@ -MIT License ------------ + +GWEN/Gwork - MIT License +------------------------ - Copyright (C) 2012 Garry Newman - Copyright (C) 2015-2016 Bill Quith @@ -18,3 +19,32 @@ NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPO NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Debug Break +----------- + +Copyright (c) 2011-2015, Scott Tsai + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/source/gwork/CMakeLists.txt b/source/gwork/CMakeLists.txt index 14cdbb2b..c0d57c1b 100644 --- a/source/gwork/CMakeLists.txt +++ b/source/gwork/CMakeLists.txt @@ -112,6 +112,7 @@ set(GWK_SOURCES source/Anim.cpp source/BaseRender.cpp source/ControlList.cpp + source/DebugBreak.h source/DragAndDrop.cpp source/Events.cpp source/Gwork.cpp diff --git a/source/gwork/source/DebugBreak.h b/source/gwork/source/DebugBreak.h new file mode 100644 index 00000000..d6590f19 --- /dev/null +++ b/source/gwork/source/DebugBreak.h @@ -0,0 +1,136 @@ +/* Copyright (c) 2011-2015, Scott Tsai + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +// Source: https://github.com/scottt/debugbreak + +#ifndef DEBUG_BREAK_H +#define DEBUG_BREAK_H + +#ifdef _MSC_VER + +#define debug_break __debugbreak + +#else + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +enum { + /* gcc optimizers consider code after __builtin_trap() dead. + * Making __builtin_trap() unsuitable for breaking into the debugger */ + DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP = 0, +}; + +#if defined(__i386__) || defined(__x86_64__) +enum { HAVE_TRAP_INSTRUCTION = 1, }; +__attribute__((gnu_inline, always_inline)) +static void __inline__ trap_instruction(void) +{ + __asm__ volatile("int $0x03"); +} +#elif defined(__thumb__) +enum { HAVE_TRAP_INSTRUCTION = 1, }; +/* FIXME: handle __THUMB_INTERWORK__ */ +__attribute__((gnu_inline, always_inline)) +static void __inline__ trap_instruction(void) +{ + /* See 'arm-linux-tdep.c' in GDB source. + * Both instruction sequences below work. */ +#if 1 + /* 'eabi_linux_thumb_le_breakpoint' */ + __asm__ volatile(".inst 0xde01"); +#else + /* 'eabi_linux_thumb2_le_breakpoint' */ + __asm__ volatile(".inst.w 0xf7f0a000"); +#endif + + /* Known problem: + * After a breakpoint hit, can't stepi, step, or continue in GDB. + * 'step' stuck on the same instruction. + * + * Workaround: a new GDB command, + * 'debugbreak-step' is defined in debugbreak-gdb.py + * that does: + * (gdb) set $instruction_len = 2 + * (gdb) tbreak *($pc + $instruction_len) + * (gdb) jump *($pc + $instruction_len) + */ +} +#elif defined(__arm__) && !defined(__thumb__) +enum { HAVE_TRAP_INSTRUCTION = 1, }; +__attribute__((gnu_inline, always_inline)) +static void __inline__ trap_instruction(void) +{ + /* See 'arm-linux-tdep.c' in GDB source, + * 'eabi_linux_arm_le_breakpoint' */ + __asm__ volatile(".inst 0xe7f001f0"); + /* Has same known problem and workaround + * as Thumb mode */ +} +#elif defined(__aarch64__) +enum { HAVE_TRAP_INSTRUCTION = 1, }; +__attribute__((gnu_inline, always_inline)) +static void __inline__ trap_instruction(void) +{ + /* See 'aarch64-tdep.c' in GDB source, + * 'aarch64_default_breakpoint' */ + __asm__ volatile(".inst 0xd4200000"); +} +#else +enum { HAVE_TRAP_INSTRUCTION = 0, }; +#endif + +__attribute__((gnu_inline, always_inline)) +static void __inline__ debug_break(void) +{ + if (HAVE_TRAP_INSTRUCTION) { + trap_instruction(); + } else if (DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP) { + /* raises SIGILL on Linux x86{,-64}, to continue in gdb: + * (gdb) handle SIGILL stop nopass + * */ + __builtin_trap(); + } else { + #ifdef _WIN32 + /* SIGTRAP available only on POSIX-compliant operating systems + * use builtin trap instead */ + __builtin_trap(); + #else + raise(SIGTRAP); + #endif + } +} + +#ifdef __cplusplus +} +#endif + +#endif + +#endif // DEBUG_BREAK_H diff --git a/source/gwork/source/Utility.cpp b/source/gwork/source/Utility.cpp index ff1bac23..64100280 100644 --- a/source/gwork/source/Utility.cpp +++ b/source/gwork/source/Utility.cpp @@ -15,6 +15,8 @@ #include // Narrow/widen #include // Narrow/widen - C++11 +#include "DebugBreak.h" + namespace Gwk { namespace Utility { @@ -320,14 +322,11 @@ void AssertCheck(bool b, const char* strMsg) if (!b) { Msg("Assert: %s\n", strMsg); -#ifdef WIN32 - MessageBoxA(nullptr, strMsg, "Assert", MB_ICONEXCLAMATION | MB_OK); - _asm { int 3 } // Break to debugger. -#endif -#ifdef __APPLE__ - __builtin_trap(); // Break to debugger. +#if defined(WIN32) + MessageBoxA(nullptr, strMsg, "Assert", MB_ICONEXCLAMATION | MB_OK); #endif + debug_break(); // break into debugger } } From 048056d75770f2fc26805f368f7aa32120573251 Mon Sep 17 00:00:00 2001 From: Hayden Curran Date: Tue, 2 Aug 2016 22:01:06 +1200 Subject: [PATCH 39/54] Changes to get GWork to compile on Windows/VS2015 --- source/gwork/include/Gwork/Controls/Label.h | 2 +- source/gwork/source/Controls/Canvas.cpp | 3 +-- source/gwork/source/Utility.cpp | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/source/gwork/include/Gwork/Controls/Label.h b/source/gwork/include/Gwork/Controls/Label.h index ce38ace4..84260737 100644 --- a/source/gwork/include/Gwork/Controls/Label.h +++ b/source/gwork/include/Gwork/Controls/Label.h @@ -41,7 +41,7 @@ namespace Gwk virtual void SizeToContents(); - virtual void SetAlignment(enum Position area); + virtual void SetAlignment(Position area); virtual Position GetAlignment(); virtual void SetFont(Gwk::String strFacename, int iSize, bool bBold); diff --git a/source/gwork/source/Controls/Canvas.cpp b/source/gwork/source/Controls/Canvas.cpp index eb1658bc..17f8c460 100644 --- a/source/gwork/source/Controls/Canvas.cpp +++ b/source/gwork/source/Controls/Canvas.cpp @@ -5,7 +5,6 @@ * See license in Gwork.h */ - #include #include #include @@ -219,7 +218,7 @@ bool Canvas::InputCharacter(Gwk::UnicodeChar chr) return false; // Check if character is printable, i.e. don't want hidden codes, like backspace. - if (!std::isprint(chr)) + if (!isprint(chr)) return false; // Handle Accelerators diff --git a/source/gwork/source/Utility.cpp b/source/gwork/source/Utility.cpp index 64100280..7b18c662 100644 --- a/source/gwork/source/Utility.cpp +++ b/source/gwork/source/Utility.cpp @@ -15,6 +15,11 @@ #include // Narrow/widen #include // Narrow/widen - C++11 +#ifdef WIN32 +#define WIN32_LEAN_AND_MEAN +#include +#endif + #include "DebugBreak.h" namespace Gwk { From e76a592398b8b48799e8a4f58ec4c473abb3de23 Mon Sep 17 00:00:00 2001 From: Hayden Curran Date: Tue, 2 Aug 2016 22:41:13 +1200 Subject: [PATCH 40/54] Add header for std::isprint --- source/gwork/source/Controls/Canvas.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/gwork/source/Controls/Canvas.cpp b/source/gwork/source/Controls/Canvas.cpp index 17f8c460..63b473ed 100644 --- a/source/gwork/source/Controls/Canvas.cpp +++ b/source/gwork/source/Controls/Canvas.cpp @@ -16,6 +16,8 @@ #include #endif +#include + using namespace Gwk::Controls; @@ -218,7 +220,7 @@ bool Canvas::InputCharacter(Gwk::UnicodeChar chr) return false; // Check if character is printable, i.e. don't want hidden codes, like backspace. - if (!isprint(chr)) + if (!std::isprint(chr)) return false; // Handle Accelerators From cca52e248d7c752de4ada8b24cd9a40cd85e8792 Mon Sep 17 00:00:00 2001 From: BQ Date: Tue, 2 Aug 2016 12:44:46 +0100 Subject: [PATCH 41/54] cmake: Make MacOS package - This fixes hi-res screen for Allegro5. See Allegro5 notes on building apps for OSX. Use C++11 def to build C++11. --- CMakeLists.txt | 2 + source/gwork/CMakeLists.txt | 1 - source/platform/CMakeLists.txt | 1 - source/samples/CMakeLists.txt | 83 +++++++++++++++++++--------------- source/test/CMakeLists.txt | 1 - 5 files changed, 49 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a512c422..ba0343c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,8 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin) # .dylib set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib) # .a make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) make_directory(${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) + +add_definitions(-std=c++11) # configure projects include(${CMAKE_SOURCE_DIR}/cmake/Config.cmake) diff --git a/source/gwork/CMakeLists.txt b/source/gwork/CMakeLists.txt index c0d57c1b..6b20b0c3 100644 --- a/source/gwork/CMakeLists.txt +++ b/source/gwork/CMakeLists.txt @@ -212,7 +212,6 @@ source_group("${GWK_SOURCE_FOLDER}\\Controls\\Dialog" # Gwork library add_library(Gwork STATIC ${GWK_HEADERS} ${GWK_SOURCES}) -target_compile_features(Gwork PUBLIC cxx_override) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/Gwork DESTINATION include) diff --git a/source/platform/CMakeLists.txt b/source/platform/CMakeLists.txt index 474fab01..4a428c27 100644 --- a/source/platform/CMakeLists.txt +++ b/source/platform/CMakeLists.txt @@ -33,7 +33,6 @@ source_group("${GWK_SOURCE_FOLDER}" # Gwork renderer & platform library add_library(Gwork${GWK_RENDER_NAME} STATIC ${GWK_RENDER_HEADERS} ${GWK_RENDER_SOURCES}) -target_compile_features(Gwork${GWK_RENDER_NAME} PUBLIC cxx_override) target_link_libraries(Gwork${GWK_RENDER_NAME} Gwork) install(FILES ${GWK_RENDER_HEADERS} diff --git a/source/samples/CMakeLists.txt b/source/samples/CMakeLists.txt index 4419b06b..96005c46 100644 --- a/source/samples/CMakeLists.txt +++ b/source/samples/CMakeLists.txt @@ -11,50 +11,61 @@ if(BUILD_SAMPLE) set(SAMPLE_SOURCES "${GWK_RENDER_NAME}/${GWK_RENDER_NAME}Sample.cpp") - set(SAMPLE_NAME Gwork${GWK_RENDER_NAME}Sample) + + if(APPLE) + set(APP_BUILD_TYPE MACOSX_BUNDLE) + set(APP_RESOURCE_PATH "$/../Resources") + else() + set(APP_BUILD_TYPE ) + set(APP_RESOURCE_PATH "$") + endif() - add_executable(${SAMPLE_NAME} ${SAMPLE_SOURCES}) - target_compile_features(${SAMPLE_NAME} PRIVATE cxx_override) + add_executable(${SAMPLE_NAME} ${APP_BUILD_TYPE} ${SAMPLE_SOURCES}) + target_link_libraries(${SAMPLE_NAME} - Gwork Gwork${GWK_RENDER_NAME} # GworkUtil + Gwork Gwork${GWK_RENDER_NAME} ${GWK_RENDER_LIBRARIES}) if(BUILD_TEST) target_link_libraries(${SAMPLE_NAME} GworkTest) endif(BUILD_TEST) + + if(APPLE) + set(APP_VERSION "0.1") + set(APP_COPYRIGHT "Copyright 2016 Bill Quith") + # make MacOS bundle + set_target_properties(${SAMPLE_NAME} PROPERTIES + MACOSX_BUNDLE_COPYRIGHT "${APP_COPYRIGHT}" + MACOSX_BUNDLE_INFO_STRING "${APP_VERSION}, ${APP_COPYRIGHT}" + MACOSX_BUNDLE_SHORT_VERSION_STRING "${APP_VERSION}" + MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} sample v${APP_VERSION}" + MACOSX_BUNDLE_GUI_IDENTIFIER "org.quith.${PROJECT_NAME}.${SAMPLE_NAME}" + ) + # set_source_files_properties(${DEMO_GFX} PROPERTIES + # MACOSX_PACKAGE_LOCATION "${APP_RESOURCE_DIR}/data/gfx" + # ) + endif() + + + macro(CopyAppResource RES_FROM WHAT) + get_filename_component(FNANE "${RES_FROM}" NAME) + add_custom_command( + TARGET ${SAMPLE_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy "${RES_FROM}" "${APP_RESOURCE_PATH}/${FNANE}" + COMMENT "Copy ${WHAT}") + endmacro(CopyAppResource) + + CopyAppResource("${CMAKE_SOURCE_DIR}/source/gwork/resource/DefaultSkin.png" + "default skin") + + CopyAppResource("${CMAKE_SOURCE_DIR}/source/gwork/resource/OpenSans.ttf" + "default font") + + CopyAppResource("${CMAKE_SOURCE_DIR}/source/test/resource/gwen.png" + "test textures") - add_custom_command( - TARGET ${SAMPLE_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - "${CMAKE_SOURCE_DIR}/source/gwork/resource/DefaultSkin.png" - "$" - COMMENT "Copy default skin") - - add_custom_command( - TARGET ${SAMPLE_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - "${CMAKE_SOURCE_DIR}/source/gwork/resource/OpenSans.ttf" - "$" - COMMENT "Copy default font") - - add_custom_command( - TARGET ${SAMPLE_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - "${CMAKE_SOURCE_DIR}/source/test/resource/gwen.png" - "$" - COMMENT "Copy test textures") - - add_custom_command( - TARGET ${SAMPLE_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - "${CMAKE_SOURCE_DIR}/source/test/resource/test16.png" - "$" - COMMENT "Copy test textures") - - # install(TARGETS ${SAMPLE_NAME} - # RUNTIME DESTINATION bin - # LIBRARY DESTINATION lib - # ARCHIVE DESTINATION lib) + CopyAppResource("${CMAKE_SOURCE_DIR}/source/test/resource/test16.png" + "test textures") endif(BUILD_SAMPLE) diff --git a/source/test/CMakeLists.txt b/source/test/CMakeLists.txt index 6b04d9e6..7e3a2dfc 100644 --- a/source/test/CMakeLists.txt +++ b/source/test/CMakeLists.txt @@ -51,7 +51,6 @@ source_group("${GWK_SOURCE_FOLDER}" # Test library if(BUILD_TEST) add_library(GworkTest STATIC ${GWK_TEST_SOURCES}) - target_compile_features(GworkTest PUBLIC cxx_override) target_link_libraries(GworkTest Gwork Gwork${GWK_RENDER_NAME}) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/Gwork From 82994b349a76e4fbfb3524d9a13e6f15b46e9ea7 Mon Sep 17 00:00:00 2001 From: BQ Date: Tue, 2 Aug 2016 13:49:18 +0100 Subject: [PATCH 42/54] Disable use of CTT for color picker. - Address issue #27. - Temporarily disable cache to texture. Broken with Allegro 5.2. --- .../gwork/source/Controls/HSVColorPicker.cpp | 2 +- .../platform/renderers/Allegro5/Allegro5.cpp | 23 +++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/source/gwork/source/Controls/HSVColorPicker.cpp b/source/gwork/source/Controls/HSVColorPicker.cpp index 14f35ffd..db74af9d 100644 --- a/source/gwork/source/Controls/HSVColorPicker.cpp +++ b/source/gwork/source/Controls/HSVColorPicker.cpp @@ -21,7 +21,7 @@ GWK_CONTROL_CONSTRUCTOR(HSVColorPicker) { SetMouseInputEnabled(true); SetSize(256, 64); - EnableCacheToTexture(); +// EnableCacheToTexture(); // TODO - fix texture caching. m_lerpBox = new Gwk::Controls::ColorLerpBox(this); m_lerpBox->onSelectionChanged.Add(this, &HSVColorPicker::ColorBoxChanged); diff --git a/source/platform/renderers/Allegro5/Allegro5.cpp b/source/platform/renderers/Allegro5/Allegro5.cpp index 355c1c7e..2a6af6c2 100644 --- a/source/platform/renderers/Allegro5/Allegro5.cpp +++ b/source/platform/renderers/Allegro5/Allegro5.cpp @@ -25,7 +25,7 @@ class AllegroCTT : public ICacheToTexture { public: - AllegroCTT() : m_oSWindowldTarget(nullptr) {} + AllegroCTT() : m_oldTarget(nullptr) {} ~AllegroCTT() {} void Initialize() {} @@ -53,7 +53,7 @@ class AllegroCTT : public ICacheToTexture typedef std::map< CacheHandle, CacheEntry > CacheMap; CacheMap m_cache; - ALLEGRO_BITMAP *m_oSWindowldTarget; + ALLEGRO_BITMAP *m_oldTarget; }; void AllegroCTT::ShutDown() @@ -68,6 +68,7 @@ void AllegroCTT::CreateControlCacheTexture(CacheHandle control, const Point& siz // If we haven't seen this control before, create a new entry. if (m_cache.find(control) == m_cache.end()) { + al_set_new_bitmap_flags(ALLEGRO_VIDEO_BITMAP); CacheEntry newEntry = { al_create_bitmap(size.x, size.y) }; m_cache.insert(std::pair(control, newEntry)); } @@ -80,18 +81,22 @@ void AllegroCTT::SetupCacheTexture(CacheHandle control) if (it != m_cache.end()) { // Prepare for rendering. - assert(m_oSWindowldTarget==nullptr); - m_oSWindowldTarget = al_get_target_bitmap(); - al_set_target_bitmap((*it).second.m_bitmap); - al_clear_to_color(al_map_rgb_f(1.f,1.f,1.f)); + assert(m_oldTarget==nullptr); + m_oldTarget = al_get_target_bitmap(); + + auto albmp = it->second.m_bitmap; + assert(albmp != nullptr); + al_set_target_bitmap(albmp); + + al_clear_to_color(al_map_rgb_f(1.f, 1.f, 1.f)); } } void AllegroCTT::FinishCacheTexture(CacheHandle control) { // Prepare for rendering. - al_set_target_bitmap(m_oSWindowldTarget); - m_oSWindowldTarget = nullptr; + al_set_target_bitmap(m_oldTarget); + m_oldTarget = nullptr; } void AllegroCTT::DrawCachedControlTexture(CacheHandle control) @@ -100,7 +105,7 @@ void AllegroCTT::DrawCachedControlTexture(CacheHandle control) assert(it != m_cache.end()); if (it != m_cache.end()) { - ALLEGRO_BITMAP *bmp = (*it).second.m_bitmap; + ALLEGRO_BITMAP *bmp = it->second.m_bitmap; const Gwk::Point &pos = m_renderer->GetRenderOffset(); al_draw_bitmap(bmp, pos.x, pos.y, 0); } From 8fe355986b9e54600675e0bd15c4c847347b9545 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 11:36:21 +0100 Subject: [PATCH 43/54] comment cannot be on same line. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6b8c9d53..1cf92744 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ bin/ lib/ -build*/ # user build directory +build*/ From 5d6393dfdf242a3f4e3ac7d1f12aba260298bb5e Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 11:41:34 +0100 Subject: [PATCH 44/54] Correct spelling of caret. - Thanks to @kklouzal https://github.com/garrynewman/GWEN/issues/93 --- source/gwork/include/Gwork/Controls/TextBox.h | 4 +-- source/gwork/source/Controls/TextBox.cpp | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/source/gwork/include/Gwork/Controls/TextBox.h b/source/gwork/include/Gwork/Controls/TextBox.h index eee483db..11bec419 100644 --- a/source/gwork/include/Gwork/Controls/TextBox.h +++ b/source/gwork/include/Gwork/Controls/TextBox.h @@ -75,7 +75,7 @@ namespace Gwk OnSelectAll(this); } - virtual void MakeCaratVisible(); + virtual void MakeCaretVisible(); virtual void OnEnter(); @@ -133,7 +133,7 @@ namespace Gwk virtual bool OnKeyReturn(bool bDown) override; virtual void Render(Skin::Base* skin) override; - virtual void MakeCaratVisible() override; + virtual void MakeCaretVisible() override; virtual bool OnKeyHome(bool bDown) override; virtual bool OnKeyEnd(bool bDown) override; diff --git a/source/gwork/source/Controls/TextBox.cpp b/source/gwork/source/Controls/TextBox.cpp index 7f961569..be1a34b0 100644 --- a/source/gwork/source/Controls/TextBox.cpp +++ b/source/gwork/source/Controls/TextBox.cpp @@ -135,7 +135,7 @@ void TextBox::RefreshCursorBounds() { m_fNextCaretColorChange = Gwk::Platform::GetTimeInSeconds()+1.5f; m_caretColor = Gwk::Color(30, 30, 30, 255); - MakeCaratVisible(); + MakeCaretVisible(); Gwk::Rect pA = GetCharacterPosition(m_cursorPos); Gwk::Rect pB = GetCharacterPosition(m_cursorEnd); m_rectSelectionBounds.x = std::min(pA.x, pB.x); @@ -393,7 +393,7 @@ void TextBox::OnMouseMoved(int x, int y, int /*deltaX*/, int /*deltaY*/) SetCursorPos(iChar); } -void TextBox::MakeCaratVisible() +void TextBox::MakeCaretVisible() { if (m_text->Width() < Width()) { @@ -401,21 +401,21 @@ void TextBox::MakeCaratVisible() } else { - int iCaratPos = m_text->GetCharacterPosition(m_cursorPos).x; - int iRealCaratPos = iCaratPos+m_text->X(); + int iCaretPos = m_text->GetCharacterPosition(m_cursorPos).x; + int iRealCaretPos = iCaretPos+m_text->X(); int iSlidingZone = m_text->GetFont()->size+1; // Width()*0.1f // If the carat is already in a semi-good position, leave it. - if (iRealCaratPos >= iSlidingZone && iRealCaratPos <= Width()-iSlidingZone) + if (iRealCaretPos >= iSlidingZone && iRealCaretPos <= Width()-iSlidingZone) return; int x = 0; - if (iRealCaratPos > Width()-iSlidingZone) - x = Width()-iCaratPos-iSlidingZone; + if (iRealCaretPos > Width()-iSlidingZone) + x = Width()-iCaretPos-iSlidingZone; - if (iRealCaratPos < iSlidingZone) - x = -iCaratPos+iSlidingZone; + if (iRealCaretPos < iSlidingZone) + x = -iCaretPos+iSlidingZone; // Don't show too much whitespace to the right if (x+m_text->Width() < Width()-GetPadding().right) @@ -567,7 +567,7 @@ void TextBoxMultiline::Render(Skin::Base* skin) skin->GetRender()->DrawFilledRect(m_rectCaretBounds); } -void TextBoxMultiline::MakeCaratVisible() +void TextBoxMultiline::MakeCaretVisible() { if (m_text->Height() < Height()) { @@ -582,29 +582,29 @@ void TextBoxMultiline::MakeCaratVisible() //if ( pos & Position::CenterV ) y = bounds.y + ( bounds.h - Height() ) * 0.5; Rect pos = m_text->GetCharacterPosition(m_cursorPos); - int iCaratPos = pos.y; // + pos.h; - int iRealCaratPos = iCaratPos+m_text->Y(); + int iCaretPos = pos.y; // + pos.h; + int iRealCaretPos = iCaretPos+m_text->Y(); //int iSlidingZone = m_text->GetFont()->size; //Width()*0.1f // If the carat is already in a semi-good position, leave it. // int mi = GetPadding().top; // int ma = Height()-pos.h-GetPadding().bottom; - if (iRealCaratPos >= GetPadding().top && iRealCaratPos <= Height()-pos.h- + if (iRealCaretPos >= GetPadding().top && iRealCaretPos <= Height()-pos.h- GetPadding().bottom) return; int y = 0; // bottom of carat too low - if (iRealCaratPos > Height()-pos.h-GetPadding().bottom) + if (iRealCaretPos > Height()-pos.h-GetPadding().bottom) { //align bottom - y = Height()-iCaratPos-pos.h-GetPadding().bottom; + y = Height()-iCaretPos-pos.h-GetPadding().bottom; } // top of carat too low - if (iRealCaratPos < GetPadding().top) - y = -iCaratPos+GetPadding().top; + if (iRealCaretPos < GetPadding().top) + y = -iCaretPos+GetPadding().top; // Don't show too much whitespace to the bottom if (y+m_text->Height() < Height()-GetPadding().bottom) From daeb8ad3ab2e1d97d46b5f1ab6d9084826e50e87 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 11:46:40 +0100 Subject: [PATCH 45/54] Include correct dialog header. - Thanks to @kklouzal - https://github.com/garrynewman/GWEN/issues/95 --- source/gwork/include/Gwork/Controls/Property/File.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/gwork/include/Gwork/Controls/Property/File.h b/source/gwork/include/Gwork/Controls/Property/File.h index 09ddf66c..465f78cf 100644 --- a/source/gwork/include/Gwork/Controls/Property/File.h +++ b/source/gwork/include/Gwork/Controls/Property/File.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace Gwk { @@ -57,4 +57,5 @@ namespace Gwk } } } + #endif // ifndef GWK_CONTROLS_PROPERTY_FILE_H From 5c71e736fd065ae2f765369095bf462d01907ee7 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 12:02:32 +0100 Subject: [PATCH 46/54] If tall menu descends off screen then clamp to screen height - Thanks to @qehgt - https://github.com/garrynewman/GWEN/commit/c8aacf8705dae191f5110f05356345d151e401f9 --- source/gwork/source/Controls/Menu.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/source/gwork/source/Controls/Menu.cpp b/source/gwork/source/Controls/Menu.cpp index e557cc79..d4baa2cc 100644 --- a/source/gwork/source/Controls/Menu.cpp +++ b/source/gwork/source/Controls/Menu.cpp @@ -50,11 +50,18 @@ void Menu::Layout(Skin::Base* skin) childrenHeight += child->Height(); } - if (Y()+childrenHeight > GetCanvas()->Height()) + // if tall menu descends off screen then clamp to screen height + if (Y() + childrenHeight > GetCanvas()->Height()) { - childrenHeight = GetCanvas()->Height() - Y(); - } + const int dy = GetCanvas()->Height() - Y(); + const int ytop = std::max(Y() - dy, 0); + + if (childrenHeight > GetCanvas()->Height()) + childrenHeight = GetCanvas()->Height(); + SetPos(X(), ytop); + } + SetSize(Width(), childrenHeight); ParentClass::Layout(skin); From 722aac38483b7a5436f257e568765fad31ac6908 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 12:11:00 +0100 Subject: [PATCH 47/54] Tidy. --- source/gwork/source/Controls/Menu.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/source/gwork/source/Controls/Menu.cpp b/source/gwork/source/Controls/Menu.cpp index d4baa2cc..fe95bc1c 100644 --- a/source/gwork/source/Controls/Menu.cpp +++ b/source/gwork/source/Controls/Menu.cpp @@ -40,29 +40,25 @@ void Menu::RenderUnder(Skin::Base* skin) void Menu::Layout(Skin::Base* skin) { - int childrenHeight = 0; + int menuHeight = 0; for (auto&& child : m_innerPanel->Children) { - if (!child) - continue; - - childrenHeight += child->Height(); + if (child) + menuHeight += child->Height(); } // if tall menu descends off screen then clamp to screen height - if (Y() + childrenHeight > GetCanvas()->Height()) + if (Y() + menuHeight > GetCanvas()->Height()) { const int dy = GetCanvas()->Height() - Y(); const int ytop = std::max(Y() - dy, 0); - - if (childrenHeight > GetCanvas()->Height()) - childrenHeight = GetCanvas()->Height(); - + SetPos(X(), ytop); + menuHeight = std::min(menuHeight, GetCanvas()->Height()); } - SetSize(Width(), childrenHeight); + SetSize(Width(), menuHeight); ParentClass::Layout(skin); } From 2a665e91e99d21fa8e63b1559dbce45081bba77d Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 15:01:50 +0100 Subject: [PATCH 48/54] Replace deprecated method - SFML2.4 setColor deprecated --- source/platform/renderers/SFML2/SFML2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/platform/renderers/SFML2/SFML2.cpp b/source/platform/renderers/SFML2/SFML2.cpp index 4903f066..b008abae 100644 --- a/source/platform/renderers/SFML2/SFML2.cpp +++ b/source/platform/renderers/SFML2/SFML2.cpp @@ -231,7 +231,7 @@ void Gwk::Renderer::SFML2::RenderText(Gwk::Font* font, Gwk::Point pos, sfStr.setFont(*sFFont); sfStr.move(pos.x, pos.y); sfStr.setCharacterSize(font->realsize); - sfStr.setColor(m_color); + sfStr.setFillColor(m_color); m_target.draw(sfStr); } From cfcacd43f1a424018bd3f6a05bebff4d51ddd9e9 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 16:00:05 +0100 Subject: [PATCH 49/54] Use cmake file properties to set bundle resources for OSX. --- source/samples/CMakeLists.txt | 43 ++++++++++++----------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/source/samples/CMakeLists.txt b/source/samples/CMakeLists.txt index 96005c46..300000ee 100644 --- a/source/samples/CMakeLists.txt +++ b/source/samples/CMakeLists.txt @@ -1,5 +1,8 @@ # Gwork samples +set(APP_VERSION "0.1") +set(APP_COPYRIGHT "Copyright 2016 Bill Quith") + include_directories( ${CMAKE_SOURCE_DIR}/source/platform/include ${CMAKE_SOURCE_DIR}/source/gwork/include @@ -8,10 +11,16 @@ include_directories( ) if(BUILD_SAMPLE) + set(SAMPLE_NAME Gwork${GWK_RENDER_NAME}Sample) + set(SAMPLE_SOURCES "${GWK_RENDER_NAME}/${GWK_RENDER_NAME}Sample.cpp") - set(SAMPLE_NAME Gwork${GWK_RENDER_NAME}Sample) + set(SAMPLE_RESOURCES + "${CMAKE_SOURCE_DIR}/source/gwork/resource/DefaultSkin.png" + "${CMAKE_SOURCE_DIR}/source/gwork/resource/OpenSans.ttf" + "${CMAKE_SOURCE_DIR}/source/test/resource/gwen.png" + "${CMAKE_SOURCE_DIR}/source/test/resource/test16.png") if(APPLE) set(APP_BUILD_TYPE MACOSX_BUNDLE) @@ -21,7 +30,7 @@ if(BUILD_SAMPLE) set(APP_RESOURCE_PATH "$") endif() - add_executable(${SAMPLE_NAME} ${APP_BUILD_TYPE} ${SAMPLE_SOURCES}) + add_executable(${SAMPLE_NAME} ${APP_BUILD_TYPE} ${SAMPLE_SOURCES} ${SAMPLE_RESOURCES}) target_link_libraries(${SAMPLE_NAME} Gwork Gwork${GWK_RENDER_NAME} @@ -32,40 +41,16 @@ if(BUILD_SAMPLE) endif(BUILD_TEST) if(APPLE) - set(APP_VERSION "0.1") - set(APP_COPYRIGHT "Copyright 2016 Bill Quith") # make MacOS bundle set_target_properties(${SAMPLE_NAME} PROPERTIES MACOSX_BUNDLE_COPYRIGHT "${APP_COPYRIGHT}" MACOSX_BUNDLE_INFO_STRING "${APP_VERSION}, ${APP_COPYRIGHT}" MACOSX_BUNDLE_SHORT_VERSION_STRING "${APP_VERSION}" MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} sample v${APP_VERSION}" - MACOSX_BUNDLE_GUI_IDENTIFIER "org.quith.${PROJECT_NAME}.${SAMPLE_NAME}" + MACOSX_BUNDLE_GUI_IDENTIFIER "org.gwork.${PROJECT_NAME}.${SAMPLE_NAME}" ) - # set_source_files_properties(${DEMO_GFX} PROPERTIES - # MACOSX_PACKAGE_LOCATION "${APP_RESOURCE_DIR}/data/gfx" - # ) + set_source_files_properties(${SAMPLE_RESOURCES} PROPERTIES + MACOSX_PACKAGE_LOCATION "Resources") endif() - - macro(CopyAppResource RES_FROM WHAT) - get_filename_component(FNANE "${RES_FROM}" NAME) - add_custom_command( - TARGET ${SAMPLE_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${RES_FROM}" "${APP_RESOURCE_PATH}/${FNANE}" - COMMENT "Copy ${WHAT}") - endmacro(CopyAppResource) - - CopyAppResource("${CMAKE_SOURCE_DIR}/source/gwork/resource/DefaultSkin.png" - "default skin") - - CopyAppResource("${CMAKE_SOURCE_DIR}/source/gwork/resource/OpenSans.ttf" - "default font") - - CopyAppResource("${CMAKE_SOURCE_DIR}/source/test/resource/gwen.png" - "test textures") - - CopyAppResource("${CMAKE_SOURCE_DIR}/source/test/resource/test16.png" - "test textures") - endif(BUILD_SAMPLE) From 05175fb2d10e1b8d37a74c18c118a9cd08a12e9f Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 16:37:31 +0100 Subject: [PATCH 50/54] Add editor config. --- .editorconfig | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..cbc72966 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +# Configuration file for EditorConfig +# More information is available under http://EditorConfig.org + +# Ignore any other files further up in the file system +root = true + +# Configuration for all files +[*] +# Always end files with a blank line +insert_final_newline = true +# Force space characters for indentation +indent_style = space +# Always indent by 4 characters +indent_size = 4 +# Remove whitespace characters at the end of line +trim_trailing_whitespace = true +# Enforce Unix style line endings (\n only) +#end_of_line = lf From adbbe4fd0bd0b6f91bb3bd973442d5b234c395c7 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 18:20:16 +0100 Subject: [PATCH 51/54] Specific directory for SFML2 resource loading - Use directory relative to application executable. - Fixes issue #29 - Fix app resource copy for non-bundled apps. --- source/platform/include/Gwork/Platform.h | 7 +++- .../platform/include/Gwork/Renderers/SFML2.h | 7 +++- source/platform/platforms/NullPlatform.cpp | 27 +++++++++++++++- source/platform/renderers/SFML2/SFML2.cpp | 12 ++++--- source/samples/CMakeLists.txt | 32 +++++++++++++++---- source/samples/SFML2/SFML2Sample.cpp | 2 +- 6 files changed, 73 insertions(+), 14 deletions(-) diff --git a/source/platform/include/Gwork/Platform.h b/source/platform/include/Gwork/Platform.h index bf0c2755..655327e7 100644 --- a/source/platform/include/Gwork/Platform.h +++ b/source/platform/include/Gwork/Platform.h @@ -33,7 +33,12 @@ namespace Gwk GWK_EXPORT String GetClipboardText(); //! Set platform clipboard from a string. GWK_EXPORT bool SetClipboardText(const String& str); - + + //! Get the directory of the running executable. + //! \return Path string, blank if not known. + //! \note Path is terminated with directory separator. + GWK_EXPORT String GetExecutableDir(); + // // System Dialogs (Can return false if unhandled) // diff --git a/source/platform/include/Gwork/Renderers/SFML2.h b/source/platform/include/Gwork/Renderers/SFML2.h index 361212d1..71d7fa86 100644 --- a/source/platform/include/Gwork/Renderers/SFML2.h +++ b/source/platform/include/Gwork/Renderers/SFML2.h @@ -23,7 +23,11 @@ namespace Gwk { public: - SFML2(sf::RenderTarget& target); + //! Constructor for SFML2 renderer. + //! \param target - application render target. + //! \param resDir - path, relative to executable where resources are found. + SFML2(sf::RenderTarget& target, const String& resDir); + virtual ~SFML2(); inline void EnsurePrimitiveType(sf::PrimitiveType type) @@ -97,6 +101,7 @@ namespace Gwk sf::RenderStates m_renderStates; sf::View m_originalView; int m_height; + String m_resourceDir; }; diff --git a/source/platform/platforms/NullPlatform.cpp b/source/platform/platforms/NullPlatform.cpp index 1ef1e5bf..6fc800f4 100644 --- a/source/platform/platforms/NullPlatform.cpp +++ b/source/platform/platforms/NullPlatform.cpp @@ -6,9 +6,14 @@ */ #include -#include #include +#if !defined(WIN32) +# include +# include +# include +#endif + static Gwk::String gs_ClipboardEmulator; void Gwk::Platform::Sleep(unsigned int ms) @@ -38,6 +43,26 @@ float Gwk::Platform::GetTimeInSeconds() return fSeconds; } +Gwk::String Gwk::Platform::GetExecutableDir() +{ +#if !defined(WIN32) + + pid_t pid = getpid(); + char pathbuf[PROC_PIDPATHINFO_MAXSIZE]; + int ret = proc_pidpath(pid, pathbuf, sizeof(pathbuf)); + if (ret > 0) + { + return String(dirname(pathbuf)) + "/"; + } + + // fprintf(stderr, "PID %d: %s\n", pid, strerror(errno)); + return ""; + +#else + return ""; +#endif +} + bool Gwk::Platform::FileOpen(const String& Name, const String& StartPath, const String& Extension, String& filePathOut) { diff --git a/source/platform/renderers/SFML2/SFML2.cpp b/source/platform/renderers/SFML2/SFML2.cpp index b008abae..19d8ae95 100644 --- a/source/platform/renderers/SFML2/SFML2.cpp +++ b/source/platform/renderers/SFML2/SFML2.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -19,6 +20,7 @@ #endif #include +#include struct TextureData { @@ -37,13 +39,15 @@ struct TextureData }; -Gwk::Renderer::SFML2::SFML2(sf::RenderTarget& target) +Gwk::Renderer::SFML2::SFML2(sf::RenderTarget& target, const String& resDir) : m_target(target) , m_renderStates(sf::RenderStates::Default) , m_height(m_target.getSize().y) { m_buffer.setPrimitiveType(sf::Triangles); m_renderStates.blendMode = sf::BlendAlpha; + + m_resourceDir = Platform::GetExecutableDir() + resDir; } Gwk::Renderer::SFML2::~SFML2() @@ -189,7 +193,7 @@ void Gwk::Renderer::SFML2::LoadFont(Gwk::Font* font) sf::Font* sfFont = new sf::Font(); - if (!sfFont->loadFromFile(font->facename)) + if (!sfFont->loadFromFile(m_resourceDir + font->facename)) { // Ideally here we should be setting the font to a system // default font here. @@ -262,10 +266,10 @@ void Gwk::Renderer::SFML2::LoadTexture(Gwk::Texture* texture) if (texture->data) FreeTexture(texture); - + sf::Texture* tex = new sf::Texture(); tex->setSmooth(true); - if (!tex->loadFromFile(texture->name)) + if (!tex->loadFromFile(m_resourceDir + texture->name)) { delete tex; texture->failed = true; diff --git a/source/samples/CMakeLists.txt b/source/samples/CMakeLists.txt index 300000ee..fadd752b 100644 --- a/source/samples/CMakeLists.txt +++ b/source/samples/CMakeLists.txt @@ -3,6 +3,8 @@ set(APP_VERSION "0.1") set(APP_COPYRIGHT "Copyright 2016 Bill Quith") +set(APP_BUNDLE ON) + include_directories( ${CMAKE_SOURCE_DIR}/source/platform/include ${CMAKE_SOURCE_DIR}/source/gwork/include @@ -11,6 +13,7 @@ include_directories( ) if(BUILD_SAMPLE) + set(SAMPLE_NAME Gwork${GWK_RENDER_NAME}Sample) set(SAMPLE_SOURCES @@ -22,13 +25,17 @@ if(BUILD_SAMPLE) "${CMAKE_SOURCE_DIR}/source/test/resource/gwen.png" "${CMAKE_SOURCE_DIR}/source/test/resource/test16.png") - if(APPLE) + if(APPLE AND APP_BUNDLE) set(APP_BUILD_TYPE MACOSX_BUNDLE) - set(APP_RESOURCE_PATH "$/../Resources") + set(APP_RESOURCE_DIR "Resources") + set(APP_RUNTIME_RESOURCE_DIR "../Resources/") # relative to MacOS/ else() set(APP_BUILD_TYPE ) - set(APP_RESOURCE_PATH "$") - endif() + set(APP_RESOURCE_DIR "$") + set(APP_RUNTIME_RESOURCE_DIR "") + endif() + + add_definitions("-DGWORK_RESOURCE_DIR=\"${APP_RUNTIME_RESOURCE_DIR}\"") add_executable(${SAMPLE_NAME} ${APP_BUILD_TYPE} ${SAMPLE_SOURCES} ${SAMPLE_RESOURCES}) @@ -40,7 +47,7 @@ if(BUILD_SAMPLE) target_link_libraries(${SAMPLE_NAME} GworkTest) endif(BUILD_TEST) - if(APPLE) + if(APPLE AND APP_BUNDLE) # make MacOS bundle set_target_properties(${SAMPLE_NAME} PROPERTIES MACOSX_BUNDLE_COPYRIGHT "${APP_COPYRIGHT}" @@ -50,7 +57,20 @@ if(BUILD_SAMPLE) MACOSX_BUNDLE_GUI_IDENTIFIER "org.gwork.${PROJECT_NAME}.${SAMPLE_NAME}" ) set_source_files_properties(${SAMPLE_RESOURCES} PROPERTIES - MACOSX_PACKAGE_LOCATION "Resources") + MACOSX_PACKAGE_LOCATION "${APP_RESOURCE_DIR}") + else() + # Non-bundled app + macro(CopyAppResource RES_FROM) + get_filename_component(FNANE "${RES_FROM}" NAME) + add_custom_command( + TARGET ${SAMPLE_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy "${RES_FROM}" "${APP_RESOURCE_DIR}/${FNANE}" + COMMENT "Copying sample resource") + endmacro(CopyAppResource) + + foreach(RESFILE ${SAMPLE_RESOURCES}) + CopyAppResource(${RESFILE}) + endforeach() endif() endif(BUILD_SAMPLE) diff --git a/source/samples/SFML2/SFML2Sample.cpp b/source/samples/SFML2/SFML2Sample.cpp index f26c167b..7419ec07 100644 --- a/source/samples/SFML2/SFML2Sample.cpp +++ b/source/samples/SFML2/SFML2Sample.cpp @@ -21,7 +21,7 @@ int main() sf::RenderWindow app(sf::VideoMode(1004, 650, 32), "Gwork: SFML2"); // Create renderer - Gwk::Renderer::SFML2 renderer(app); + Gwk::Renderer::SFML2 renderer(app, GWORK_RESOURCE_DIR); // Create a Gwork skin Gwk::Skin::TexturedBase skin(&renderer); From 66db6141da3d431c2b5ac128f394ec8448b2d083 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 18:20:27 +0100 Subject: [PATCH 52/54] Tidy. --- source/platform/platforms/Allegro5Platform.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/source/platform/platforms/Allegro5Platform.cpp b/source/platform/platforms/Allegro5Platform.cpp index 1674bbd4..133058f7 100644 --- a/source/platform/platforms/Allegro5Platform.cpp +++ b/source/platform/platforms/Allegro5Platform.cpp @@ -5,7 +5,6 @@ * See license in Gwork.h */ -//#include #include #include @@ -31,7 +30,7 @@ static const ALLEGRO_SYSTEM_MOUSE_CURSOR g_cursorConversion[] = ALLEGRO_SYSTEM_MOUSE_CURSOR_RESIZE_N, // IDC_SIZENWSE ALLEGRO_SYSTEM_MOUSE_CURSOR_RESIZE_E, // IDC_SIZENESW ALLEGRO_SYSTEM_MOUSE_CURSOR_MOVE, // IDC_SIZEALL - ALLEGRO_SYSTEM_MOUSE_CURSOR_UNAVAILABLE, // IDC_NO + ALLEGRO_SYSTEM_MOUSE_CURSOR_UNAVAILABLE,// IDC_NO ALLEGRO_SYSTEM_MOUSE_CURSOR_BUSY, // IDC_WAIT ALLEGRO_SYSTEM_MOUSE_CURSOR_LINK // IDC_HAND }; @@ -106,8 +105,7 @@ bool Gwk::Platform::FileSave(const String& Name, { ALLEGRO_FILECHOOSER* chooser = al_create_native_file_dialog(StartPath.c_str(), Name.c_str(), - "*.*", // - // Extension.c_str(), + "*.*", // Extension.c_str(), ALLEGRO_FILECHOOSER_SAVE); if (al_show_native_file_dialog(g_display, chooser)) @@ -128,8 +126,7 @@ bool Gwk::Platform::FolderOpen(const String& Name, { ALLEGRO_FILECHOOSER* chooser = al_create_native_file_dialog(StartPath.c_str(), Name.c_str(), - "*.*", // - // Extension.c_str(), + "*.*", // Extension.c_str(), ALLEGRO_FILECHOOSER_FOLDER); if (al_show_native_file_dialog(g_display, chooser)) @@ -163,7 +160,6 @@ static bool InitAllegro() al_install_mouse(); al_install_keyboard(); al_init_native_dialog_addon(); -// al_register_event_source(event_queue, al_get_display_event_source(display)); al_register_event_source(event_queue, al_get_mouse_event_source()); al_register_event_source(event_queue, al_get_keyboard_event_source()); From 155a8838f0f9d3f04d7c133789f83105417e0011 Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 18:33:16 +0100 Subject: [PATCH 53/54] Store and restore OpenGL states whilst rendering - Thanks to @lonestarr - https://github.com/garrynewman/GWEN/issues/59 --- source/samples/SFML2/SFML2Sample.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/samples/SFML2/SFML2Sample.cpp b/source/samples/SFML2/SFML2Sample.cpp index 7419ec07..e478e2ac 100644 --- a/source/samples/SFML2/SFML2Sample.cpp +++ b/source/samples/SFML2/SFML2Sample.cpp @@ -69,7 +69,10 @@ int main() // Render the control canvas app.clear(); + // + app.pushGLStates(); canvas->RenderCanvas(); + app.popGLStates(); app.display(); } From 1e7b5c53b87e2cda180042b5012c5f8335d9d7ba Mon Sep 17 00:00:00 2001 From: BQ Date: Sat, 13 Aug 2016 18:53:46 +0100 Subject: [PATCH 54/54] Use for-range --- source/gwork/source/Controls/Text.cpp | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/source/gwork/source/Controls/Text.cpp b/source/gwork/source/Controls/Text.cpp index 355017ab..926e0713 100644 --- a/source/gwork/source/Controls/Text.cpp +++ b/source/gwork/source/Controls/Text.cpp @@ -232,7 +232,8 @@ void Text::SplitWords(const Gwk::String& s, std::vector& elems) { Gwk::String str; - int w = GetParent()->Width()-GetParent()->GetPadding().left-GetParent()->GetPadding().right; + int w = GetParent()->Width() + - (GetParent()->GetPadding().left + GetParent()->GetPadding().right); for (int i = 0; i < (int)s.length(); i++) { @@ -281,8 +282,8 @@ void Text::RefreshSizeWrap() { delete line; } - m_lines.clear(); + std::vector words; SplitWords(GetText(), words); @@ -301,7 +302,7 @@ void Text::RefreshSizeWrap() int x = 0, y = 0; Gwk::String strLine; - for (std::vector::iterator it = words.begin(); it != words.end(); ++it) + for (auto&& it = words.begin(); it != words.end(); ++it) { bool bFinishLine = false; bool bWrapped = false; @@ -316,10 +317,10 @@ void Text::RefreshSizeWrap() strLine += *it; Gwk::Point p = GetSkin()->GetRender()->MeasureText(GetFont(), strLine); - if (p.x > Width()) - if (p.x > w) + if (p.x > Width() && p.x > w) { - bFinishLine = true; bWrapped = true; + bFinishLine = true; + bWrapped = true; } } @@ -385,15 +386,11 @@ Text* Text::GetLine(int i) int Text::GetLineFromChar(int i) { - TextLines::iterator it = m_lines.begin(); - TextLines::iterator itEnd = m_lines.end(); int iChars = 0; int iLine = 0; - while (it != itEnd) + for (auto&& line : m_lines) { - Text* line = *it; - ++it; iChars += line->Length(); if (iChars > i) @@ -404,20 +401,16 @@ int Text::GetLineFromChar(int i) if (iLine > 0) return iLine-1; + return iLine; } int Text::GetStartCharFromLine(int i) { - TextLines::iterator it = m_lines.begin(); - TextLines::iterator itEnd = m_lines.end(); int iChars = 0; - while (it != itEnd) + for (auto&& line : m_lines) { - Text* line = *it; - ++it; - if (i == 0) return Gwk::Clamp(iChars, 0, Length());