From 9922cbe90d7d32b6dbc3c1967de1d522a3363484 Mon Sep 17 00:00:00 2001 From: "Valeriano A.R." Date: Sun, 11 May 2025 20:01:38 +0200 Subject: [PATCH] Initialize issues branch --- .clang-format | 63 - .gitignore | 23 - CMakeLists.txt | 58 - Example.GameLib/.clang-format | 63 - Example.GameLib/.gitignore | 20 - Example.GameLib/CMakeLists.txt | 40 - Example.GameLib/data/background.png | Bin 18150 -> 0 bytes Example.GameLib/data/block.png | Bin 4280 -> 0 bytes Example.GameLib/data/level_01.txt | 71 - Example.GameLib/data/platform.png | Bin 652 -> 0 bytes Example.GameLib/data/player.png | Bin 1164 -> 0 bytes Example.GameLib/dev-server.sh | 5 - Example.GameLib/dist-emscripten.sh | 19 - Example.GameLib/src/GameEnts.c | 179 - Example.GameLib/src/GameEnts.h | 18 - Example.GameLib/src/GameMap.c | 114 - Example.GameLib/src/GameMap.h | 7 - Example.GameLib/src/main.c | 58 - Example.GameLib/web/index.html | 157 - LICENSE.txt | 21 - cmake/FindSDL2.cmake | 202 - issues/.keep | 0 macosx/SDLMain.m | 365 -- src/Anim.c | 244 -- src/Anim.h | 112 - src/Audio.c | 363 -- src/Audio.h | 48 - src/Bucket.c | 185 - src/Bucket.h | 68 - src/Draw.c | 1260 ------ src/Draw.h | 201 - src/Entity.c | 1038 ----- src/Entity.h | 286 -- src/FontData.h | 260 -- src/GameLib.c | 808 ---- src/GameLib.h | 154 - src/Input.c | 226 - src/Input.h | 108 - src/QuadArray2D.c | 93 - src/QuadArray2D.h | 31 - src/TimeUtils.c | 59 - src/TimeUtils.h | 18 - src/Util.c | 421 -- src/Util.h | 133 - src/lodepng.c | 6044 --------------------------- src/lodepng.h | 1722 -------- 46 files changed, 15365 deletions(-) delete mode 100644 .clang-format delete mode 100644 .gitignore delete mode 100644 CMakeLists.txt delete mode 100644 Example.GameLib/.clang-format delete mode 100644 Example.GameLib/.gitignore delete mode 100644 Example.GameLib/CMakeLists.txt delete mode 100644 Example.GameLib/data/background.png delete mode 100644 Example.GameLib/data/block.png delete mode 100644 Example.GameLib/data/level_01.txt delete mode 100644 Example.GameLib/data/platform.png delete mode 100644 Example.GameLib/data/player.png delete mode 100644 Example.GameLib/dev-server.sh delete mode 100644 Example.GameLib/dist-emscripten.sh delete mode 100644 Example.GameLib/src/GameEnts.c delete mode 100644 Example.GameLib/src/GameEnts.h delete mode 100644 Example.GameLib/src/GameMap.c delete mode 100644 Example.GameLib/src/GameMap.h delete mode 100644 Example.GameLib/src/main.c delete mode 100644 Example.GameLib/web/index.html delete mode 100644 LICENSE.txt delete mode 100644 cmake/FindSDL2.cmake create mode 100644 issues/.keep delete mode 100644 macosx/SDLMain.m delete mode 100644 src/Anim.c delete mode 100644 src/Anim.h delete mode 100644 src/Audio.c delete mode 100644 src/Audio.h delete mode 100644 src/Bucket.c delete mode 100644 src/Bucket.h delete mode 100644 src/Draw.c delete mode 100644 src/Draw.h delete mode 100644 src/Entity.c delete mode 100644 src/Entity.h delete mode 100644 src/FontData.h delete mode 100644 src/GameLib.c delete mode 100644 src/GameLib.h delete mode 100644 src/Input.c delete mode 100644 src/Input.h delete mode 100644 src/QuadArray2D.c delete mode 100644 src/QuadArray2D.h delete mode 100644 src/TimeUtils.c delete mode 100644 src/TimeUtils.h delete mode 100644 src/Util.c delete mode 100644 src/Util.h delete mode 100644 src/lodepng.c delete mode 100644 src/lodepng.h diff --git a/.clang-format b/.clang-format deleted file mode 100644 index 2bbf5d1..0000000 --- a/.clang-format +++ /dev/null @@ -1,63 +0,0 @@ ---- -Language: Cpp -# BasedOnStyle: LLVM -AccessModifierOffset: -2 -AlignAfterOpenBracket: AlwaysBreak -AlignOperands: true -AlignTrailingComments: true -AllowAllParametersOfDeclarationOnNextLine: false -AllowShortBlocksOnASingleLine: Always -AllowShortCaseLabelsOnASingleLine: false -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -AllowShortFunctionsOnASingleLine: All -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakTemplateDeclarations: No -AlwaysBreakBeforeMultilineStrings: false -BreakBeforeBinaryOperators: None -BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false -BinPackParameters: true -BinPackArguments: false -ColumnLimit: 120 -ConstructorInitializerAllOnOneLineOrOnePerLine: false -ConstructorInitializerIndentWidth: 4 -DerivePointerAlignment: false -ExperimentalAutoDetectBinPacking: false -IndentCaseLabels: false -IndentWrappedFunctionNames: false -MaxEmptyLinesToKeep: 1 -KeepEmptyLinesAtTheStartOfBlocks: true -NamespaceIndentation: None -ObjCBlockIndentWidth: 2 -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PenaltyBreakBeforeFirstCallParameter: 19 -PenaltyBreakComment: 300 -PenaltyBreakString: 1000 -PenaltyBreakFirstLessLess: 120 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 60 -PointerAlignment: Right -SpacesBeforeTrailingComments: 1 -Cpp11BracedListStyle: true -Standard: c++11 -IndentWidth: 4 -TabWidth: 4 -UseTab: AlignWithSpaces -BreakBeforeBraces: Attach -SpacesInParentheses: false -SpacesInSquareBrackets: false -SpacesInAngles: false -SpaceInEmptyParentheses: false -SpacesInCStyleCastParentheses: false -SpaceAfterCStyleCast: false -SpacesInContainerLiterals: true -SpaceBeforeAssignmentOperators: true -ContinuationIndentWidth: 4 -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] -SpaceBeforeParens: ControlStatements -DisableFormat: false -AlignConsecutiveAssignments: Consecutive -... - diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 79194de..0000000 --- a/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -# Building stuff -build-* -*.dll -*.exe -*.so -*.so.* -DIST/* -shot-????.bmp -shot-????.png -.vscode -.DS_Store -*/DIST/* -/CMakeFiles/ -Makefile -cmake_install.cmake -CMakeCache.txt -cmake-build-* -build -build-* -.idea - -# Results -libGameLib.a diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index bf2ae42..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -project(GameLib) - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") - -if (EMSCRIPTEN) - message(" * Ignore SDL2 package with Emscripten") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_SDL=2 -Wno-implicit-function-declaration -DEMSCRIPTEN") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_SDL=2 -s TOTAL_MEMORY=134217728 -lidbfs.js") -else() - find_package(SDL2 REQUIRED) - include_directories(${SDL2_INCLUDE_DIRS}) -endif() - -set(OpenGL_GL_PREFERENCE GLVND) -find_package(OpenGL REQUIRED) - - -# ------------------------------------------------------------- -# ----- GameLib - -set(GAMELIB_HEADERS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src) - -set(GAMELIB_HEADERS - src/TimeUtils.h - src/Util.h - src/QuadArray2D.h - src/Draw.h - src/Input.h - src/Audio.h - src/Anim.h - src/Entity.h - src/Bucket.h - src/GameLib.h) - -set(GAMELIB_SOURCE - src/TimeUtils.c - src/Util.c - src/QuadArray2D.c - src/Draw.c - src/Input.c - src/Audio.c - src/Anim.c - src/Entity.c - src/Bucket.c - src/GameLib.c) - -add_library(GameLib STATIC - ${GAMELIB_HEADERS} ${GAMELIB_SOURCE}) -target_include_directories(GameLib PRIVATE ${GAMELIB_HEADERS_PATH}) -set(GAMELIB_LIBRARIES ${SDL2_LIBRARIES} ${OPENGL_LIBRARY} m GameLib) - -get_directory_property(hasParent PARENT_DIRECTORY) -if(hasParent) - set(GAMELIB_HEADERS_PATH ${GAMELIB_HEADERS_PATH} PARENT_SCOPE) - set(GAMELIB_LIBRARIES ${GAMELIB_LIBRARIES} PARENT_SCOPE) -endif() diff --git a/Example.GameLib/.clang-format b/Example.GameLib/.clang-format deleted file mode 100644 index 2bbf5d1..0000000 --- a/Example.GameLib/.clang-format +++ /dev/null @@ -1,63 +0,0 @@ ---- -Language: Cpp -# BasedOnStyle: LLVM -AccessModifierOffset: -2 -AlignAfterOpenBracket: AlwaysBreak -AlignOperands: true -AlignTrailingComments: true -AllowAllParametersOfDeclarationOnNextLine: false -AllowShortBlocksOnASingleLine: Always -AllowShortCaseLabelsOnASingleLine: false -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -AllowShortFunctionsOnASingleLine: All -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakTemplateDeclarations: No -AlwaysBreakBeforeMultilineStrings: false -BreakBeforeBinaryOperators: None -BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false -BinPackParameters: true -BinPackArguments: false -ColumnLimit: 120 -ConstructorInitializerAllOnOneLineOrOnePerLine: false -ConstructorInitializerIndentWidth: 4 -DerivePointerAlignment: false -ExperimentalAutoDetectBinPacking: false -IndentCaseLabels: false -IndentWrappedFunctionNames: false -MaxEmptyLinesToKeep: 1 -KeepEmptyLinesAtTheStartOfBlocks: true -NamespaceIndentation: None -ObjCBlockIndentWidth: 2 -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PenaltyBreakBeforeFirstCallParameter: 19 -PenaltyBreakComment: 300 -PenaltyBreakString: 1000 -PenaltyBreakFirstLessLess: 120 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 60 -PointerAlignment: Right -SpacesBeforeTrailingComments: 1 -Cpp11BracedListStyle: true -Standard: c++11 -IndentWidth: 4 -TabWidth: 4 -UseTab: AlignWithSpaces -BreakBeforeBraces: Attach -SpacesInParentheses: false -SpacesInSquareBrackets: false -SpacesInAngles: false -SpaceInEmptyParentheses: false -SpacesInCStyleCastParentheses: false -SpaceAfterCStyleCast: false -SpacesInContainerLiterals: true -SpaceBeforeAssignmentOperators: true -ContinuationIndentWidth: 4 -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] -SpaceBeforeParens: ControlStatements -DisableFormat: false -AlignConsecutiveAssignments: Consecutive -... - diff --git a/Example.GameLib/.gitignore b/Example.GameLib/.gitignore deleted file mode 100644 index 59cb3d6..0000000 --- a/Example.GameLib/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -# Building stuff -build-* -*.dll -*.exe -*.so -*.so.* -DIST/* -shot-????.bmp -shot-????.png -.vscode -.DS_Store -*/DIST/* -/CMakeFiles/ -Makefile -cmake_install.cmake -CMakeCache.txt -cmake-build-*/ - -# Results -game diff --git a/Example.GameLib/CMakeLists.txt b/Example.GameLib/CMakeLists.txt deleted file mode 100644 index c988f74..0000000 --- a/Example.GameLib/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -project(Example.GameLib) - -IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GameLib) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/GameLib ${CMAKE_CURRENT_BINARY_DIR}/GameLib) -elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../GameLib) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../GameLib ${CMAKE_CURRENT_BINARY_DIR}/GameLib) -elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../GameLib) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../GameLib ${CMAKE_CURRENT_BINARY_DIR}/GameLib) -endif () - -if (EMSCRIPTEN) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_SDL=2 -O2 -Wno-implicit-function-declaration -DEMSCRIPTEN") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_SDL=2 -s TOTAL_MEMORY=134217728 -lidbfs.js --preload-file ${CMAKE_CURRENT_SOURCE_DIR}/data@/data") - SET(CMAKE_EXECUTABLE_SUFFIX ".html") -endif () - - -# ------------------------------------------------------------- -# ----- Example.GameLib - - -set(GAME_HEADERS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src) - -set(GAME_HEADERS - src/GameEnts.h - src/GameMap.h) - -set(GAME_SOURCE - src/GameEnts.c - src/GameMap.c - src/main.c) - -add_executable(game WIN32 - ${GAME_HEADERS} ${GAME_SOURCE}) -target_include_directories(game PRIVATE - ${GAMELIB_HEADERS_PATH} - ${GAME_HEADERS_PATH}) -target_link_libraries(game ${GAMELIB_LIBRARIES}) diff --git a/Example.GameLib/data/background.png b/Example.GameLib/data/background.png deleted file mode 100644 index 670a78b6673164590d5ae4216fa6ee32a7d74633..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18150 zcmeAS@N?(olHy`uVBq!ia0y~yU}6Aa4iHr><-C@Gfq}EYBeIx*fm;}a85w5Hkzin8 zU@!6Xb!C6R$to-&9_*ZRi-CbbHZvrm#5q4VH#M(>0R)_jQWHy3QxwWGOEMJPJ$(aG z^itUw7!(*hT^vIyZoR#m=`cC`miY&3Zch$Ql|)~TlV|s7E(mc+5oSG-wJ_>;)ZA5D zZ)Isda$0?*SLqW8*2zUo>?@ z7#+5M-#o)-rq8n%FCt=N|2{b>EW)9{z`(=B!*=-4p`;@ng34|^0$i=z^Y5=)z1n#r z0~5o61L`7Nv9Ymx_v~romw)%-MaB1bv0I~hlN$Fm^eQpDu#3?P*PDLXBsV=hJv%!) zH}~&@gUnOCS|u1H7#Vn8_=|U^CMG&w-m-f2>gCIqFJ8QO?%cUf3oHKoDD?F7%+1y9 z;t*h9U{g?=tSQ2kY9yKY_wJoLPl|R1Xoz$lwUK*&YisuQyt_`Cj7$s%91bTK?1)*n zbEl>6<#%B4?b|moF|i!8=*1U5{QR?Q*|PY$pG)`bkx6CcU|?Wg^)-F-O{PYN+keZ; z%C>FY`tE@hZJKR4I9{M{V4#S1g5uC0kYZ~uSK%9Wa@c&k{qH8Pb*vNaz} zF{-qg=b@r>w>~;LT3cJ&ZvOeCzv;WSu3F{wyGmYu{*NCOU5hqt+N7ne9oW#oz;L0T znPK+XXPMYitjufarDMmAojKD}@?W!S)ru7w+SOG}UU%dcOz&P~#( zpD%*_#FfaJRIls=H}(gmbD#! z{ISBu_I~@amuF|2@Bi_r`&O(o0|!F~Fxbm@2su8`pcIu7Z`cUqnj6JXd? z%i{3wK#I}D=S+vKd2j8XwD-T5n3&N_AHC_(k&&D%OqZ7a`1N{y{qMKtmwx^J{agB9 za8q-$y5F3RqYMrVFBVETd@EFDYxs99zC2iRrLmivTUuILSXkJS-}zZtUS|L2SQI9G zes*@-wr#Sxe>J-{ZQ3-;Jb&Ky?dGRs1Q@C`gbXBj#JXE07}&P`TXJZ|j2RJ;kvDJN z^jsSB_L=S*&^grN{VNmFS4A zUb%AR+RMxaC$u}?#YgIh%|E|=+qSZzqN4Kh^1{N2UQ7GsY=1qS9)IG>{@uHOpPH&| zYiqkcX6K|ylRmw;xH!K4@78te*6r9)ail}=S8(H}3Y(oVadB~RF)=am@%^9JSsLd3 zs4$-Cqc*uyg5g&-_s!q>V%?%#t-E*cZf|dQTDW56%F6F|%ZrPOwgmrw_wJo}-kpx_ z?%!`VpU=t3(db&Wc5QA}R##V7mbv&A4;3K}7W@ByKEJ)aJ@DCurv|KF;(h-w-?(w2 zO6kG4oD1I{CK_$6y#MCSo1B~+6`_+?SBJ~nR0Kptt;+rDKhLJ}!vn|U%V^e zdhFP-!)?658X{R+t3EzD8W|bM!`2)laDV4~*UKd(C0iQPIT(1_m#zIO5fC5mKaJ5s zhHvu8HEY)7WMnv;WcXU2y+20p`k6C6T2r+|xT2$P|N8ao$&)9ir|WA^J@xeT^vRO5 z7cEkFaB{HcSUN7TiugFu(p^WOTH5ph*95 zVXoF0+)Q5Sua`S0Oz>LjwRF;%{~_VwlW#4$`vsKKCQJy3jon-J_STCRFP6_aqAu*X zIqmGG&6^JgGxRX*icL;V&dtqDPF9|O-rUGYh=WB`RJ6CZS7YYEdznc_CwIn2M@Lsz zS6f@}o;7QhtaaIkial>{Z_ie*KXK1DIr*{Q`9CJkm%qHZx!F|e?7?RCtP| z$^?XmU%znSz{3IynZAu13rkB)lMX1n|5t1wvoIhdIr;H}2M(9F_^9nJczEdP>FKdC zF&?kuBO-QGetzaXUGJqIdub@o4Abne%F3VV^J|w?Z#QsIuQt|bDl;`P2?-Am4-30? z{rcvcIdg>NLUijk+fUva@9piqG$=DYU48P&ygNGz9~@x3baS~z*Oq_%a<+>~mNoAZ z*y;S^X8Qc2dkq@|9s1iE+uGQ~x{sz9oitONaxy`J>7ReOr~1qNP760|->$E#dv|a3 z_ph(7+uGVr*N^uL6tQG@^Y-oDijR+$$Nab|%q%1n)&zr{r&YH9yq@3jGyVVE&aUQr|VBoPcJw59qpcc;MUgc z_jh&%hlI53<0z3@*05_qGDq|B-})0ha&mL0dZ|u7efGqO3)}vQxc+^rUw?B`YPXA0 z=FH#0i!WxF%+l*;%-{QU+R~+}^F$OF7)lDi$A3Ss@_h5kl`FSy-8y&f+@O_9G+y1? zTYYQa|7T}s_xAQOGc%XJxp8sRSASn$+saQV(~mb~US6iEqQb$#WTWrE!0_VUJNuoV zy;p{udiu#Q`IwAN#e^r-KRz7h@9ysI?d{#3bMsQsv*!;EHqSQ8-BtEBs(jCRN#nF0 zX>-2sHyIg9P6srcOp%h7))wjN=;%m2J#DT<;iF$)Uz?hm`uh56P1RCVY&@F8%E~G# zB4V<2!nA3}9)Ao94nBSQ^vV4zLRP&1fsCnMSFebkn{RKQbcAD#HzPxdWB2_x>)qVk zggTGhzFqz7%*^WV@6Mh-4+_-U+S;(Nu!;(c?xS8F9vNFr{r&x)7wyc<%-r?=##6=x zD_3f2Yj>aVVl3fs>tp!8`03pElyCFr{GNLHshOFXnwr}0Z*ONCCbPK)CMG5p78ah} zR=w)#t6pjIWlNU)`1#X!j>X2^_dl-)T)fO@=AoxWAAc-x-oPv3a6hBrY})J@Ga{m* zyp{%C`V}4$B4bsOadMLC`@P@gGVjdZ`meRMb#?f9yV6%vwr(vwAM-+E^2ufX^Xpz; zTPv*Y_aKD<6k(39{ok<~85>VNnX=?}{qu8ko!j|h_tnfSc^f_NbI|Imv(59<3?!;1 zHH3wSm%s3naQ^Y@m*0H5zn`9-zP>*G_-1D2L@tg6U$4zC`S0uNn`$&OMlW1z>i75e z?F$|-+&p_T>w4VUu=h7Nx4+@Y(&o&_%zU{u`}(TYt9Spg?UypuGBOepc5D!2aA=SI zleYQ4j@aoNHzJfKo=7oDPfy=8r~36ZU3vNWVV7-ITz$3w&r|*M^Ydg4lUn9YK9HK4 zD&kuDlcQmg#!R1Yr?l6{?63QKWo7UV7df6rnePm1S(uG}Cg`TL)L z*TGn{^UtAH?)pC;+2<)UIHWT%v>)EMWy_bZU*{U9pL@N2zg^A^1GeUe&!1m^mG*zx zvSm-6q=M zXVchOSy|cGwq4yZ`R~7zCr`dLd%bh#P7_~u7nhQ3hK#JNsQq<&SFY5Yr^evGK4A@i z&`J{ngAc9ZaT~U6le4S&@$&NW+gY26i;L&ZnbXwNbSw9==l6KM>E+)!7OY(P^5SCm z;^*g%HW_RQz8%QIaBH9aHWo zO`AP)=FJ;7G^Toi8iB465i=GqPCgxy-P+n(rN@wQ_3!WRl{RtHt{@ty#Nv?wmPy?%sX-_U+oWYg?TZyN_nw{PlV#!ve`7X`kr4|FgD6ReyZH z`~AM#d9UZsn)T|@Bd2wp@B2Q-|GH>mTm3Dk*RA-)g@woa&dV%Z~6B>^Y6(s z=PxXDwzaXDGk0#P(ag?H&(rVz-`iX5Ki}@{n>Txko}Ma8ulx4q=Hw|;QnIpseLOC& zEz-4Q$&z;#|F6EYIB@LPvyYFDZ_m5CYURpD1W{d#jVv%3F(zh`Gl9|v`NR)HoIQK?+_`fnW0sk@d46R>*xIn?&z@boeqFlg!Rieg4D9Uc{{H&vwY2EXjg3o} zF10QGar%RVLHaovX=&*Y<^xIwJom26zw_nMvuDqqK7IP`-Ma@55>iu-KL0%P%>S1X zsp;wZ(c9iE?zbx{ER5V=xA$LY%qC}0(_O0f*sWW??(MB!wrm-joX87FGc&Wiyu2K< z-_zskR<2p&QtQCLAmOsse&#Q6uGVeaw%yvdfAi+eTep^;&b0@X%GTxUCQqL1qjq`n z^O-xUzP|eO^z{0eolcial9C=B=@j1o^O4Ilpf{mskEd$#I$WMrhHqvJ3A#*2MI zhYlZ()CtSU$?@~++qQXq(8@)N7gt;Sj$Yo*bb7kJI9KZmMFsdfWYY(A+JqZ&&fbq5NU^(jdvYz2Q|=yCzPY7_>5{ zbkg$hP5;ZUiZTTT2I`(a$mqtv@Yj?fqx`S6mDQw_`9Ui~%&%^aTI=WI^XKpP`@B2v zW#8XdtEs8^@83V~>3XteIT5QDxBUM8URqlE`)->vDUlV|*Tq(UfA{v`ldBg#7YIqP z)xGwA_jA*>ZObxmojrT@;>C;Cu3bBG#;5#ua%SesW_Era%dNBL&XpAxcYov(y|#XR z%K!ITCcev;EjxDX*tf+$wGVJGEZAztH#svWCnqs+VThLJHuzRkxkt!li3#qot*#%irIN4G(XRYGGiw zpdVci9z97lnmKv$oW1I?Cnse$x7|&`{C&=dWM>H947a-MV$P zD*yeLA3b_hR9w9N@7L=qJUAE_{_=Mp72;qC3k!QPPk+|3+?*UAAD>xse;RFgX&w_A z8p_kBW#Y4)`}zh14jkTGDe_S9gKsF2`cn|^xh zh7A)=KQ-~yp6V4H9UUBed7Am2?MuQ|Z>K zKaGo<+dTJ{%fFb|*w~<;p!oRpznhL7JJ!|3)#$Jx=jNuF#_8wg+3t?y2>>^}^fWa; ze)u5a;i@(H*@a~K4;TCZKZHiM~&@y1_q4wkaAvcA4PJv}|H)(>5Py<2ZK+xCOn+1lD#VPWB;Nrta(Fl78~ zZf?%a$+=-?XE$9h)~WMAL+0P!-rkcl^*6na*PA|j=1fVWpU#0Hv9Wh2C_0C&iEu0{ z*fxi0k;bYuYtG!d6{R6E>HQs@mN&Pyb{~J7dw*Z-|He&qSyxsB1~2omEO`--oUE)B zZJ(N-zrWz&AwgxgoV&ZG);>8gQB*r@j&1d}J$qzang7bpKD%w>#=^qFj~_l1l$C{P zh$L;CarmLcrfhQg+A^YO`44-8YI%TD$ zrQpGfK&`3MrcKk;ugv#OO-;?rT)BO_dFJ1Rq5Jmj(+*p+Vapbmz%RQGZtU+r|L*SY z<$iNlt$pazwdl>8H`8>Z&C1`!9AS8I{cE&>fQ7Ynbw$OFUAwaMt4s<$wJ*{z`r6O? z{_QN2%u9=0yLlo*+V_2aDPf*>XJhhlC1vH(-{${cN_HN7^z-v`{n%Ysjvr@lW&JBS z`|PxnDevCB%gf7qa%1|+l`9{%*J*2OgW9euL%QDWSG-sGeD2A~>WgK5dB3)=`}2dD zov)&z!o>Q_$NLL6?%etF&d%cLI+0Bh41YIv&7M7b^0N6dzlAzoWW9cV`0()X`~Cm# z9Xz=3?rDaG8ygZ2Us&iI$XEM+v7o4E>4ygg!^D^VOV68f{PEr&kGi$P);RDq{Buh8|JyX$JvbN|fDm2Qg-Km6vI=N*zU>)y`dO7H%a#ilE|}k|U^d-we%rr=3m3k8`I3*1 z?^gYl43k^4Vq#@!Gg?Nw{Ar# z2uSRB>;C#MzrBv0o>-^LS)(7~Vq$9Q>h&Lwia%+ZUdG!{onV!9ZB69Dg$q}-*KYXA z&%tqHZ}s+foh7|)#h;#>oUHDjWg>Mca^bCA(z_NeeE8^S_hdC+r$DFpbx(ylRWvkS zoHf61Q}pD-)6>&UrF@;8o!i$r-rtbO+_< zv!_g-E-o(a?(Y8mc=v<(|Kuunc9_fMaGosR#vsrdQ1&FSZ-O`CS@>Qz%SGpTzOPoF)rvb6m9^XJQL zx3s3dIx$hXudgq7nUCQTQ+<8?_^nx2XPIV;aJjm;w0JGel1kb4`<-=;(tG6@K4~E# zA%TH`r;jfQTDi<`u2t!)D@{#JA3l6Ial&KSKZ8ea-uwYoz_ZPGk8;)W&OWsD3C z`x&#gZQ7)yDbM5oW6s>Ud(+R)n>9;nWyq?zzxG#s&8n&Svnq78kFW3jipRY5_5aKE zpFh~lZk~IqVJFTsNxZ%ZrPP7A+iXcbw55jR^4ZYfS8z=tgP=d8%<{U+{nnAkB)W+9=YINurtQr z|NQj$y2|5yvgzmMXzJ>&UAxwF&q^%~je;T&;Ns)!>+DqI{X0?F-J@>%iWMvF+__U0 zU2oKvwlU)MwY9-3Lj(l{FJ8RZT=0+GaDo1V0*m5jXD(j;Wo~LJDlWcz*DgL;t0_kq zrh28m@RZcnULCqREHX0k?X9h=uZnas*jk=5H8c_kLG> zb94InW_JElr%$U2an3)lud8cY_U1+-GrNwiZut5*SxL#2_EV!%Q=f*%*M2?7E^i>w zvth%Ana1gpY(@3-^qT)%oUpQK$&w|}+w&GK`j+x~f5O2g*KV1)vNRC|Lt7AUf)ZmYGP;SN#pZ2!qU>9Ht77iUn}?QxpSa3eySH} zG~e3V+NkZrw{LnH8Va(NYLhjmdhyQuW?B9&CMij&{cxbx)QcA{rkrbkv+@9kgEilQ zeGBB21vo%u-fZ*yZPw3EJ}hYCkrWaTP?&!DWL|6EU5;aqKQ3CdNJZ$R_4_@=&(27S z*nY85R#w*5)-HNCeOV^6ezl^PxA*$^{r`Ty-_Om`^zd+d{=GesYLjKH%X-c~@0YbU zGcyaTmwJBc)Tudh<}6vFVm5p3ym{~5z0;d~QiQ8DYVE%-m;Ga7V`s}MOPqPkur$as zP$a7Jo!a!%+jDLTiHfQUb$;3N=18ZorlzKyot@Ie4jGo;=kr?qTD~7Ub}ak)y1l<% zt=6c0k;ud5tRmFf(xMZ;?+>W|@bA~_$?E<*Yqo1meYN#^obu`TojZ53va-H>`O?wR zk%w*ZQ^kg9@v|pS-kfxlYu2)MUg>F*CtrS3zmeg>t9uu2Zcb13T=09xjvaqK9OiFZ zQ{n33G9k`>Cx_4OkBzUsT-Mdru6{nZ{7buRgWmktCB?3wNckVoR@L-Ldy@kb$E1|D4=dE*FeDcHzhn9A^ z*Z-m;BU{_s^KWc;csqap-s0!y=GXtb*;zGv+O%U&iw=VUHy78JEw@BPMN^)c=;)le zf8SnRefibv$&3unjdJhU_Wpb}`}_O*=1acDZ_AlEd9v`$1#5yEyus##KSP4Xg=7{c$E2i1jce^^KD;7VqOYMb;q=q6urNtU$tR|7 zme-ia=#?L8;r#aPTRWfZsk3K~-qU}f=A(A`%$YOi&h@?dw`IeI7XhdIw?@sKF{9#l z(LCu1u(bf+-v0UXXUP(kzm_^zv%dcM`T6`jTWtZ38#&utloY%7=I;IX@9*zp$Bv!7 z)X}6jYnkV|uvyFU@9p{d_xt_DK2`_MoXPq5>FMWZXN}Fx^S>W;b#)c$R536pI6Y1G z7W3QE(ozxE+J8Tv3knKywKo0z^1kzI8o#X7m$%#Ri*>rR^UJ&OG`u_Tv}oXXCuzNTV<|3)hoXGt*No`W@Y!jm|Z2D{@lB^{m#$I(wgdZvQ|H7rQT5 zAG^CO_x3hj9i5!Fx3*SA6>p8IeR!xfc)8!w<;&Y!Ti3?#x6{#Cb64JwBiOzP__(&HDHI z`?|R=tN;8cOiNSKo7|{(B*EZE&A$nX&d<)zpFeeK>F;m3%-8EqzNrZa5CD(iUfA!n z`tGab{QUWoCM7*6(i3BtcMMd#)&4HynRhESDQQ#r`+HqoT+FXie0+F(FYoePx24on zMMcHJB4T%9naLja=Pz2ZXOE51VP&DtS)r#_t*)B*zOZ)fTDz*M=!+LG-eCA; z^6K^L&!0YBh}m*=>AzR2*KbJ$H&gPIigpK9R8*YKX+qInMmj7T9%(86RGNYMi zZi2zFV{PZ3Z{PiM`GySz$NOX#E?l^~{QbS1#p%)V&B@36a&K;OU3~G(Ok;Ip$iSQ+O%oYuU}Pn zZ};B%-%)yBKOrgU)1z*EyShIXy1Km8&I=dM@KKw8e*4Cag~i3vMkyVuSFdhuWu1LC zZ~OcG$;bOPr=MqIV|#V-&9?me`&zlh*}!1i>_0OXX>5)9`?%j;&bI2ypP!#q&PtZJ z^E@cpDQ%YXPe0xF@tE|j)e_v?+`&OX>tc3ps{Q><(l~9#%$ZxGT#b#5 zt!GV~aChzgHV>6q*5!G=zP?#mS(TNRS(XwV2NMc*#&C0UySuyRgTcy>TY1O++g5+m ziQJ@OVKGCdF7s>hg0R)yU0p#zL2i9AJL~>d{jL7fslWeE(ffOQnDqI(t#a?k9&H1!`H=BetUEC;GOUFU$2IX>&5)|@$oSz z_AQH_tzN(HQPIxZ+j6Dt>uRFoL!+WV16DhC>?p~wXWG5HUUH(xms{EEr%stt^W~!Z zibn}Q(huCZbLZsAlgE!gpP4?du%slXd~t1A*|$lm-uJ5C@9h*;4-&Z=_Imz|89#o% z-+%qel`Yl#!f*fD|MS^wJ3Bl1x*rca1eIs)jr%S#!)>vruWxB#;Y^cEp(Kar8*aY2 zxY%7?U7i1yL_$i+m;e9n|F3?%c6;5wpU=;nIb;9t$KyvwyBE9n$L+1!`tS8h>vFl) zo6P$sEnWKb*4FIirlx@X2M?TY@K9NlS@q(=!h;77I=Ar{8X8{wuiDz$`hNfax`Kia zM>>T?xm=^qR>j5LYi8&7^7gj1wdIx66c-a)7rp)5rAwcB&F{@HO7%K@{dL`|6IVY} zEz4NwY?vUhO(I6G{L_<@-qUn6wX{I9`cZ42eXNj^ljG#%{1silHR|v7{eRCMKYn~d zRBUkY=llD=obg+K?AS5w@O2f{)r;$#ch9dcF8-W8uku;1`Mn>XPV1XW`R?9cJ8`mp z(8`c{r!-sZC%0}XN(l%YNHAbxVv4HW`%ZJimMtc7{qD=GHf|QKcDBC$>--EuWqtkp z<9)LK{{3@WSn&Vf-?n_;YxC~}?B+GGu!yLZjSx>^ejC7}p{3=-!(bbsGtEQg)2C0f zOtY_je0*Hqt|sF|Y(Fb2tD>T!)4~mF85RVsG|Rd1;K`FEzTG$06+b_B(d6y>_woV) z7p_gu;AebuV`KB_r^}WuUHI^wQ)y}G&Ye4(RoFiK{4>)yUCy>@N=&ezfPjFg=vR|= z?{{~0US6Z`q{sH*{af4kCuhP}KXj~qy1r3;+q=8Fr_Y%2;?0{mlP52>Pc`}J!Ygg2qoc!< zeo%nf%3VR=%skuQFD@=NG&B?x6nq;Od~sdNj4I+=Iy*b}@8ADz zveVZO!nqk47S-Q$k{Gt+{Pp$mk&%_1U;S?9;dcJ}yUWiXsJ=J5mzBoi{zS?Sqorg{wJ=%ISY3J_U^0rl5BEQd1 zam&2MyQu1Era_V@4a>{Oht-79A+wbnk#L4DQU?(WlXZf^G6cB}ODwbHy>?LD=g>*ICAq@|^~ zS(+3aeI9GmBNdnC@C@Xt=d)wRZ-+r&^^`Tboxx1fz&&*ig^`yX} zXy=}%bKjqh^O^SY&!0a}igxz)`bKB-UywCSNI1i4D8Zwzzh2dQT7iX3k$LI!S^vI# z0rk*-|NLnv!4n)D%+~zy?c3T94-QT{y+2n~cX`#v&TH4NgN6(`7@H-#j|z1ky?5_k z@$++kA9d?zWo1?E`+EJJ|$^Z$bir7KrLzIWxeIthx4Z_m7}*0spX+ne|N0oJ+4 zo)*oo{dRNLu3c-Rw}0EcI$e^dZRygbD_3S#RsH(&^YigO+1IaMXL~3)1syDVd#m&} zxb@u7z)-Yb(=~AC&YdEzokx>wMR)AjF(XUc+a z*2mR8KGwVL*0C#*C#I}fX{)**Xyu6sA^$%fyK^T- zU441lb?0wW1slqgEDQ_`EG;Xqt_nTDV(p<;f9A}Yj9K5ld;v8}GH2zPpRNzTxjp~> zG~H+yrHiXVSJ%|mdV70+Et&i2^Jma1B~arxZVzZ-)Y@;?eSCaYtzP~9{{H>h*Y%t? zoj!P3n1e-s&j+TRa;x_*nU%gVA}=pbR8*9!HRkJ(Z1@DM9_N~!+w zG2TfBx~>>bx)P=|@dck}^k22=Z*NwvT$x#En<6j8$g@OL&LBlWM}(`krY5fP>D2Z6 z|Lt10Zr$-$Hx@d#^W1#3xYlrI$FmCyovYqG*3;0qu#P1`;KJlnr%p|pH0jsBslj4m zV%xTDd%`lUak=2;O`8@iTIA#7bHd8e(XsKJNWG&YS7AGV6eoj7%>>eCa?{;TWe%#o?C{(a=gk;}{dxBpgDIeAw| zSor*0>+A2zLH7HxB%1C}zq_}({Nf^4+nrTcE-t%&?%cW4r%z9Cj?qm|pX=!QMVqLwm{?l@OHU=SPyT4z8k2ExP9Zj0J_w(&-xvw|o z+G|bqnw=Q>zXeo8TjtM~zd7-a5x<6HHXA$py6Pj}V=1lvsP@aWh(`9XQ^YSAd zf*E@3_n!36oO$!aMCHeiALrlObJN(@-jgjoq3!6TNkU+YOJA^0bYw_ttcr7XJ{%rj zd$nAxiG}H)xBlKKbLQBjosm#iS9e}k>%rb6qr=a~ckS-PHD`-m`R2E`v~1x~Ptjd+ z(>$mA({g@YCUfVqs*MqAQcq8tI%Ud&yE344wjo-jg@u)Gw_dM$kQQ6?|9Ue!zXT84 zO|$e9asGVm!eU}(#m~<0{ngoYC@eO%cj*JUV<|?54;{L;KHmS6{Fg^Z)O;`N>FMe3 z{c`ETLg(_gw^XNkJ%0T7YmCoY*Kfl16(1fzTS;TLgGfwwxvs#_V=HEbQCm$TAgs)KQQoOGdus5+v;Cx zgsx!nmhViX)+4{;GJnmTJNNLR zL(6<;KYR8}ZK8)pSJciT)vL$$E?N8O`*(jYFD-3tZB5OeUoQI_8ykZr4YvL9RuSrS zF#<1vyD{zIliT_G?`}>%zxlkKb>blwA%?E5u2rj7Yj$N7Kkr|+&t}K!wQJ9wJzH8( z;2YSXKqSo4#y@@FQ zuhZxtAR}W__2tEi6&m5;;db-?o7~s6w*KABZ&&f@NvDg_#dD!q>Fu|Et-8G2fBBLn z9Y-G>IpVS@Y1Q4Y_w%;Cmse(3v}se(=Vxc1J$ts|(O;42r{|hv2G!NoU4K@Ymu=f? z@+ikF`unrRVYMF)vhSL{-tKSzF^&b-@9r+wS5sT|d)E>@Jw0J{zdL)Yzn`6L4qC(T zj~6rpraqlQI%3&( zb`++coAa{q+WwU*HEnI@o=oXF`e>rE`>UT4At514mM)!m_gZY}%;{zf3CaQQwRCmg ze)=;>hVS_0%f@^Zz8bzmmJ! zFPBwWSs4>E$3em2@U8eB8B5SAn_ath9oOpo$F_ITqC+3Nn)jf#fMyF8PV7e}p~XOej-*zb$~41>hKzrKp=$E{hl>ebiyt|w{>Gp)3=Rz<${ z*V}jP?{P*6h7&CJU$5WaCvicaN8awwWPiJt-1B8}-)A1}5;gJNUi~uJc;(8KZfb~ujOP4NXUS3vcA+u#et)%bew&g)DHr|^YqqlwYW@8oMIbxn%Q)bP|@(5lh z%fcgR)N(dWTF7|8?&Z9EG8PYBzrOui`0w0hwx{;x-Q6`!UW3{H58oVy3s&fY zTeogKKHmSjpRqP;QT%qcNjw5ixEiN@y*8mFpV@%H#LR4-ef_=5mxXag zW@q2diZwF0dz*oWL4{33L}bT~9SaV=&31BjK0n|7zPsArt-EWjtnQxzkB8pgtFhzi zxmok)%jic{#m)@L}oe&*;YhKZ(<@M|h%a$!` zYilchey*~*dhyw}!ISOfYd$!}|FC!&_dMxGc;;oN2{n7#w*T8Tck7)yF)@Od&65xO z{QP`={l7|a@#(DGVsq?jclGxKmugRXcVzKAsfd7p4^t-F|FvV7PsmY{(1$rFRaDS&%OQH8h=-B&%=ct zOM~WGm9AQxsd%D2teU}nyZ*H|J`7QD8RaZ1eVMPnJCYn;`k&p2LE&+OcKEs;DN`=r z0{vMAiHD|Yhf7IIS8r6S`TcggiEsHLZu{C_UrwAju`&6$)I2e#-Ci;xB3E89%G`Bi zNMd*~arW%nI^WaJm;7h@7855TAUUJt^D)jalf_6>s50P7#h^?YRoRVW!~1Qa3T2b ziF=GIL$VUe=f%kWnG$W!o&#F-w`$EAo01m+2?+|fp2|i4P~C3&I)kyhyMX#Sb@GD}&o=K9szVy=2^Yna48d!o|akGdP;2UAlbP zQl@X-&%@T`@3zcxTq6APAA2%`f{B!GTwGj6hQ_TId2|2V+?E^dul76V+N{Z(GWPcS z%j|`A9p7Cdeuqa=FX!&A(CQ@zK7fr2({7$TSy-}U+Zqp1QPKGNzhC!Mel{{Pnst=n zZCLBNwN7suZ<)=UHLFkFe%`W|zO&6h^%ZE(Q1#uXlkE)+4fXea5$Zqw`l0;Vu+^VG zeG=1)kq{CRl91SudRpx7$@}Z$_Dadi*Z=zRa>dPfpA`A*IEDnc-${3DOp!n7rfjrSByCYyu`4y^y}Z> z-vyc3jO*+Ff4^V9KXvKZGiUDXC`?XHe*EUI=jZ3O-|mWVxyHoYSr@ze-TnRj5)Bd; z*31U2-uv<6hpP89pE(v6PoG}B_P5`v)vJ4Zdw2i1%QNrhcFS1)*Ve_Z zzL-%}_b;USd+WbmVM|NPZ{NOw7rp-Y{adjuOIqcq zxqB1hYVz{lxy#q4R2-kbXvO2>{rWLG0<@;?+Ot14KC#dy$^TG@1LDz%Dr_%@f5G8A0Hoo z{rYuv#o_+#+qeIdy`VK!OI=-EQ`2){07t76^KY-SeXJ}jEE4m07cE)hGTY9h{yXpN zCWq+zC6o7^onv`V)}ws=D>o_x)90UtL=2eSV&;_C$|oXJ$Tr`t<4R*SGVYN39K0S5v#U zuh!b$-d;gLK}W~u|EeNm`#&F=TU%Wd5)x8UmOPZL%;A#SvT5_??{9CH|N4>{A0IE* zpPrif^}|EwoiX?Fo@#1quU@}iywfFiH*1F!PxpabU-rGf-|g;ToU5_@$B&AI0XHTa z+iPlShJiu#_jkEB!zRgE->>}++T>tkYkR-$_uCI2K5UzIaaQfajmgKs(^H=Av+K4- z?ajWvF8B7fiTZC|nD}k>b)3N=#UpIz-Y@6t=lAXN=g(iiu3f!axcg{aTwL3k#jCEq zI&;Ry==065UsERVA2$$Bv6$#l^5{sX+_@ji!0Q)p?-E+SV1a^($&}MiH$~{MHBX!} zCFO@fjCpTyyV$iY(@WG8 zpY$DhKdF~IKQ}i#zE-q%x1w3zog3QWwOgxxOnY+Us`1p~NlT-2Pvf`UAyH+l405z7blsr8pdW6AN&2LV{ z<72)1J}lwl;%aJYn&G3?d~m~-EnmKUGc%a1i<>CSi|6b3|-)CrU?%sVr=eB=X zSeSgJgS2^`ifp~T{r z3yO(}iHo(U0<^{K-lA+2`wQ5PwO2zFxj0y}q5n*9r+1J)w%rLREv@9(xZC>?tzH$0F zZ~eVTo))oR6;_uF_wn(0^ytxrkL`|3!4AJb^~tdw$rP&!g9il`lhu50?J8Zpckf?? znmcUkgc%eVc({CheZ}?T=9p$*o2nhocKE$@%83bIz}qDsUu5QC^ATy>_u)hWkGx&Y z{e881dV0+Nri*g0tl#tLl<|3+=I4A33=ID}85g_tdU<<){_;iUz<#y%!1zxAWGWEi|D zU~OhD^I>3Ma{-+T&=B@e;YM)fpC2DVTZwaTZ##78Q1te^uZzq5E|=8Q{Ml3a`NCgz z2Zn}o!7D@T|NTggin=w^IQ`dAX|Yb1&FSak_EZ>Nl4IaW^I*HqI>l>g(8`kH;@kUb zf3FN){_9`Bf#b*3t*oTh+80E z`R@M<7Xs|dTA3%F4?3e5`lw+=;9I`!(@!+rx_t3~mgz zj%t(F#_TNm|L^bmeZR8a^Rd>{)U@%-_o*{6uxxAm#v<2mo^?e-TzvY22M^x7c>|i; z>$m^+;^B9P%U_nKNs)ZQHhI&z@z=mSxwwWMsUke!o|J`su)1 z3=M(~@k=gdfEx32EG}+!W}LO```g>%f`W}gYz<+*7HBl>J8XWtkH_N`8EJ zxUP#4G%FhrAkZbw5Y?)=z|KWQ$kNhs=B!!MrcS-PyZpW8{@ZtU7T>RYE^BOTETY4( zg)7*h)-N?RH7x8}pRBcB?5-;>^NkV@wfz14{r0U}i)=s}t?gH?T>10Q=kwRs$KT&6 zVUT#JWpDNONBhJbMvG;Oo8 zl9G|JvAWNU3k$E+zrMCM<1ZtFazo>T@AvELU$5P6_wUE!viO||2b-QeN$GTHa$;ua zVPIq08MCkQ^Rvv$%U;&sTobuDY<*nsHF*XB1~!par;X+B@3C@=y~zAKdGh4koSc9# zh6VI50@K%$hap)$7;2 zJv{*;3=IsR<3E~B85kH?7#J8FKwR1~Xlpv$11t<8jG*ICKnsx;T+mBXlpw7s2Y$JAPna4Nd1?$KFz-N2J^dEkas;@{an^LB{Ts5rAHfU diff --git a/Example.GameLib/data/block.png b/Example.GameLib/data/block.png deleted file mode 100644 index 16d2c24b924a3f4156c362e5162bf4c1f2129f93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4280 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z`&N| z?e4W%r5Zturkb}NyOroCwEqia9bbV-W^u!##)FrPChfA{?F!#h8D zwa(0ytn>Z6?$?}Wxc1lKXkA-Dm2{pd?&zoM~sD0R#ujWi>v7R z!ug;4qobwQ#qH%FwL^ReAq-yZt`f*6rJ+ zT^Xt(r?s9t=f}dzy3)u;^Sj}Zg*vsMYJb?R;z2ZSxj@;bb z2`Vr77$&DZIM6tgK|oga?bnX-_xFy@umAV6oOxk*R(^i_%^W-Kc2(c7m0|u%U%ko_ z5fy#7e12V1(v7OOEk~N!`EBN%ooiiQ@crH0I>%#48#UOzt1)D(346_8o}05*@z>w) z_mdwUYW48*JGRKRd%@ML-*a5t+}Qf$?cYs2z|JRg;LXj=8!JCQt7Cj{W~TAF&rC{6 zNsbBmP2i)}NA7iJ&#%utGsCd<)c+si?0hl_E-ozhYd-siHj9af2r%@^S}%*b zaCWwN@ZyUFCnu@C@xQgJbTyO1#9(W6|9O8La@oVz#UvIK7^wTqSkSe9(V`}Xh?tl) zQ65Wu9UU2e&n|m+XC=di8=MYqZpSK3dv(RQm6ere&Y5$jonL;}Q}dZVEC(hkyI)G% zyi(}Hi;Ig{4)pZ!cul(Up5e{Cz0r&bJDCpr4P5MYx8(YTyzR!;*0Zbj&fA`Uzs!2V z*|f(eCMt6_s7>~qTENT8`{n!h^qQJI;gdJt%+b-+eR{N8{BD+bgD8Un(}f8=1?jfw zXJ@reR`*}DX_L^$k00~azGauMY54s7{NhE6m^NB4 zWo6~y=XWnEdOz>(QQqu1g=ZcdY~KCL>D%V>cFGKSx3-*A_Fi4a>pkg6PY(~%gNuvZ zZRNWdAr|hw03VPe0)ruA>%@ZiLba`%#WXi&t}b%;*&6F(BJz- z=xy0<_t*RO?TefGVRiU=HHLL@dv87N^qzEN%^IC76RCMNl|fspOBp_FWO9&gxP81& z*82aBsHIDm6kJ&mxQbOvPw(3c-*-1QHZxeHpOaaCZ_gsj>hJHqYV2Tga1_`V&agwH zE9vvi&FR$!`~LlU?c?pe_-4+x6SXU2zjv9QJ9q9|)+ert)nRKtt%$9xv}7#!@ZjKn zO@@${C03Vb8mG_k2@MUMV^?dHot+(8o?{@9VIrk@dXxLUINtjFw|g1iA8cl4Iq-a5 z^}9Vx2iltyVhULo?A<%Jx3_ndwXA)e4daI|FE8g+N=r-Ee)_ua7+1{{u1gsvR<&<` zELgChIIE>zD);`rxePykKA*q(lYpY4A`d6$!lOwav-bS>QNhN-QZXgOmbc-;g$rS< z4Tc*xZk+Bv*Xn7Z``52u{X)aE_w3)l-~HCr_>G4iGqkj}Znb3e@bK92P?KSjilM3L zRE9hI&i)g)cRk`^A%l{V(itv>nVg)Q_1CUksZhNz&$jx`r)STf|5n+fztJh5;mDCA z5h4u7q}s`1QLx zI~T7yeC(Lp)z@`*ca^dn5Y-N=P~EeBBa`Q}DN}3~F72~eaGBGgq~uHJR#o+*T)Vq> zi$47P`E%{8J=-@jdG7oB?e>|ICm(LjzFxKDt5k2B+v1I}j1T1h{rl$|zAmQlc4ArC zHZA98*@27g)#lHheR{P@i;jPP`}XaXmnA)2UAvYue2`zHv2E98#?@hKl^EXL z*!VbJ>ctPM%E)OmXU_C=6xdP!|DSr@`&X}$0s;c~8J4{)vHHBwxxHrH#h+3yG)h_W z)!)C$tNv_JwtKFipkPl&M@Aq+Md37Jw45GV9OSh^;hH8 z?(XgGUc7(*{!qq*rnvR>JIdbPT5k0G>C-@wqjs;WHtGBpc@eX#r1Rgue?8sZ)rV47 zs`}r_jfjvawVHdGH%*$SZQY_pih=3RdA|L%s9RkB(*67MK{-~-s`eo>3bGI828H-3bLLIrO<%Rk!gcqrW>h|2mv&~xLakXP)9?Jab$o$i^NOok z*|GggOM9iw&z<~mT)zIppP!%oc@>zLnfDq+bv?MZ?C89d>EGYqe}1f2y7K?OzsvvG zB^}{l`XL|AU^Vs2wv8Jn-mm%0JA3x*-)k2w&RJU-b*S#vlk_t)9!@L2x2G~@OGe=O zhd(wX9_DzkNt=Ox(&WjWljQ6F7@j_Tdg@$-o7cPg*55mH`AXHzO{p>_83FTE|DHJE z!DR7lSLUsWvu2%YX6N6uVZ(&4U%&1te=p}*^z_u!P1{%9mS^R?{^mlg-ln?0RZ=`` zb$`EJul@A%=TE@{-`6qBXy=zdceGo)`1-n7o61irvuDlPk$>Ng>A{zmmu;{E4QZR}kH6fQpy<4#?r&9CXlUX4dwX-TvXXp!c;YJ_vW7}8?su-w%Wj{&?@><%_c6MP0cYfs=6D9<#4r!?S^U?j^RTa-kS)paV*~&^v zAs_dBJSOeq>6utrX}Ngu;+H#m7<(UYsYoa&_~6R$<59Q%g*$itOrM`O&$4*g=YUWr zr>5wCKR-WTymTq+)2C1KDo>v}wW0cZo`|TZqM@N+Vq#*!9XUpsa4(CRA0Pf}X=^{; zl6iTLQO&*!`uqPp3Uqybq*M4x)>a)Ios!ep8zVG0nu?V{$wU;T2nvx1lT1nzC0Fl*MSh0g7(9-TdP>Q!Od%X@pPef<63Gaj&KIMLbJ zx&3$c=ZnEsB`*Z5t*k;m>P2tsF*Gz>#h0w%_UWUHOW|cMhR+NIZ*FXybTnz=PxED$ zm-`!ATF#8G`?+-0qRu20*>_hgw;wp*V3jwGkzpFcgEn62C9K?H6?-TCT)%AFHZ#9j zCY{{kdLg1SwU!^$($@C8^p2}1Z1vK|UUL^zFwU_q_lu5<-roA! z68iStyJKHpU;iJZ9~d6qe&mSDlxfqP7GK=))V}VIMH{blTX1bcia(ZZCp6~1Fnds=qxO>;GjLkQntXidYZm#w8t5>hul)e&~t{Z*q-MhT>y8Q_U znIgqoR z1rHq3Qd4a=vUD-rINm4gz4_*urQXwvzP`Fz`ts#V^X<8})7GwE|NP0x$&pb}UX$)@ z%@$woJNwwISyEn;j!c>)RQKtmy2{DT>F0}HU0JE4t*!j?MaHighRGFAP6$qV^85Y% z^LzH}k-He_=g0T_?Cj?u=Z|+w%$++Il-9GKhX4Ede12qjxcekE)*Gj%>swE6yO}d> ze%Qrbm7mq#-`VMWywxv~@xgw^4;L0X>*(n%yO@zuRb?fvALq0C?zxr0%dP(Ay1KG1 z_nCPpzW(o2mB^5gBjNG2Q_b`4Bt%C`gTyCI61tUR7Pq^s*V585WZRvtt}ctZKNac{ zckkZy@%By*3Yv78x#s)ba@#uvp`oJcesfN&joxmh9v&Qg_|2P~m21|#(K}f+=~KIW z-HDbK7Bdr*2`c6}Hx6976qGLQIZ5NR(RBUzb93g%w6(QeN-z*`kYTvPbl~Ub=f-Ac z(>8A0c;@Wcr>)%LGv?1fzh#Tby4c;*|_ zw93g_x1!WkR1ECx@9+HLqb4jYENof)%;&jBq;^N|;zu)hltfH;0 z{qvml`w!RFMuYNqUY;I1pNxmSy*=lF2u6p+Zi_qRjZ!+6ZQUx`q>%9A!^0J8*S_6T z{(hdHh%0A9!qzC)xqiz2Q(K210J&G!8J*Urqdjh=5?`S^ySr(PxH<%iQYC!U>U+R@W zJ8$!uN6mK@%cO|yd9qB*%p23s%f;-klRbL$C#x>Sy@?I zE3-Im@a}gqYEH79nq4f_>n7wH_FpF=R4r;60Exb(5P#OILZ!b^aob6{R)r zSOnhgh_gTNbk-g*2kC}u$JZUxD*taKE8M>LRPlvEQ~MJa!wnd08Jxqyu8B-O`Q-YA h3m@M1S=#-sXP*1Rqrs73Dgy%pgQu&X%Q~loCIBS!HR=EW diff --git a/Example.GameLib/data/level_01.txt b/Example.GameLib/data/level_01.txt deleted file mode 100644 index 4141de4..0000000 --- a/Example.GameLib/data/level_01.txt +++ /dev/null @@ -1,71 +0,0 @@ -###################### -###################### -###################### -###################### -###################### -###################### -###################### -###################### -###################### -###################### -################## ## -############### -############# -############# -############## -########## ### -######### ### -######## ## -######## ## -######## ## ||||| -######## -######### -########## -########### -############ -############# -######## ## # -######### ### -######## ## # -############# -############# -######## -########## -######## -########### -######## -######## -############ -######## -############# -######## -######## -######## # -######## # -######## -######## -######## -######## P -######## -######## -######## -######## -######## -######## -######## -######## -######### -######## -######## -######### -###################### -###################### -###################### -###################### -###################### -###################### -###################### -###################### -###################### -###################### - diff --git a/Example.GameLib/data/platform.png b/Example.GameLib/data/platform.png deleted file mode 100644 index 09fa29290e3530f0b28f0ff1122bf93e9a2ca1da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 652 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU=ZM7V_;xd_PkP)fq{XsILO_JVcj{ImkbOH zoCO|{#S9GG!XV7ZFl&wk0|NtliKnkC`#m-}ac1$XkBLkS3`}yKE{-7)hu?;6TzAVr z#I`J_Sts(;0io4GJ@X`(_8&a*P3*{&welBO>)n1c*0|rl*S2x$De(Hn}Gw0+yliF=;J&A(GzJ12&*;f2AJYf^_F3fz9Xt@zR2?*f^#J{4FzsIVzp$LPdy zVqH}I=9>zqH@!1U*cp?w{k9{+f@`~q!xemk-+Zt3NIs(<{UU$c|GNF{0!#ulkMKh@a})a|dIn6q|iP}ebusO*<}mlyY4i)s_# zNMK#S^5I|0maQ{WBQHrfYpV7d&hb&}^>}aFy(pn);yKG@nNh`0LwmK?nqD@s?Y;W? z;gP#P6ATm>`rH;D6Er+#{P5bX;5-I~xy5JO1ems7^O@Aree{v=$um*EW3&JAJV;ix zsxREC)X=_*fuXmwd(na^le|`1iTQuC^rr5YCdVq&_E>!kTNAcAN@cRj zLc?W++0y1(fyV`y(l%mH`Z@2e4y+5Gbz+eBy(!M!|@zCRfl7#KWV L{an^LB{Ts55cD5J diff --git a/Example.GameLib/data/player.png b/Example.GameLib/data/player.png deleted file mode 100644 index fbb9061a73928673bae32c5333bb366b44673c92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1164 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VBjq9 zh%9Dc;1&j9Muu5)Bp4VN*h@TpUD@xk$%!-bJeacL9RmZ4oTrOpNW|f{)BQbU%0-Ub zFWxPknzm%>C4=rOOV(UF>?Ex|A>ib#D{)mHCOJ7M=6Of%ow8)YH-#6G8JT*#M*^5y zIk=NPPLNw-K5^Cs1JA^bw@goEtzNysMDzE0;i!22nVhTpUcYmDvGo4s{JQtwXTSgc z{oZ@qd;I^BHB8@Ba#}F%VclX?oPFTD16M`S6(*(zz7ht(2h0m(GZ_Ayo3;Fay@OZ< z#~Ft2jjHMIGS@OOHN2b<#}voQ!t`R7UvaVVu62u7X(=_`f3H6OeDZCx=;-JtpMSoM z(KBbPVUKv~BGZ!g!1#f=Yv7WVD?R<@*=SzO2sw8AcxqyzV~kDRpC3Ofs;i^d#qL%U z*N+nk4L$nNV}0?Au7!-s4H{iay1KeXHa0q+KYtF=3=0qUcFkdsxBR|b>63rVr*GfN zb{0NvyVCUZX=)SD)rR?5xk2&pgRT?R)N?^7r!?9)14FSGskP#v+Zb&t16nYt0+`iVq9ctafdQ(0P{G?V|K&^TuWi+m0v4`(!7(C~Z8wZO4um^Xj+*VuRv48%iH+y?Hb8>8Gcs zO-xMQ1f@rcEz8`rZ=auq%&~2`=jPj=zjR3`J3BjK8f(M-_v$iy!hG%X-|LESojH4U z=lt)Dd#1DNF;<3#rlzF0aJ3$4{P_0WJF(Evr$0VEe)RdL%Vm>55m%nWAMQ-{TDoNW z_Um5{h_lCD;#=i1do@A)YPd{r>;7wuCBgx`SRsc{wNl7 zaozr4mvGfnGBZ1S^6TsC!(D1VKRdgZx5K;c;A+FrQyni@_A%XK3Gu!B;`QstUtV73 z;p4N5w=gtx)S8-DCs3$IYH#Z9t9Vap{Ffe$!`njxgN@xNAq8cj5 diff --git a/Example.GameLib/dev-server.sh b/Example.GameLib/dev-server.sh deleted file mode 100644 index db8d5d8..0000000 --- a/Example.GameLib/dev-server.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -(sleep 1 && xdg-open http://localhost:8081) & - -php -S 0.0.0.0:8081 -t DIST/web \ No newline at end of file diff --git a/Example.GameLib/dist-emscripten.sh b/Example.GameLib/dist-emscripten.sh deleted file mode 100644 index 102e409..0000000 --- a/Example.GameLib/dist-emscripten.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if test -f /c/emsdk/emsdk_env.sh; then - . /c/emsdk/emsdk_env.sh -fi - -if test -d cmake-build-emscripten; then - rm -rf cmake-build-emscripten -fi -mkdir cmake-build-emscripten - -cd cmake-build-emscripten || exit -emcmake cmake .. -make -cd .. - -mkdir -p DIST/web -cp -Rv web/* DIST/web/ -cp -Rv cmake-build-emscripten/game.* DIST/web/ diff --git a/Example.GameLib/src/GameEnts.c b/Example.GameLib/src/GameEnts.c deleted file mode 100644 index ebce181..0000000 --- a/Example.GameLib/src/GameEnts.c +++ /dev/null @@ -1,179 +0,0 @@ -// Copyright (C) 2012-2023 Valeriano Alfonso Rodriguez (Kableado) - -#include -#include -#include - -#include "GameLib.h" - -#include "GameEnts.h" - -DrawImg img_player; -DrawImg img_platform; -DrawImg img_block; - -Entity ent_Player; -Entity ent_Platform; -Entity ent_Block; - -int EntityApplyGravity(Entity e) { - float grav = 10.0f; - float vTerminal = 50.0f; - vec2 vGrav; - - // Only apply gravity to some entity types - if (!(e->type == Ent_Player || 0)) { - return (1); - } - - // Apply gravity - vec2_set(vGrav, 0.0f, grav); - Entity_AddVelLimit(e, vGrav, vTerminal); - - return (1); -} - -void Player_Proc(Entity e, int ft) { - float acel = 8.0f; - float maxVel = 30.0f; - float jumpVel = 50.0f; - float airMovementFactor = 0.1f; - - // Process elasticity - float entityScale[2]; - Entity_GetScale(e, entityScale); - entityScale[0] += (1.0f - entityScale[0]) / 2.0f; - entityScale[1] += (1.0f - entityScale[1]) / 2.0f; - Entity_SetScale(e, entityScale); - - if (e->A > 0) { - if (Input_GetKey(InputKey_Jump) == InputKey_Pressed || Input_GetKey(InputKey_Up) == InputKey_Pressed) { - - // Apply jump - if (e->vel[1] > (-jumpVel)) { - e->vel[1] = -jumpVel; - } - Entity_CalcBBox(e); - - Entity_SetScale(e, (float[2]){0.6f, 1.4f}); - - // FIXME: play sound - } - if (Input_GetKey(InputKey_Left)) { - vec2 left; - - // Apply left movement - vec2_set(left, -acel, 0.0f); - Entity_AddVelLimit(e, left, maxVel); - } - if (Input_GetKey(InputKey_Right)) { - vec2 right; - - // Apply right movement - vec2_set(right, acel, 0.0f); - Entity_AddVelLimit(e, right, maxVel); - } - } else { - if (Input_GetKey(InputKey_Left)) { - vec2 left; - - // Apply left movement - vec2_set(left, -(acel * airMovementFactor), 0.0f); - Entity_AddVelLimit(e, left, maxVel * airMovementFactor); - } - if (Input_GetKey(InputKey_Right)) { - vec2 right; - - // Apply right movement - vec2_set(right, acel * airMovementFactor, 0.0f); - Entity_AddVelLimit(e, right, maxVel * airMovementFactor); - } - } - if (Input_GetKey(InputKey_Action1) == InputKey_Pressed || Input_GetKey(InputKey_Action2) == InputKey_Pressed) { - Entity_SetScale(e, (float[2]){1.0f, 1.0f}); - } - - e->A = 0; -} - -void Player_PostProc(Entity e, int ft) { - - // Scroll View - GameLib_MoveToPos(e->pos, 0.6f); - // GameLib_MoveToPos(e->pos, 1.0f); -} - -int Player_Collision(Entity ent, Entity ent2, float t, vec2 n) { - if (n[1] < 0 && fabs(n[1]) > fabs(n[0])) { - ent->A = 1; - } - - if (fabs(n[0]) > fabs(n[1])) { - float intensity = (fabs(ent->vel[0]) - 10.0f) / 40.0f; - if (intensity > 0) { - Entity_SetScale(ent, (float[2]){1.0f - (0.3f * intensity), 1.0f + (0.3f * intensity)}); - } - } else { - float intensity = (fabs(ent->vel[1]) - 10.0f) / 40.0f; - if (intensity > 0) { - Entity_SetScale(ent, (float[2]){1.0f + (0.3f * intensity), 1.0f - (0.3f * intensity)}); - } - } - return -1; -} - -void GameEnts_Init() { - - ///////////////////////////// - // Load and initialize media. - // - - img_player = Draw_LoadImage("data/player.png"); - img_platform = Draw_LoadImage("data/platform.png"); - img_block = Draw_LoadImage("data/block.png"); - - ///////////////////////// - // Initialize entity types. - // - - ent_Player = Entity_New(); - ent_Player->type = Ent_Player; - // ent_Player->flags=EntityFlag_Light; - // Entity_SetLight(ent_Player,.2,.2,.2,200); - ent_Player->flags = EntityFlag_Collision | EntityFlag_Overlap; - ent_Player->zorder = 0; - AnimPlay_SetImg(&ent_Player->anim, img_player); - ent_Player->proc = Player_Proc; - ent_Player->postproc = Player_PostProc; - ent_Player->collision = Player_Collision; - ent_Player->mass = 1.0f; - ent_Player->radius = 12; - ent_Player->width = 24; - ent_Player->height = 24; - ent_Player->fric_static = 0.0f; - ent_Player->fric_dynamic = 0.2f; - - ent_Platform = Entity_New(); - ent_Platform->type = Ent_Platform; - ent_Platform->flags = EntityFlag_PlatformCollision; - ent_Platform->zorder = -1; - AnimPlay_SetImg(&ent_Platform->anim, img_platform); - ent_Platform->mass = 0.0f; - ent_Platform->radius = 12; - ent_Platform->width = 64; - ent_Platform->height = 16; - ent_Platform->fric_static = 0.0f; - ent_Platform->fric_dynamic = 0.2f; - - ent_Block = Entity_New(); - ent_Block->type = Ent_Block; - ent_Block->flags = EntityFlag_BlockCollision; - ent_Block->zorder = -1; - AnimPlay_SetImg(&ent_Block->anim, img_block); - ent_Block->mass = 0.0f; - ent_Block->radius = 32; - ent_Block->width = 64; - ent_Block->height = 64; - ent_Block->fric_static = 0.0f; - ent_Block->fric_dynamic = 0.2f; -} \ No newline at end of file diff --git a/Example.GameLib/src/GameEnts.h b/Example.GameLib/src/GameEnts.h deleted file mode 100644 index c76dbef..0000000 --- a/Example.GameLib/src/GameEnts.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2012-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef GameEnts_H -#define GameEnts_H - -#define Ent_Player 1 -#define Ent_Platform 2 -#define Ent_Block 3 - -extern Entity ent_Player; -extern Entity ent_Platform; -extern Entity ent_Block; - -int EntityApplyGravity(Entity e); - -void GameEnts_Init(); - -#endif diff --git a/Example.GameLib/src/GameMap.c b/Example.GameLib/src/GameMap.c deleted file mode 100644 index 7dbad45..0000000 --- a/Example.GameLib/src/GameMap.c +++ /dev/null @@ -1,114 +0,0 @@ -// Copyright (C) 2012-2023 Valeriano Alfonso Rodriguez (Kableado) - -#include -#include -#include -#include - -#include "GameLib.h" - -#include "GameEnts.h" -#include "GameMap.h" - -int ReadLine(FILE *f, char *line, int max) { - int c; - int i = 0; - while (i < (max - 1)) { - c = fgetc(f); - if (c == EOF) { - line[i] = 0; - return (-1); - } - if (c == '\r') { - continue; - } - if (c == '\n') { - line[i] = 0; - return (i); - } - line[i] = c; - i++; - } - line[i] = 0; - return (i); -} - -Entity GameMapAux_CreateEnt(Entity ent, int i, int j, int res) { - Entity e; - vec2 pos; - e = Entity_Copy(ent); - vec2_set(pos, (res / 2) + i * res, (res / 2) + j * res); - vec2_plus(e->pos, e->pos, pos); - GameLib_AddEntity(e); - return (e); -} - -#define MaxLineLen 1024 - -int GameMap_LoadLevel(char *filename, int res) { - FILE *file; - char line[MaxLineLen]; - int len, i, j; - int width, height; - char *map; - - // Open the file - file = fopen(filename, "rb"); - if (!file) { - return (0); - } - - // Read the file to determine sizes - width = 0; - height = 0; - do { - len = ReadLine(file, line, MaxLineLen); - if (len > -1) { - if (len > height) { - height = len; - } - width++; - } - } while (len > -1); - fseek(file, 0, SEEK_SET); - - // Build the map - map = malloc(sizeof(char) * width * height); - memset(map, 0, width * height); -#define MAP(x, y) map[(x) + ((y) * width)] - j = 0; - do { - len = ReadLine(file, line, MaxLineLen); - for (i = 0; i < len; i++) { - MAP(j, (height - 1) - i) = line[i]; - } - j++; - } while (len > -1); - - // Close the file - fclose(file); - - // Parse the map - for (j = 0; j < height; j++) { - for (i = 0; i < width; i++) { - if (MAP(i, j) == 'P') { - // Player - GameMapAux_CreateEnt(ent_Player, i, j, res); - } - if (MAP(i, j) == '#') { - // Block - GameMapAux_CreateEnt(ent_Block, i, j, res); - } - if (MAP(i, j) == '|') { - // Platform - GameMapAux_CreateEnt(ent_Platform, i, j, res); - } - } - } - - // Cleanup - free(map); -#undef MAP - - return (1); -} \ No newline at end of file diff --git a/Example.GameLib/src/GameMap.h b/Example.GameLib/src/GameMap.h deleted file mode 100644 index 28e15e7..0000000 --- a/Example.GameLib/src/GameMap.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (C) 2012-2023 Valeriano Alfonso Rodriguez (Kableado) -#ifndef GameMap_H -#define GameMap_H - -int GameMap_LoadLevel(char *filename, int res); - -#endif diff --git a/Example.GameLib/src/main.c b/Example.GameLib/src/main.c deleted file mode 100644 index be75c1a..0000000 --- a/Example.GameLib/src/main.c +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (C) 2012-2023 Valeriano Alfonso Rodriguez (Kableado) - -#include -#include -#include -#include -#include - -#include "GameLib.h" - -#include "GameEnts.h" -#include "GameMap.h" - -DrawFnt font; -DrawImg imgBackground; - -void MainGame_Text(int x, int y, char *text) { - Draw_SetColor(0.0f, 0.0f, 0.0f, 0.5f); - Draw_DrawText(font, text, x + 1, y + 1); - Draw_SetColor(1.0f, 1.0f, 1.0f, 1.0f); - Draw_DrawText(font, text, x, y); -} - -void ProcGame() {} -void PostProcGame() { - // Apply gravity to every entity - GameLib_ForEachEnt(EntityApplyGravity); -} -void PreDrawGame(float f) {} -void DrawGame(float f) { MainGame_Text(8, 8, "Hello world!"); } - -int main(int argc, char *argv[]) { - - GameLib_Init(640, 480, "Game", 20, 60); - - ///////////////////////////// - // Load and initialize media. - // - font = Draw_DefaultFont((ColorRgba){255, 255, 255, 255}); - imgBackground = Draw_LoadImage("data/background.png"); - Draw_SetOffset(imgBackground, 0, 0); - GameEnts_Init(); - - ///////////////////////// - // Initialize world. - // - GameLib_DelEnts(); - GameMap_LoadLevel("data/level_01.txt", 64); - - ///////////////////////// - // Run the world. - // - GameLib_CleanParallaxBackgrounds(); - GameLib_AddParallaxBackground(imgBackground, (int[2]){512, 512}, (int[2]){0, 0}, (float[2]){0.5f, 0.0f}); - GameLib_Loop(ProcGame, PostProcGame, PreDrawGame, DrawGame); - - return (0); -} \ No newline at end of file diff --git a/Example.GameLib/web/index.html b/Example.GameLib/web/index.html deleted file mode 100644 index 488eac5..0000000 --- a/Example.GameLib/web/index.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - Game - - - - -
-
-

Loading...

- Code:
-
-
- Data:
-
-
-
- -
- -
- - - - - \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 1d51e6a..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2012-2015 Valeriano Alfonso Rodriguez - -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 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. \ No newline at end of file diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake deleted file mode 100644 index d334240..0000000 --- a/cmake/FindSDL2.cmake +++ /dev/null @@ -1,202 +0,0 @@ -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. - -#.rst: -# FindSDL2 -# ------- -# -# Locate SDL2 library -# -# This module defines -# -# :: -# -# SDL2_LIBRARY, the name of the library to link against -# SDL2_FOUND, if false, do not try to link to SDL -# SDL2_INCLUDE_DIR, where to find SDL.h -# SDL2_VERSION_STRING, human-readable string containing the version of SDL -# -# -# -# This module responds to the flag: -# -# :: -# -# SDL2_BUILDING_LIBRARY -# If this is defined, then no SDL2_main will be linked in because -# only applications need main(). -# Otherwise, it is assumed you are building an application and this -# module will attempt to locate and set the proper link flags -# as part of the returned SDL2_LIBRARY variable. -# -# -# -# Don't forget to include SDLmain.h and SDLmain.m your project for the -# OS X framework based version. (Other versions link to -lSDL2main which -# this module will try to find on your behalf.) Also for OS X, this -# module will automatically add the -framework Cocoa on your behalf. -# -# -# -# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your -# configuration and no SDL2_LIBRARY, it means CMake did not find your SDL -# library (SDL.dll, libsdl.so, SDL.framework, etc). Set -# SDL2_LIBRARY_TEMP to point to your SDL library, and configure again. -# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this -# value as appropriate. These values are used to generate the final -# SDL2_LIBRARY variable, but when these values are unset, SDL2_LIBRARY -# does not get created. -# -# -# -# $SDL2DIR is an environment variable that would correspond to the -# ./configure --prefix=$SDL2DIR used in building SDL. l.e.galup 9-20-02 -# -# Modified by Eric Wing. Added code to assist with automated building -# by using environmental variables and providing a more -# controlled/consistent search behavior. Added new modifications to -# recognize OS X frameworks and additional Unix paths (FreeBSD, etc). -# Also corrected the header search path to follow "proper" SDL -# guidelines. Added a search for SDL2main which is needed by some -# platforms. Added a search for threads which is needed by some -# platforms. Added needed compile switches for MinGW. -# -# On OSX, this will prefer the Framework version (if found) over others. -# People will have to manually change the cache values of SDL2_LIBRARY to -# override this selection or set the CMake environment -# CMAKE_INCLUDE_PATH to modify the search paths. -# -# Note that the header path has changed from SDL/SDL.h to just SDL.h -# This needed to change because "proper" SDL convention is #include -# "SDL.h", not . This is done for portability reasons -# because not all systems place things in SDL/ (see FreeBSD). - -message("") - -if(NOT SDL2_DIR) - set(SDL2_DIR "" CACHE PATH "SDL2 directory") -endif() - -find_path(SDL2_INCLUDE_DIR SDL.h - HINTS - $ENV{SDL2DIR} - ${SDL2_DIR} - PATH_SUFFIXES SDL2 - # path suffixes to search inside ENV{SDL2DIR} - include/SDL2 include -) - -if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(VC_LIB_PATH_SUFFIX lib/x64) -else() - set(VC_LIB_PATH_SUFFIX lib/x86) -endif() - -find_library(SDL2_LIBRARY_TEMP - NAMES SDL2 - HINTS - ENV SDL2DIR - ${SDL2_DIR} - PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX} -) - -# Hide this cache variable from the user, it's an internal implementation -# detail. The documented library variable for the user is SDL2_LIBRARY -# which is derived from SDL2_LIBRARY_TEMP further below. -set_property(CACHE SDL2_LIBRARY_TEMP PROPERTY TYPE INTERNAL) - -if(NOT SDL2_BUILDING_LIBRARY) - if(NOT SDL2_INCLUDE_DIR MATCHES ".framework") - # Non-OS X framework versions expect you to also dynamically link to - # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms - # seem to provide SDL2main for compatibility even though they don't - # necessarily need it. - find_library(SDL2MAIN_LIBRARY - NAMES SDL2main - HINTS - ENV SDL2DIR - ${SDL2_DIR} - PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX} - PATHS - /sw - /opt/local - /opt/csw - /opt - ) - endif() -endif() - -# SDL may require threads on your system. -# The Apple build may not need an explicit flag because one of the -# frameworks may already provide it. -# But for non-OSX systems, I will use the CMake Threads package. -if(NOT APPLE) - find_package(Threads) -endif() - -# MinGW needs an additional link flag, -mwindows -# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -mwindows -if(MINGW) - set(MINGW32_LIBRARY mingw32 "-mwindows" CACHE STRING "link flags for MinGW") -endif() - -if(SDL2_LIBRARY_TEMP) - # For SDL2main - if(SDL2MAIN_LIBRARY AND NOT SDL2_BUILDING_LIBRARY) - list(FIND SDL2_LIBRARY_TEMP "${SDL2MAIN_LIBRARY}" _SDL2_MAIN_INDEX) - if(_SDL2_MAIN_INDEX EQUAL -1) - set(SDL2_LIBRARY_TEMP "${SDL2MAIN_LIBRARY}" ${SDL2_LIBRARY_TEMP}) - endif() - unset(_SDL2_MAIN_INDEX) - endif() - - # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa. - # CMake doesn't display the -framework Cocoa string in the UI even - # though it actually is there if I modify a pre-used variable. - # I think it has something to do with the CACHE STRING. - # So I use a temporary variable until the end so I can set the - # "real" variable in one-shot. - if(APPLE) - set(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa") - endif() - - # For threads, as mentioned Apple doesn't need this. - # In fact, there seems to be a problem if I used the Threads package - # and try using this line, so I'm just skipping it entirely for OS X. - if(NOT APPLE) - set(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) - endif() - - # For MinGW library - if(MINGW) - set(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP}) - endif() - - # Set the final string here so the GUI reflects the final state. - set(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found") -endif() - -if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL2_version.h") - file(STRINGS "${SDL2_INCLUDE_DIR}/SDL2_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL2_MAJOR_VERSION[ \t]+[0-9]+$") - file(STRINGS "${SDL2_INCLUDE_DIR}/SDL2_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL2_MINOR_VERSION[ \t]+[0-9]+$") - file(STRINGS "${SDL2_INCLUDE_DIR}/SDL2_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL2_PATCHLEVEL[ \t]+[0-9]+$") - string(REGEX REPLACE "^#define[ \t]+SDL2_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}") - string(REGEX REPLACE "^#define[ \t]+SDL2_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}") - string(REGEX REPLACE "^#define[ \t]+SDL2_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}") - set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH}) - unset(SDL2_VERSION_MAJOR_LINE) - unset(SDL2_VERSION_MINOR_LINE) - unset(SDL2_VERSION_PATCH_LINE) - unset(SDL2_VERSION_MAJOR) - unset(SDL2_VERSION_MINOR) - unset(SDL2_VERSION_PATCH) -endif() - -set(SDL2_LIBRARIES ${SDL2_LIBRARY} ${SDL2MAIN_LIBRARY}) -set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) - -include(FindPackageHandleStandardArgs) - -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 - REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR - VERSION_VAR SDL2_VERSION_STRING) diff --git a/issues/.keep b/issues/.keep new file mode 100644 index 0000000..e69de29 diff --git a/macosx/SDLMain.m b/macosx/SDLMain.m deleted file mode 100644 index c214d32..0000000 --- a/macosx/SDLMain.m +++ /dev/null @@ -1,365 +0,0 @@ -/* SDLMain.m - main entry point for our Cocoa-ized SDL app - Initial Version: Darrell Walisser - Non-NIB-Code & other changes: Max Horn - - Feel free to customize this file to suit your needs -*/ - -#import -#include - -@interface SDLMain : NSObject -@end - -#include /* for MAXPATHLEN */ -#include - -/* For some reaon, Apple removed setAppleMenu from the headers in 10.4, - but the method still is there and works. To avoid warnings, we declare - it ourselves here. */ -@interface NSApplication (SDL_Missing_Methods) -- (void)setAppleMenu:(NSMenu *)menu; -@end - -/* Use this flag to determine whether we use SDLMain.nib or not */ -#define SDL_USE_NIB_FILE 0 - -/* Use this flag to determine whether we use CPS (docking) or not */ -#define SDL_USE_CPS 1 -#ifdef SDL_USE_CPS -/* Portions of CPS.h */ -typedef struct CPSProcessSerNum { - UInt32 lo; - UInt32 hi; -} CPSProcessSerNum; - -extern OSErr CPSGetCurrentProcess(CPSProcessSerNum *psn); -extern OSErr -CPSEnableForegroundOperation(CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5); -extern OSErr CPSSetFrontProcess(CPSProcessSerNum *psn); - -#endif /* SDL_USE_CPS */ - -static int gArgc; -static char **gArgv; -static BOOL gFinderLaunch; -static BOOL gCalledAppMainline = FALSE; - -static NSString *getApplicationName(void) { - const NSDictionary *dict; - NSString *appName = 0; - - /* Determine the application name */ - dict = (const NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle()); - if (dict) - appName = [dict objectForKey:@"CFBundleName"]; - - if (![appName length]) - appName = [[NSProcessInfo processInfo] processName]; - - return appName; -} - -#if SDL_USE_NIB_FILE -/* A helper category for NSString */ -@interface NSString (ReplaceSubString) -- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString; -@end -#endif - -@interface NSApplication (SDLApplication) -@end - -@implementation NSApplication (SDLApplication) -/* Invoked from the Quit menu item */ -- (void)terminate:(id)sender { - /* Post a SDL_QUIT event */ - SDL_Event event; - event.type = SDL_QUIT; - SDL_PushEvent(&event); -} -@end - -/* The main class of the application, the application's delegate */ -@implementation SDLMain - -/* Set the working directory to the .app's parent directory */ -- (void)setupWorkingDirectory:(BOOL)shouldChdir { - if (shouldChdir) { - char parentdir[MAXPATHLEN]; - CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle()); - CFURLRef url2 = CFURLCreateCopyDeletingLastPathComponent(0, url); - if (CFURLGetFileSystemRepresentation(url2, 1, (UInt8 *)parentdir, MAXPATHLEN)) { - chdir(parentdir); /* chdir to the binary app's parent */ - } - CFRelease(url); - CFRelease(url2); - } -} - -#if SDL_USE_NIB_FILE - -/* Fix menu to contain the real app name instead of "SDL App" */ -- (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName { - NSRange aRange; - NSEnumerator *enumerator; - NSMenuItem *menuItem; - - aRange = [[aMenu title] rangeOfString:@"SDL App"]; - if (aRange.length != 0) - [aMenu setTitle:[[aMenu title] stringByReplacingRange:aRange with:appName]]; - - enumerator = [[aMenu itemArray] objectEnumerator]; - while ((menuItem = [enumerator nextObject])) { - aRange = [[menuItem title] rangeOfString:@"SDL App"]; - if (aRange.length != 0) - [menuItem setTitle:[[menuItem title] stringByReplacingRange:aRange with:appName]]; - if ([menuItem hasSubmenu]) - [self fixMenu:[menuItem submenu] withAppName:appName]; - } -} - -#else - -static void setApplicationMenu(void) { - /* warning: this code is very odd */ - NSMenu *appleMenu; - NSMenuItem *menuItem; - NSString *title; - NSString *appName; - - appName = getApplicationName(); - appleMenu = [[NSMenu alloc] initWithTitle:@""]; - - /* Add menu items */ - title = [@"About " stringByAppendingString:appName]; - [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""]; - - [appleMenu addItem:[NSMenuItem separatorItem]]; - - title = [@"Hide " stringByAppendingString:appName]; - [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"]; - - menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" - action:@selector(hideOtherApplications:) - keyEquivalent:@"h"]; - [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask | NSCommandKeyMask)]; - - [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""]; - - [appleMenu addItem:[NSMenuItem separatorItem]]; - - title = [@"Quit " stringByAppendingString:appName]; - [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"]; - - /* Put menu into the menubar */ - menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""]; - [menuItem setSubmenu:appleMenu]; - [[NSApp mainMenu] addItem:menuItem]; - - /* Tell the application object that this is now the application menu */ - [NSApp setAppleMenu:appleMenu]; - - /* Finally give up our references to the objects */ - [appleMenu release]; - [menuItem release]; -} - -/* Create a window menu */ -static void setupWindowMenu(void) { - NSMenu *windowMenu; - NSMenuItem *windowMenuItem; - NSMenuItem *menuItem; - - windowMenu = [[NSMenu alloc] initWithTitle:@"Window"]; - - /* "Minimize" item */ - menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; - [windowMenu addItem:menuItem]; - [menuItem release]; - - /* Put menu into the menubar */ - windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""]; - [windowMenuItem setSubmenu:windowMenu]; - [[NSApp mainMenu] addItem:windowMenuItem]; - - /* Tell the application object that this is now the window menu */ - [NSApp setWindowsMenu:windowMenu]; - - /* Finally give up our references to the objects */ - [windowMenu release]; - [windowMenuItem release]; -} - -/* Replacement for NSApplicationMain */ -static void CustomApplicationMain(int argc, char **argv) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - SDLMain *sdlMain; - - /* Ensure the application object is initialised */ - [NSApplication sharedApplication]; - -#ifdef SDL_USE_CPS - { - CPSProcessSerNum PSN; - /* Tell the dock about us */ - if (!CPSGetCurrentProcess(&PSN)) - if (!CPSEnableForegroundOperation(&PSN, 0x03, 0x3C, 0x2C, 0x1103)) - if (!CPSSetFrontProcess(&PSN)) - [NSApplication sharedApplication]; - } -#endif /* SDL_USE_CPS */ - - /* Set up the menubar */ - [NSApp setMainMenu:[[NSMenu alloc] init]]; - setApplicationMenu(); - setupWindowMenu(); - - /* Create SDLMain and make it the app delegate */ - sdlMain = [[SDLMain alloc] init]; - [NSApp setDelegate:sdlMain]; - - /* Start the main event loop */ - [NSApp run]; - - [sdlMain release]; - [pool release]; -} - -#endif - -/* - * Catch document open requests...this lets us notice files when the app - * was launched by double-clicking a document, or when a document was - * dragged/dropped on the app's icon. You need to have a - * CFBundleDocumentsType section in your Info.plist to get this message, - * apparently. - * - * Files are added to gArgv, so to the app, they'll look like command line - * arguments. Previously, apps launched from the finder had nothing but - * an argv[0]. - * - * This message may be received multiple times to open several docs on launch. - * - * This message is ignored once the app's mainline has been called. - */ -- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename { - const char *temparg; - size_t arglen; - char *arg; - char **newargv; - - if (!gFinderLaunch) /* MacOS is passing command line args. */ - return FALSE; - - if (gCalledAppMainline) /* app has started, ignore this document. */ - return FALSE; - - temparg = [filename UTF8String]; - arglen = SDL_strlen(temparg) + 1; - arg = (char *)SDL_malloc(arglen); - if (arg == NULL) - return FALSE; - - newargv = (char **)realloc(gArgv, sizeof(char *) * (gArgc + 2)); - if (newargv == NULL) { - SDL_free(arg); - return FALSE; - } - gArgv = newargv; - - SDL_strlcpy(arg, temparg, arglen); - gArgv[gArgc++] = arg; - gArgv[gArgc] = NULL; - return TRUE; -} - -/* Called when the internal event loop has just started running */ -- (void)applicationDidFinishLaunching:(NSNotification *)note { - int status; - - /* Set the working directory to the .app's parent directory */ - [self setupWorkingDirectory:gFinderLaunch]; - -#if SDL_USE_NIB_FILE - /* Set the main menu to contain the real app name instead of "SDL App" */ - [self fixMenu:[NSApp mainMenu] withAppName:getApplicationName()]; -#endif - - /* Hand off to main application code */ - gCalledAppMainline = TRUE; - status = SDL_main(gArgc, gArgv); - - /* We're done, thank you for playing */ - exit(status); -} -@end - -@implementation NSString (ReplaceSubString) - -- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString { - unsigned int bufferSize; - unsigned int selfLen = [self length]; - unsigned int aStringLen = [aString length]; - unichar *buffer; - NSRange localRange; - NSString *result; - - bufferSize = selfLen + aStringLen - aRange.length; - buffer = (unichar *)NSAllocateMemoryPages(bufferSize * sizeof(unichar)); - - /* Get first part into buffer */ - localRange.location = 0; - localRange.length = aRange.location; - [self getCharacters:buffer range:localRange]; - - /* Get middle part into buffer */ - localRange.location = 0; - localRange.length = aStringLen; - [aString getCharacters:(buffer + aRange.location) range:localRange]; - - /* Get last part into buffer */ - localRange.location = aRange.location + aRange.length; - localRange.length = selfLen - localRange.location; - [self getCharacters:(buffer + aRange.location + aStringLen) range:localRange]; - - /* Build output string */ - result = [NSString stringWithCharacters:buffer length:bufferSize]; - - NSDeallocateMemoryPages(buffer, bufferSize); - - return result; -} - -@end - -#ifdef main -#undef main -#endif - -/* Main entry point to executable - should *not* be SDL_main! */ -int main(int argc, char **argv) { - /* Copy the arguments into a global variable */ - /* This is passed if we are launched by double-clicking */ - if (argc >= 2 && strncmp(argv[1], "-psn", 4) == 0) { - gArgv = (char **)SDL_malloc(sizeof(char *) * 2); - gArgv[0] = argv[0]; - gArgv[1] = NULL; - gArgc = 1; - gFinderLaunch = YES; - } else { - int i; - gArgc = argc; - gArgv = (char **)SDL_malloc(sizeof(char *) * (argc + 1)); - for (i = 0; i <= argc; i++) - gArgv[i] = argv[i]; - gFinderLaunch = NO; - } - -#if SDL_USE_NIB_FILE - NSApplicationMain(argc, argv); -#else - CustomApplicationMain(argc, argv); -#endif - return 0; -} diff --git a/src/Anim.c b/src/Anim.c deleted file mode 100644 index 3f07316..0000000 --- a/src/Anim.c +++ /dev/null @@ -1,244 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#include -#include - -#include "Anim.h" -#include "Draw.h" - -//////////////////////////////////////////////// -// Animation // -/////////////// -// -typedef struct { - DrawImg img; - int32_t w; - float fps; - int32_t frames; - int32_t frameTime; - int32_t time; -} Animation; - -///////////////////////////// -// Anim_LoadAnim -// -// -Anim Anim_LoadAnim(char *filename, int width, int frames, float fps) { - DrawImg img; - Animation *anim; - int w, h; - - img = Draw_LoadImage(filename); - if (!img) { - return (NULL); - } - Draw_GetSize(img, &w, &h); - Draw_SetOffset(img, -(width / 2), -(h / 2)); - - // Create the animation container - anim = malloc(sizeof(Animation)); - anim->img = img; - anim->w = width; - if (width <= 0) { - anim->w = w / frames; - } - anim->fps = fps; - anim->frames = frames; - anim->frameTime = (int)(1000.0f / fps); - anim->time = anim->frameTime * frames; - - return ((Anim)anim); -} - -///////////////////////////// -// Anim_GetTime -// -// -int Anim_GetTime(Anim a) { - Animation *anim = a; - - return (anim->time); -} - -///////////////////////////// -// Anim_GetSize -// -// Gets the animation size. -void Anim_GetSize(Anim a, int *w, int *h) { - Animation *anim = a; - int widthAux; - - *w = anim->w; - Draw_GetSize(anim->img, &widthAux, h); -} - -///////////////////////////// -// Anim_SetOffset -// Anim_GetOffset -// -// -void Anim_SetOffset(Anim a, int x, int y) { - Animation *anim = a; - - Draw_SetOffset(anim->img, x, y); -} -void Anim_GetOffset(Anim a, int *x, int *y) { - Animation *anim = a; - - Draw_GetOffset(anim->img, x, y); -} - -///////////////////////////// -// Anim_SetFlip -// Anim_GetFlip -// -// -void Anim_SetFlip(Anim a, int flip) { - Animation *anim = a; - - Draw_SetFlip(anim->img, flip); -} -int Anim_GetFlip(Anim a) { - Animation *anim = a; - - return Draw_GetFlip(anim->img); -} - -///////////////////////////// -// Anim_Draw -// -// -void Anim_Draw(Anim a, int time_ms, int x, int y, float scale[2]) { - Animation *anim = a; - int frame; - - frame = (time_ms / anim->frameTime) % anim->frames; - Draw_DrawImgPartHoriz(anim->img, x, y, anim->w, frame, scale); -} - -///////////////////////////// -// AnimPlay_Copy -// -// -void AnimPlay_Copy(AnimPlay *ad, AnimPlay *ao) { - ad->img = ao->img; - - ad->imgPart = ao->imgPart; - ad->w = ao->w; - ad->h = ao->h; - ad->i = ao->i; - ad->j = ao->j; - - ad->anim = ao->anim; - ad->time_ms = ao->time_ms; -} - -///////////////////////////// -// AnimPlay_SetImg -// AnimPlay_SetAnim -// AnimPlay_SetImgPart -// -// -void AnimPlay_SetImg(AnimPlay *ap, DrawImg img) { - ap->anim = NULL; - ap->time_ms = 0; - - ap->img = img; - - ap->imgPart = NULL; -} -void AnimPlay_SetAnim(AnimPlay *ap, Anim ani) { - ap->pause = 0; - if (ap->anim == ani) { - return; - } - ap->anim = ani; - ap->time_ms = 0; - - ap->img = NULL; - - ap->imgPart = NULL; -} -void AnimPlay_SetImgPart(AnimPlay *ap, DrawImg img, int w, int h, int i, int j) { - ap->anim = NULL; - ap->time_ms = 0; - - ap->img = NULL; - - ap->imgPart = img; - ap->w = w; - ap->h = h; - ap->i = i; - ap->j = j; -} - -///////////////////////////// -// AnimPlay_Draw -// -// -void AnimPlay_Draw(AnimPlay *ani, int x, int y, float scale[2]) { - if (ani->anim) { - Anim_Draw(ani->anim, ani->time_ms, x, y, scale); - return; - } - if (ani->img) { - Draw_DrawImg(ani->img, x, y, scale); - return; - } - if (ani->imgPart) { - Draw_DrawImgPart(ani->imgPart, x, y, ani->w, ani->h, ani->i, ani->j, scale); - return; - } -} - -///////////////////////////// -// AnimPlay_GetOffset -// AnimPlay_GetSize -// -// -void AnimPlay_GetOffset(AnimPlay *ani, int *x, int *y) { - if (ani->anim) { - Anim_GetOffset(ani->anim, x, y); - return; - } - if (ani->img) { - Draw_GetOffset(ani->img, x, y); - return; - } - if (ani->imgPart) { - Draw_GetOffset(ani->imgPart, x, y); - return; - } -} -void AnimPlay_GetSize(AnimPlay *ani, int *w, int *h) { - if (ani->anim) { - Anim_GetSize(ani->anim, w, h); - return; - } - if (ani->img) { - Draw_GetSize(ani->img, w, h); - return; - } - if (ani->imgPart) { - Draw_GetSize(ani->imgPart, w, h); - return; - } -} - -///////////////////////////// -// AnimPlay_SetPause -// -// -void AnimPlay_SetPause(AnimPlay *ani, int p) { ani->pause = p; } - -///////////////////////////// -// AnimPlay_IncTime -// -// -void AnimPlay_IncTime(AnimPlay *ani, int t) { - if (ani->anim) { - if (!ani->pause) { - ani->time_ms += t; - } - } -} diff --git a/src/Anim.h b/src/Anim.h deleted file mode 100644 index 7c784d7..0000000 --- a/src/Anim.h +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef Amin_H -#define Amin_H - -#include "Draw.h" - -//////////////////////////////////////////////// -// Anim // -////////// -// -typedef void *Anim; - -///////////////////////////// -// Anim_LoadAnim -// -// -Anim Anim_LoadAnim(char *filename, int width, int frames, float fps); - -///////////////////////////// -// Anim_GetTime -// -// -int Anim_GetTime(Anim anim); - -///////////////////////////// -// Anim_GetSize -// -// Gets the animation size. -void Anim_GetSize(Anim anim, int *w, int *h); - -///////////////////////////// -// Anim_SetOffset -// Anim_GetOffset -// -// -void Anim_SetOffset(Anim anim, int x, int y); -void Anim_GetOffset(Anim anim, int *x, int *y); - -///////////////////////////// -// Anim_SetFlip -// Draw_GetFlip -// -// -void Anim_SetFlip(Anim anim, int flip); -int Anim_GetFlip(Anim anim); - -///////////////////////////// -// Anim_Draw -// -// -void Anim_Draw(Anim anim, int time_ms, int x, int y, float scale[2]); - -//////////////////////////////////////////////// -// AnimPlay // -////////////// -// -typedef struct { - Anim anim; - int pause; - int time_ms; - - DrawImg img; - - DrawImg imgPart; - int w, h, i, j; - -} AnimPlay; - -///////////////////////////// -// AnimPlay_Copy -// -// -void AnimPlay_Copy(AnimPlay *ad, AnimPlay *ao); - -///////////////////////////// -// AnimPlay_SetImg -// AnimPlay_SetAnim -// AnimPlay_SetImgPart -// -// -void AnimPlay_SetImg(AnimPlay *ap, DrawImg img); -void AnimPlay_SetAnim(AnimPlay *ap, Anim ani); -void AnimPlay_SetImgPart(AnimPlay *ap, DrawImg img, int w, int h, int i, int j); - -///////////////////////////// -// AnimPlay_Draw -// -// -void AnimPlay_Draw(AnimPlay *ani, int x, int y, float scale[2]); - -///////////////////////////// -// AnimPlay_GetOffset -// AnimPlay_GetSize -// -// -void AnimPlay_GetOffset(AnimPlay *ani, int *x, int *y); -void AnimPlay_GetSize(AnimPlay *ani, int *w, int *h); - -///////////////////////////// -// AnimPlay_SetPause -// -// -void AnimPlay_SetPause(AnimPlay *ani, int p); - -///////////////////////////// -// AnimPlay_IncTime -// -// -void AnimPlay_IncTime(AnimPlay *ani, int t); - -#endif diff --git a/src/Audio.c b/src/Audio.c deleted file mode 100644 index bff10c9..0000000 --- a/src/Audio.c +++ /dev/null @@ -1,363 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifdef WIN32 -#define _WIN32_WINNT 0x0501 -#include -#endif -#include -#include -#include - -#include - -#include "Audio.h" -#include "Util.h" - -static void Audio_MixerCallback(void *ud, Uint8 *stream, int l); - -//////////////////////////////////////////////// -// AudioWave // -/////////////// -// Reference to a sound. -typedef struct TAudioWave TAudioWave, *AudioWave; -struct TAudioWave { - uint32_t sampleRate; - int32_t channels; - int32_t bpb; - int32_t BPB; - int32_t len; - uint8_t *buffer; - - AudioWave next; -}; -AudioWave g_Waves = NULL; - -//////////////////////////////////////////////// -// AudioChan // -/////////////// -// Reference to a sound. -typedef struct TAudioChan TAudioChan, *AudioChan; -struct TAudioChan { - AudioWave wave; - int32_t pos; - uint8_t rightVolume; - uint8_t leftVolume; - - int32_t loop; - - AudioChan next; -}; -AudioChan g_Channels = NULL; -AudioChan g_FreeChannels = NULL; - -static SDL_AudioDeviceID g_AudioDeviceID = 0; - -///////////////////////////// -// Audio_Init -// -// Initializes the game audio. -int Audio_Init() { - SDL_AudioSpec as; - SDL_AudioSpec as2; - - // Initialize audio subsystem - if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) { - Print("ERROR: Audio_Init: Failure initializing SDL Audio. %s\n", SDL_GetError()); - return (0); - } - - // Open the audio device using the desired parameters - as.freq = 44100; - as.format = AUDIO_S16SYS; - as.channels = 2; - as.samples = 2048; - as.callback = Audio_MixerCallback; - g_AudioDeviceID = SDL_OpenAudioDevice(NULL, 0, &as, &as2, 0); - if (g_AudioDeviceID == 0) { - Print("ERROR: Audio_Init: Failure opening audio. %s\n", SDL_GetError()); - return (0); - } - - // Asert results - if (as2.format != AUDIO_S16SYS || as2.freq != 44100 || as2.channels != 2) { - Print("ERROR: Audio_Init: Failure opening audio. (44.1Khz/16b/2c).\n"); - SDL_CloseAudio(); - return (0); - } - - // Unpause and ready to go - SDL_PauseAudioDevice(g_AudioDeviceID, 0); - - return (1); -} - -///////////////////////////// -// Audio_MixerCallback -// -// Mixes the audio channels. -static void Audio_MixerCallback(void *ud, uint8_t *stream, int l) { - int16_t *ptr_out, *ptr_wave; - AudioChan previousChannel; - AudioChan chan; - AudioWave wave; - int len = l / 4; // Asume 16bpb and 2 output chan - int channelRemaining; - int len_mix; - int i; - - // Clean - memset(stream, 0, l); - - // Mix all the channels - previousChannel = NULL; - chan = g_Channels; - while (chan) { - if (!chan->wave) { - // Remove finished channels - AudioChan aux_chan = chan->next; - chan->next = g_FreeChannels; - g_FreeChannels = chan; - chan = aux_chan; - if (previousChannel) { - previousChannel->next = chan; - } else { - g_Channels = chan; - } - continue; - } - - // Prepare the pointers - ptr_out = (signed short *)stream; - ptr_wave = ((signed short *)chan->wave->buffer) + chan->pos; - wave = chan->wave; - - // Determine mixing length - channelRemaining = wave->len - chan->pos; - if (channelRemaining > len) { - len_mix = len; - } else { - if (chan->loop) { - len_mix = len; - } else { - len_mix = channelRemaining; - } - chan->wave = NULL; - } - - // Mix the buffer - for (i = 0; i < len_mix; i++) { - int temp; - - // Left Channel - temp = ptr_out[0]; - temp += (ptr_wave[0] * chan->leftVolume) >> 8; - if (temp > (1 << 14)) { - ptr_out[0] = 1 << 14; - } else if (temp < -(1 << 14)) { - ptr_out[0] = -(1 << 14); - } else { - ptr_out[0] = (int16_t)temp; - } - - // Right Channel - temp = ptr_out[1]; - temp += (ptr_wave[0] * chan->rightVolume) >> 8; - if (temp > (1 << 14)) { - ptr_out[1] = 1 << 14; - } else if (temp < -(1 << 14)) { - ptr_out[1] = -(1 << 14); - } else { - ptr_out[1] = (int16_t)temp; - } - - // Next sample - ptr_out += 2; - if (ptr_wave >= (((signed short *)wave->buffer) + (wave->len - 1))) { - ptr_wave = ((signed short *)wave->buffer); - } else { - ptr_wave++; - } - } - chan->pos += len_mix; - - if (chan->wave == NULL && chan->loop == 1) { - chan->wave = wave; - while (chan->pos > wave->len) { - chan->pos -= wave->len; - } - } - - // Next channel - previousChannel = chan; - chan = chan->next; - } -} - -///////////////////////////// -// Audio_Frame -// -// Notify a frame update to the audio subsystem. -void Audio_Frame() {} - -///////////////////////////// -// Audio_LoadSound -// -// Loads a sound, giving a reference. -AudioSnd Audio_LoadSound(char *filename) { - FILE *f; - char id[5] = {0, 0, 0, 0, 0}, *sndBuffer = NULL; - short formatTag, channels, bitsPerSample; - int formatLen, sampleRate, dataSize; - - f = fopen(filename, "rb"); - if (!f) { - Print("ERROR: Audio_LoadSound: Failure opening file. \"%s\".\n", filename); - return (NULL); - } - - // Read id "RIFF" - fread(id, 4, sizeof(char), f); - if (strcmp(id, "RIFF") != 0) { - Print("ERROR: Audio_LoadSound: File is not RIFF. \"%s\".\n", filename); - fclose(f); - return (NULL); - } - - // File size (-"RIFF") - fseek(f, 4, SEEK_CUR); // size - - // Read id "WAVE" - fread(id, 4, sizeof(char), f); - if (strcmp(id, "WAVE") != 0) { - Print("ERROR:Audio_LoadSound: File is not WAVE. \"%s\".\n", filename); - fclose(f); - return (NULL); - } - - // Read the format - fread(id, 1, sizeof(char) * 4, f); // Read "fmt " - fread(&formatLen, 1, sizeof(int), f); - if (formatLen < 14) { - Print("ERROR: Audio_LoadSound: File too short. \"%s\".\n", filename); - fclose(f); - return (NULL); - } - fread(&formatTag, 1, sizeof(short), f); // 1=PCM - if (formatTag != 1) { - Print("ERROR: Audio_LoadSound: Not PCM format. \"%s\".\n", filename); - fclose(f); - return (NULL); - } - fread(&channels, 1, sizeof(short), f); - fread(&sampleRate, 1, sizeof(int), f); - fseek(f, 2, SEEK_CUR); // avgBytesSec - fseek(f, 2, SEEK_CUR); // blockAlign - fread(&bitsPerSample, 1, sizeof(short), f); - fseek(f, formatLen - 14, SEEK_CUR); // Align read - - // Assert sound format - if (sampleRate != 44100 || channels != 1 || bitsPerSample != 2) { - Print( - "ERROR: Audio_LoadSound: Format not supported: " - "sampleRate:%d; channels:%d; BPB:%d. \"%s\"\n", - sampleRate, - channels, - bitsPerSample, - filename); - fclose(f); - return (NULL); - } - - // Skip no "data" blocks - do { - size_t lenRead = fread(id, 1, sizeof(char) * 4, f); - if (lenRead < 4) { - break; - } - if (strcmp(id, "data") != 0) { - fread(&dataSize, 1, sizeof(int), f); - fseek(f, dataSize, SEEK_CUR); - } else { - break; - } - } while (1); - if (strcmp(id, "data") != 0) { - Print("ERROR: Audio_LoadSound: DATA block not found. \"%s\".\n", filename); - fclose(f); - return (NULL); - } - - // Read the "data" block - fread(&dataSize, 1, sizeof(int), f); - sndBuffer = malloc(sizeof(char) * dataSize); - fread(sndBuffer, dataSize, sizeof(char), f); - - fclose(f); - - // Build the wave object - AudioWave wave = malloc(sizeof(TAudioWave)); - wave->sampleRate = sampleRate; - wave->channels = channels; - wave->buffer = (Uint8 *)sndBuffer; - wave->BPB = bitsPerSample; - wave->bpb = wave->BPB * 8; - wave->len = dataSize / (wave->BPB * wave->channels); - - // Take a reference - wave->next = g_Waves; - g_Waves = wave; - - return (wave); -} - -///////////////////////////// -// Audio_PlaySound -// -// Loads a sound, giving a reference. -AudioChn Audio_PlaySound(AudioSnd snd, float leftVolume, float rightVolume, int loop) { - AudioChan chan; - AudioWave wave; - if (!snd) { - return (NULL); - } - - // Cast AudioSnd to AudioWave - wave = snd; - - // Get a free channel - if (g_FreeChannels) { - chan = g_FreeChannels; - g_FreeChannels = chan->next; - chan->next = NULL; - } else { - chan = malloc(sizeof(TAudioChan)); - chan->next = NULL; - } - - // Initialize the channel - chan->wave = wave; - chan->pos = 0; - chan->rightVolume = (uint8_t)(rightVolume * 255.0f); - chan->leftVolume = (uint8_t)(leftVolume * 255.0f); - chan->loop = loop; - - // Include in sounds list - chan->next = g_Channels; - g_Channels = chan; - - return chan; -} - -///////////////////////////// -// Audio_StopChan -// -// Stops an audio chanel -void Audio_StopChan(AudioChn c) { - AudioChan chan; - chan = c; - if (c == NULL) { - return; - } - chan->loop = 0; - chan->wave = NULL; -} diff --git a/src/Audio.h b/src/Audio.h deleted file mode 100644 index d5df313..0000000 --- a/src/Audio.h +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef Audio_H -#define Audio_H - -///////////////////////////// -// Audio_Init -// -// Initializes the game audio. -int Audio_Init(); - -///////////////////////////// -// Audio_Frame -// -// Notify a frame update to the audio subsystem. -void Audio_Frame(); - -//////////////////////////////////////////////// -// AudioSnd // -////////////// -// Reference to a sound. -typedef void *AudioSnd; - -//////////////////////////////////////////////// -// AudioChn // -////////////// -// Reference to a playing sound. -typedef void *AudioChn; - -///////////////////////////// -// Audio_LoadSound -// -// Loads a sound, giving a reference. -AudioSnd Audio_LoadSound(char *filename); - -///////////////////////////// -// Audio_PlaySound -// -// Loads a sound, giving a reference. -AudioChn Audio_PlaySound(AudioSnd snd, float leftVolume, float rightVolume, int loop); - -///////////////////////////// -// Audio_StopChan -// -// Stops an audio chanel -void Audio_StopChan(AudioChn chan); - -#endif diff --git a/src/Bucket.c b/src/Bucket.c deleted file mode 100644 index 3bd44df..0000000 --- a/src/Bucket.c +++ /dev/null @@ -1,185 +0,0 @@ -// Copyright (C) 2024 Valeriano Alfonso Rodriguez (Kableado) - -#include "Bucket.h" - -#include "Util.h" - -#include -#include - -//////////////////////////////////////////////// -// BBox -// - -int BBox_Intersect(BBox bbox1, BBox bbox2) { - if (bbox1->x2 >= bbox2->x1 && bbox1->x1 <= bbox2->x2 && bbox1->y2 >= bbox2->y1 && bbox1->y1 <= bbox2->y2) { - return (1); - } - return (0); -} - -//////////////////////////////////////////////// -// Bucket -// - -void Bucket_Init(Bucket bucket) { bucket->count = 0; } - -void Bucket_AddItem(Bucket bucket, BBox item) { - if (bucket->count >= Max_ItemsPerBucket) { - Print("Bucket Overflow\n"); - return; - } - bucket->bbox[bucket->count] = item; - bucket->count++; -} - -void Bucket_AddItemUnique(Bucket bucket, BBox item) { - for (int i = 0; i < bucket->count; i++) { - if (bucket->bbox[i]->parent == item->parent) { - return; - } - } - Bucket_AddItem(bucket, item); -} - -int Bucket_SearchItem(Bucket bucket, BBox item) { - for (int i = 0; i < bucket->count; i++) { - if (bucket->bbox[i]->parent == item->parent) { - return i; - } - } - return -1; -} - -void Bucket_RemoveIndex(Bucket bucket, int index) { - bucket->bbox[index] = bucket->bbox[bucket->count - 1]; - bucket->count--; - bucket->bbox[bucket->count] = NULL; -} - -void Bucket_RemoveItem(Bucket bucket, BBox item) { - int index = Bucket_SearchItem(bucket, item); - if (index < 0) { - return; - } - Bucket_RemoveIndex(bucket, index); -} - -//////////////////////////////////////////////// -// BucketGrid -// - -void BucketGrid_Init(BucketGrid bucketGrid, int width, int height, float bucketSize, float offsetX, float offsetY) { - bucketGrid->width = width; - bucketGrid->height = height; - bucketGrid->bucketSize = bucketSize; - bucketGrid->offsetX = offsetX; - bucketGrid->offsetY = offsetY; - bucketGrid->bucket = (TBucket *)malloc(sizeof(TBucket) * bucketGrid->width * bucketGrid->height); - for (int y = 0; y < bucketGrid->height; y++) { - for (int x = 0; x < bucketGrid->width; x++) { - Bucket_Init(&bucketGrid->bucket[x + y * width]); - } - } -} - -void BucketGrid_DeInit(BucketGrid bucketGrid) { free(bucketGrid->bucket); } - -int BucketGrid_AddItem(BucketGrid bucketGrid, BBox item) { - const int x1Bucket = (int)floorf((item->x1 + bucketGrid->offsetX) / bucketGrid->bucketSize); - const int x2Bucket = (int)ceilf((item->x2 + bucketGrid->offsetX) / bucketGrid->bucketSize); - const int y1Bucket = (int)floorf((item->y1 + bucketGrid->offsetY) / bucketGrid->bucketSize); - const int y2Bucket = (int)ceilf((item->y2 + bucketGrid->offsetY) / bucketGrid->bucketSize); - - int inserted = 0; - for (int y = y1Bucket; y <= y2Bucket; y++) { - for (int x = x1Bucket; x <= x2Bucket; x++) { - if (y < 0 || y >= bucketGrid->height || x < 0 || x >= bucketGrid->width) { - continue; - } - Bucket bucket = &bucketGrid->bucket[x + y * bucketGrid->width]; - Bucket_AddItem(bucket, item); - inserted = 1; - } - } - if (inserted) { - item->changed = 0; - } - return inserted; -} - -void BucketGrid_RemoveItem(BucketGrid bucketGrid, BBox item) { - const int x1Bucket = (int)floorf((item->x1 + bucketGrid->offsetX) / bucketGrid->bucketSize); - const int x2Bucket = (int)ceilf((item->x2 + bucketGrid->offsetX) / bucketGrid->bucketSize); - const int y1Bucket = (int)floorf((item->y1 + bucketGrid->offsetY) / bucketGrid->bucketSize); - const int y2Bucket = (int)ceilf((item->y2 + bucketGrid->offsetY) / bucketGrid->bucketSize); - - for (int y = y1Bucket; y <= y2Bucket; y++) { - for (int x = x1Bucket; x <= x2Bucket; x++) { - if (y < 0 || y >= bucketGrid->height || x < 0 || x >= bucketGrid->width) { - continue; - } - Bucket bucket = &bucketGrid->bucket[x + y * bucketGrid->width]; - Bucket_RemoveItem(bucket, item); - } - } -} - -void BucketGrid_Query(BucketGrid bucketGrid, BBox item, Bucket resultBucket) { - const int x1Bucket = (int)floorf((item->x1 + bucketGrid->offsetX) / bucketGrid->bucketSize); - const int x2Bucket = (int)ceilf((item->x2 + bucketGrid->offsetX) / bucketGrid->bucketSize); - const int y1Bucket = (int)floorf((item->y1 + bucketGrid->offsetY) / bucketGrid->bucketSize); - const int y2Bucket = (int)ceilf((item->y2 + bucketGrid->offsetY) / bucketGrid->bucketSize); - - Bucket_Init(resultBucket); - - for (int y = y1Bucket; y <= y2Bucket; y++) { - for (int x = x1Bucket; x <= x2Bucket; x++) { - if (y < 0 || y >= bucketGrid->height || x < 0 || x >= bucketGrid->width) { - continue; - } - Bucket bucket = &bucketGrid->bucket[x + y * bucketGrid->width]; - for (int i = 0; i < bucket->count; i++) { - if (BBox_Intersect(bucket->bbox[i], item)) { - Bucket_AddItemUnique(resultBucket, bucket->bbox[i]); - } - } - } - } -} - -int BucketGrid_ProcessChanged(BucketGrid bucketGrid) { - TBucket bucketChanged; - Bucket_Init(&bucketChanged); - - for (int y = 0; y < bucketGrid->height; y++) { - for (int x = 0; x <= bucketGrid->width; x++) { - Bucket bucket = &bucketGrid->bucket[x + y * bucketGrid->width]; - int i = 0; - while (i < bucket->count) { - if (bucket->bbox[i]->changed) { - if (bucketChanged.count == Max_ItemsPerBucket) { - return 0; - } - Bucket_AddItemUnique(&bucketChanged, bucket->bbox[i]); - Bucket_RemoveIndex(bucket, i); - } else { - i++; - } - } - } - } - for (int i = 0; i < bucketChanged.count; i++) { - BucketGrid_AddItem(bucketGrid, bucketChanged.bbox[i]); - } - return 1; -} - -void BucketGrid_Clean(BucketGrid bucketGrid) { - for (int y = 0; y < bucketGrid->height; y++) { - for (int x = 0; x <= bucketGrid->width; x++) { - Bucket bucket = &bucketGrid->bucket[x + y * bucketGrid->width]; - Bucket_Init(bucket); - } - } -} diff --git a/src/Bucket.h b/src/Bucket.h deleted file mode 100644 index 85858cf..0000000 --- a/src/Bucket.h +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (C) 2024 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef Bucket_H -#define Bucket_H - -//////////////////////////////////////////////// -// BBox -// -typedef struct TBBox TBBox, *BBox; -struct TBBox { - float x1, x2; - float y1, y2; - void *parent; - int changed; -}; - -int BBox_Intersect(BBox bbox1, BBox bbox2); - -//////////////////////////////////////////////// -// Bucket -// -#define Max_ItemsPerBucket 200 -typedef struct TBucket TBucket, *Bucket; -struct TBucket { - BBox bbox[Max_ItemsPerBucket]; - int count; -}; - -void Bucket_Init(Bucket bucket); - -void Bucket_AddItem(Bucket bucket, BBox item); - -void Bucket_AddItemUnique(Bucket bucket, BBox item); - -int Bucket_SearchItem(Bucket bucket, BBox item); - -void Bucket_RemoveIndex(Bucket bucket, int index); - -void Bucket_RemoveItem(Bucket bucket, BBox item); - -//////////////////////////////////////////////// -// BucketGrid -// -typedef struct TBucketGrid TBucketGrid, *BucketGrid; -struct TBucketGrid { - TBucket *bucket; - int width; - int height; - float bucketSize; - float offsetX; - float offsetY; -}; - -void BucketGrid_Init(BucketGrid bucketGrid, int width, int height, float bucketSize, float offsetX, float offsetY); - -void BucketGrid_DeInit(BucketGrid bucketGrid); - -int BucketGrid_AddItem(BucketGrid bucketGrid, BBox item); - -void BucketGrid_RemoveItem(BucketGrid bucketGrid, BBox item); - -void BucketGrid_Query(BucketGrid bucketGrid, BBox item, Bucket resultBucket); - -int BucketGrid_ProcessChanged(BucketGrid bucketGrid); - -void BucketGrid_Clean(BucketGrid bucketGrid); - -#endif diff --git a/src/Draw.c b/src/Draw.c deleted file mode 100644 index 8f1c2d7..0000000 --- a/src/Draw.c +++ /dev/null @@ -1,1260 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifdef WIN32 - -// Windows -#define _WIN32_WINNT 0x0501 -#include -#include -#include -#include -#include -#include -#include -#define USE_OpenGL 1 -#define USE_OpenGLES 0 -#include - -#else - -// Linux + Emscripten -#include -#include -#include -#define GL_GLEXT_PROTOTYPES 1 -#include -#define USE_OpenGL 0 -#define USE_OpenGLES 1 -// #define SDL_GetKeyState SDL_GetKeyboardState -#ifdef EMSCRIPTEN -#include -#endif - -#endif - -#include "lodepng.c" -#include - -#ifndef GL_CLAMP_TO_EDGE -#define GL_CLAMP_TO_EDGE 0x812F -#endif - -#include "Audio.h" -#include "Draw.h" -#include "Input.h" -#include "QuadArray2D.h" -#include "TimeUtils.h" -#include "Util.h" - -//////////////////////////////////////////////// -// DrawImage // -/////////////// -// Image container. -typedef struct TDrawImage TDrawImage, *DrawImage; -struct TDrawImage { - uint8_t *data; - int x, y; - int w, h; - int flip; - GLuint tex; - int changed; -}; - -// Globals -static SDL_Window *g_Window = NULL; -static SDL_GLContext g_GLContext = NULL; -static SDL_Renderer *g_Renderer = NULL; -int g_Width; -int g_Height; -long long g_ProcTFrame = 33333; -long long g_DrawTFrame = 16667; -int g_FPS = 60; -QuadArray2D g_QuadArray = NULL; -DrawImage g_CurrentImg = NULL; -float g_Color[4]; - -#if USE_OpenGLES - -GLuint g_WhiteTex; - -GLuint Draw_CompileShader(GLenum type, const char *source) { - char *strType = type == GL_VERTEX_SHADER ? "VertexShader" - : type == GL_FRAGMENT_SHADER ? "fragmentShader" - : "unknownShader"; - GLuint shader = glCreateShader(type); - if (shader == 0) { - Print("ERROR: Creating shader of type: %s\n", strType); - return 0; - } - - // load the shader source to the shader object and compile it - glShaderSource(shader, 1, &source, NULL); - glCompileShader(shader); - - // check if the shader compiled successfully - GLint compiled; - glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled); - if (!compiled) { - GLint infoLogLength; - glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength); - GLchar strInfoLog[infoLogLength + 1]; - glGetShaderInfoLog(shader, infoLogLength, NULL, strInfoLog); - Print("ERROR: Compiling shader of type: %s: %s\n", strType, strInfoLog); - - glDeleteShader(shader); - return 0; - } - - return shader; -} - -GLuint Draw_BuildProgram(const char *vertexShaderSource, const char *fragmentShaderSource) { - // Compile shaders - GLuint vertexShader = Draw_CompileShader(GL_VERTEX_SHADER, vertexShaderSource); - GLuint fragmentShader = Draw_CompileShader(GL_FRAGMENT_SHADER, fragmentShaderSource); - if (vertexShader == 0 || fragmentShader == 0) { - return 0; - } - - // create a GL program and link it - GLuint programObject = glCreateProgram(); - glAttachShader(programObject, vertexShader); - glAttachShader(programObject, fragmentShader); - glLinkProgram(programObject); - - // check if the program linked successfully - GLint linked; - glGetProgramiv(programObject, GL_LINK_STATUS, &linked); - if (!linked) { - glDeleteProgram(programObject); - return 0; - } - return programObject; -} - -GLuint g_ProgramObject; - -GLint g_VertPosLoc; -GLint g_VertTexLoc; -GLint g_VertColorLoc; - -GLint g_TextureLoc; -GLint g_ProjectionMatrixLoc; - -GLuint g_VertexObject; - -#define Max_Vertices 6000 - -#endif - -void Draw_ShowInfo(); -void Draw_SetMatrix(float matrix[16]); -GLuint Draw_UploadGLTexture(int w, int h, const uint8_t *pixels); -void Draw_DeleteGLTexture(GLuint tex); - -///////////////////////////// -// Draw_Init -// -// Initializes the game window. -int Draw_Init(const int width, const int height, const char *title, const int pFps, const int fps) { - -#ifdef WIN32 -#ifndef ATTACH_PARENT_PROCESS -#define ATTACH_PARENT_PROCESS ((DWORD)-1) -#endif - // Salida en la consola del padre - AttachConsole(ATTACH_PARENT_PROCESS); - if (GetStdHandle(STD_OUTPUT_HANDLE) != 0) { - fclose(stdin); - fclose(stdout); - fclose(stderr); - freopen("CONIN$", "r", stdin); - freopen("CONOUT$", "w", stdout); - freopen("CONOUT$", "w", stderr); - } -#endif // WIN32 - - // Set globals - g_ProcTFrame = 1000000 / pFps; - g_DrawTFrame = 1000000 / fps; - g_FPS = fps; - g_Width = width; - g_Height = height; - - // Initialize SDL - if (SDL_Init(SDL_INIT_VIDEO) < 0) { - Print("Draw_Init: Failure initializing SDL.\n"); - Print("\tSDL Error: %s\n", SDL_GetError()); - return (0); - } - - // Initialize video mode - g_Window = - SDL_CreateWindow(title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, SDL_WINDOW_OPENGL); - if (g_Window == NULL) { - Print("Draw_Init: Failure initializing video mode.\n"); - Print("\tSDL Error: %s\n", SDL_GetError()); - return (0); - } - - SDL_SetWindowAlwaysOnTop(g_Window, SDL_TRUE); - - g_GLContext = SDL_GL_CreateContext(g_Window); - - g_Renderer = SDL_CreateRenderer(g_Window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE); - - Draw_ShowInfo(); - -#if USE_OpenGL - // Set the desired state - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); - glDisable(GL_CULL_FACE); - glEnable(GL_TEXTURE_2D); - glDisable(GL_LIGHTING); - glDisable(GL_DEPTH_TEST); - glDepthMask(GL_FALSE); - - // TripleBuffer swap - glClear(GL_COLOR_BUFFER_BIT); - SDL_GL_SwapWindow(g_Window); - glClear(GL_COLOR_BUFFER_BIT); - SDL_GL_SwapWindow(g_Window); - glClear(GL_COLOR_BUFFER_BIT); - SDL_GL_SwapWindow(g_Window); - glClear(GL_COLOR_BUFFER_BIT); - - glEnableClientState(GL_COLOR_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glEnableClientState(GL_VERTEX_ARRAY); - -#endif - -#if USE_OpenGLES - - const char vertexShaderSource[] = "attribute vec4 aPosition; \n" - "attribute vec2 aTexCoord; \n" - "attribute vec4 aColor; \n" - "varying vec2 vTexCoord; \n" - "varying vec4 vColor; \n" - "uniform mat4 sProjectionMatrix; \n" - "void main() { \n" - " gl_Position = aPosition * \n" - " sProjectionMatrix; \n" - " vTexCoord = aTexCoord; \n" - " vColor = aColor; \n" - "} \n"; - - const char fragmentShaderSource_10[] = "precision mediump float; \n" - "varying vec2 vTexCoord; \n" - "varying vec4 vColor; \n" - "uniform sampler2D sTexture; \n" - "void main() { \n" - " gl_FragColor = texture2D(sTexture, vTexCoord)*vColor; \n" - "} \n"; - - const char fragmentShaderSource_20[] = "varying vec2 vTexCoord; \n" - "varying vec4 vColor; \n" - "uniform sampler2D sTexture; \n" - "void main() { \n" - " gl_FragColor = texture2D(sTexture, vTexCoord)*vColor; \n" - "} \n"; - - g_ProgramObject = Draw_BuildProgram(vertexShaderSource, fragmentShaderSource_20); - if (g_ProgramObject == 0) { - g_ProgramObject = Draw_BuildProgram(vertexShaderSource, fragmentShaderSource_10); - } - glUseProgram(g_ProgramObject); - - g_VertPosLoc = glGetAttribLocation(g_ProgramObject, "aPosition"); - g_VertTexLoc = glGetAttribLocation(g_ProgramObject, "aTexCoord"); - g_VertColorLoc = glGetAttribLocation(g_ProgramObject, "aColor"); - - g_TextureLoc = glGetUniformLocation(g_ProgramObject, "sTexture"); - g_ProjectionMatrixLoc = glGetUniformLocation(g_ProgramObject, "sProjectionMatrix"); - - glUniform1i(g_TextureLoc, 0); - - glGenBuffers(1, &g_VertexObject); - glBindBuffer(GL_ARRAY_BUFFER, g_VertexObject); - glBufferData(GL_ARRAY_BUFFER, Vertex2D_Length * sizeof(float) * Max_Vertices, NULL, GL_DYNAMIC_DRAW); - - glBindBuffer(GL_ARRAY_BUFFER, g_VertexObject); - - glVertexAttribPointer( - g_VertPosLoc, 2, GL_FLOAT, GL_FALSE, Vertex2D_Length * sizeof(float), (void *)(0 * sizeof(float))); - glVertexAttribPointer( - g_VertTexLoc, 2, GL_FLOAT, GL_FALSE, Vertex2D_Length * sizeof(float), (void *)(2 * sizeof(float))); - glVertexAttribPointer( - g_VertColorLoc, 4, GL_FLOAT, GL_FALSE, Vertex2D_Length * sizeof(float), (void *)(4 * sizeof(float))); - - glEnableVertexAttribArray(g_VertPosLoc); - glEnableVertexAttribArray(g_VertTexLoc); - glEnableVertexAttribArray(g_VertColorLoc); - - uint8_t whiteTexData[4] = {255, 255, 255, 255}; - g_WhiteTex = Draw_UploadGLTexture(1, 1, whiteTexData); - -#endif - - // Set the projection (2D) - glViewport(0, 0, g_Width, g_Height); - float projectionMatrix[16] = {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1}; - projectionMatrix[0] = (2.0f / (float)g_Width); - projectionMatrix[5] = -(2.0f / (float)g_Height); - projectionMatrix[10] = -0.001f; - projectionMatrix[3] = -1.0f; - projectionMatrix[7] = 1.0f; - Draw_SetMatrix(projectionMatrix); - - // Enable Alpha blending - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - // Initialize the triangle array - g_QuadArray = QuadArray2D_Create(400); - - Draw_SetColor(1.0f, 1.0f, 1.0f, 1.0f); - - return (1); -} - -///////////////////////////// -// Draw_ShowInfo -// -// Show device information -void Draw_ShowInfo() { - Print("\n*********************************\n"); - Print("*** Draw Info\n"); - char *str = (char *)glGetString(GL_VENDOR); - Print(" Vendor: %s\n", str); - str = (char *)glGetString(GL_RENDERER); - Print(" Renderer: %s\n", str); - str = (char *)glGetString(GL_VERSION); - Print(" Version: %s\n", str); - str = (char *)glGetString(GL_SHADING_LANGUAGE_VERSION); - Print(" Shader Version: %s\n", str); - Print("*********************************\n"); -} - -///////////////////////////// -// Draw_SetMatrix -// -// Sets the render matrix -void Draw_SetMatrix(float matrix[16]) { -#if USE_OpenGL - float tempMatrix[16] = { - matrix[0], - matrix[4], - matrix[8], - matrix[12], - matrix[1], - matrix[5], - matrix[9], - matrix[13], - matrix[2], - matrix[6], - matrix[10], - matrix[14], - matrix[3], - matrix[7], - matrix[11], - matrix[15]}; - glLoadMatrixf(tempMatrix); -#endif -#if USE_OpenGLES - glUniformMatrix4fv(g_ProjectionMatrixLoc, 1, GL_FALSE, matrix); -#endif -} - -///////////////////////////// -// Draw_UploadGLTexture -// -// Uploads a OpenGL texture. -GLuint Draw_UploadGLTexture(int w, const int h, const uint8_t *pixels) { - GLuint tex; - - // Generate OpenGL texture - glGenTextures(1, &tex); - glBindTexture(GL_TEXTURE_2D, tex); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - - // Load OpenGL texture - glBindTexture(GL_TEXTURE_2D, tex); -#if USE_OpenGL - glPixelStorei(GL_UNPACK_ROW_LENGTH, w); -#endif - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels); - - return (tex); -} - -///////////////////////////// -// Draw_DeleteGLTexture -// -// -void Draw_DeleteGLTexture(GLuint tex) { glDeleteTextures(1, &tex); } - -///////////////////////////// -// Draw_Flush -// -// Performs all the queued draw actions. -void Draw_Flush() { - if (g_CurrentImg == NULL || g_QuadArray->nVertex <= 0) { - return; - } - if (g_CurrentImg->tex != -1 && g_CurrentImg->changed) { - Draw_DeleteGLTexture(g_CurrentImg->tex); - g_CurrentImg->tex = -1; - g_CurrentImg->changed = 0; - } - if (g_CurrentImg->tex == -1) { - g_CurrentImg->tex = Draw_UploadGLTexture(g_CurrentImg->w, g_CurrentImg->h, g_CurrentImg->data); - g_CurrentImg->changed = 0; - } - -#if USE_OpenGL - // Draw the quad array - glBindTexture(GL_TEXTURE_2D, g_CurrentImg->tex); - glColorPointer(4, GL_FLOAT, Vertex2D_Length * sizeof(float), (GLvoid *)(g_QuadArray->vertexData + 4)); - glTexCoordPointer(2, GL_FLOAT, Vertex2D_Length * sizeof(float), (GLvoid *)(g_QuadArray->vertexData + 2)); - glVertexPointer(2, GL_FLOAT, Vertex2D_Length * sizeof(float), (GLvoid *)(g_QuadArray->vertexData)); - glDrawArrays(GL_TRIANGLES, 0, g_QuadArray->nVertex); - -#else - - // Draw the quad array - glBindTexture(GL_TEXTURE_2D, g_CurrentImg->tex); - glBufferSubData( - GL_ARRAY_BUFFER, 0, Vertex2D_Length * sizeof(float) * g_QuadArray->nVertex, g_QuadArray->vertexData); - glDrawArrays(GL_TRIANGLES, 0, g_QuadArray->nVertex); - -#endif - - // Empty it - QuadArray2D_Clean(g_QuadArray); -} - -///////////////////////////// -// Draw_Clean -// -// Cleans the game window. -void Draw_Clean(uint8_t r, uint8_t g, uint8_t b) { -#if USE_OpenGL - glClearColor(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f); - glClear(GL_COLOR_BUFFER_BIT); -#else - Draw_Flush(); - float fr = (float)r / 255.0f; - float fg = (float)g / 255.0f; - float fb = (float)b / 255.0f; - float fWidth = (float)g_Width; - float fHeight = (float)g_Height; - GLfloat vVertices[] = { - 0.0f, 0.0f, // Position 0 - 0.0f, 0.0f, // TexCoord 0 - fr, fg, fb, 1.0f, // Color - - 0.0f, fHeight, // Position 1 - 0.0f, 1.0f, // TexCoord 1 - fr, fg, fb, 1.0f, // Color - - fWidth, fHeight, // Position 2 - 1.0f, 1.0f, // TexCoord 2 - fr, fg, fb, 1.0f, // Color - - fWidth, fHeight, // Position 2 - 1.0f, 1.0f, // TexCoord 2 - fr, fg, fb, 1.0f, // Color - - fWidth, 0.0f, // Position 3 - 1.0f, 0.0f, // TexCoord 3 - fr, fg, fb, 1.0f, // Color - - 0.0f, 0.0f, // Position 0 - 0.0f, 0.0f, // TexCoord 0 - fr, fg, fb, 1.0f, // Color - }; - glBindTexture(GL_TEXTURE_2D, g_WhiteTex); - glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vVertices), vVertices); - glDrawArrays(GL_TRIANGLES, 0, 6); -#endif -} - -///////////////////////////// -// Draw_LoopIteration -// -// One iteration of the loop updating the game window. -void (*g_ProcFunc)(void *data) = NULL; -void (*g_DrawFunc)(void *data, float f) = NULL; -void *g_Data = NULL; -int g_DrawLooping = 0; -int g_DrawExitOverride = 0; -long long g_AccumulatedTime; -int Draw_LoopIteration() { - SDL_Event event; - -// Process Events -#ifdef EMSCRIPTEN - while (SDL_PollEvent(&event)) { - if (event.type == SDL_QUIT) { - Input_SetKey(InputKey_Exit, 1); - } - if (event.type == SDL_KEYDOWN) { - if (event.key.keysym.sym == SDL_SCANCODE_ESCAPE) { - Input_SetKey(InputKey_Exit, 1); - } - } - if (event.type == SDL_MOUSEMOTION) { - Input_SetPointerPosition(event.motion.x / (float)g_Width, event.motion.y / (float)g_Height); - } - if (event.type == SDL_MOUSEBUTTONDOWN) { - Input_SetPointerPosition(event.button.x / (float)g_Width, event.button.y / (float)g_Height); - Input_SetPointerDown(1); - } - if (event.type == SDL_FINGERMOTION) { - Input_SetPointerPosition(event.tfinger.x, event.tfinger.y); - } - if (event.type == SDL_FINGERDOWN) { - Input_SetPointerPosition(event.tfinger.x, event.tfinger.y); - Input_SetPointerDown(1); - } - if (event.type == SDL_MOUSEBUTTONUP) { - Input_SetPointerPosition(event.button.x / (float)g_Width, event.button.y / (float)g_Height); - Input_SetPointerDown(0); - } - if (event.type == SDL_FINGERUP) { - Input_SetPointerPosition(event.tfinger.x, event.tfinger.y); - Input_SetPointerDown(0); - } - } -#else - while (SDL_PollEvent(&event)) { - if (event.type == SDL_QUIT) { - Input_SetKey(InputKey_Exit, 1); - if (!g_DrawExitOverride) { - g_DrawLooping = 0; - } - } - if (event.type == SDL_KEYDOWN) { - if (event.key.keysym.scancode == SDL_SCANCODE_ESCAPE) { - Input_SetKey(InputKey_Exit, 1); - if (!g_DrawExitOverride) { - g_DrawLooping = 0; - } - } - } - if (event.type == SDL_MOUSEMOTION) { - Input_SetPointerPosition((float)event.motion.x / (float)g_Width, (float)event.motion.y / (float)g_Height); - } - if (event.type == SDL_MOUSEBUTTONDOWN) { - Input_SetPointerPosition((float)event.button.x / (float)g_Width, (float)event.button.y / (float)g_Height); - Input_SetPointerDown(1); - } - if (event.type == SDL_MOUSEBUTTONUP) { - Input_SetPointerPosition((float)event.button.x / (float)g_Width, (float)event.button.y / (float)g_Height); - Input_SetPointerDown(0); - } - } -#endif - - // Process - if (g_ProcFunc) { - if (g_AccumulatedTime > 100000) { - g_AccumulatedTime = 100000; - } - while (g_AccumulatedTime >= g_ProcTFrame && g_DrawLooping) { - Input_Frame(); - g_ProcFunc(g_Data); - g_AccumulatedTime -= g_ProcTFrame; - Input_PostFrame(); - } - } - - // Sound Frame - Audio_Frame(); - - // Draw - SDL_GL_SwapWindow(g_Window); - if (g_DrawFunc) { - g_DrawFunc(g_Data, (float)g_AccumulatedTime / (float)g_ProcTFrame); - Draw_Flush(); - } - - return g_DrawLooping; -} - -#ifdef EMSCRIPTEN -long long _procTime1; -long long _procTime2; -void Draw_LoopIterationAux() { - Draw_LoopIteration(); - - // Update time - _procTime2 = Time_GetTime(); - g_AccumulatedTime += _procTime2 - _procTime1; - _procTime1 = _procTime2; -} -#endif - -///////////////////////////// -// Draw_Loop -// -// Loops updating the game window. -void Draw_Loop(void (*proc)(void *data), void (*draw)(void *data, float f), void *data) { - - g_ProcFunc = proc; - g_DrawFunc = draw; - g_Data = data; - if (g_DrawLooping) { - return; - } - g_DrawLooping = 1; -#ifndef EMSCRIPTEN - long long drawTime1; - g_AccumulatedTime = g_ProcTFrame; - long long procTime1 = drawTime1 = Time_GetTime(); - while (Draw_LoopIteration()) { - - // Wait to round g_DrawTFrame - long long drawTime2 = Time_GetTime(); - Time_Pause(g_DrawTFrame - (drawTime2 - drawTime1)); - drawTime2 = Time_GetTime(); - drawTime1 = drawTime2; - - // Update time - long long procTime2 = Time_GetTime(); - g_AccumulatedTime += procTime2 - procTime1; - procTime1 = procTime2; - } -#else - g_AccumulatedTime = g_ProcTFrame; - _procTime1 = Time_GetTime(); - if (g_FPS <= 50) { - emscripten_set_main_loop(Draw_LoopIterationAux, g_FPS, 1); - } else { - emscripten_set_main_loop(Draw_LoopIterationAux, 0, 1); - } -#endif -} - -///////////////////////////// -// Draw_BreakLoop -// -// Breaks the drawing loop -void Draw_BreakLoop() { -#ifndef EMSCRIPTEN - g_DrawLooping = 0; -#endif -} - -///////////////////////////// -// Draw_OverrideExit -// -// Overrides the default exit mechanism -void Draw_OverrideExit(int override) { g_DrawExitOverride = override; } - -///////////////////////////// -// Draw_CreateImage -// -DrawImg Draw_CreateImage(int w, int h) { - - // Create the image container - DrawImage image = malloc(sizeof(TDrawImage)); - image->data = malloc(w * h * 4); - image->w = w; - image->h = h; - image->x = -(image->w / 2); - image->y = -(image->h / 2); - image->flip = 0; - image->tex = -1; - image->changed = 1; - - return ((DrawImg)image); -} - -///////////////////////////// -// Draw_LoadImage -// -// Loads an image, giving a reference. -DrawImg Draw_LoadImage(char *filename) { - - // Try loading PNG images - if (EndsWith(filename, ".png") || EndsWith(filename, ".PNG")) { - DrawImage image = malloc(sizeof(TDrawImage)); - const unsigned error = - lodepng_decode32_file(&image->data, (unsigned *)&image->w, (unsigned *)&image->h, filename); - if (error) { - Print("Draw_LoadImage: PNG decoder error %u: %s on file %s\n", error, lodepng_error_text(error), filename); - return (NULL); - } - image->x = -(image->w / 2); - image->y = -(image->h / 2); - image->flip = 0; - image->tex = -1; - image->changed = 1; - return (DrawImg)image; - } - - Print("Draw_LoadImage: Image type not supported: %s\n", filename); - return (NULL); -} - -///////////////////////////// -// Draw_GetSize -// -// Gets the image size. -void Draw_GetSize(DrawImg img, int *w, int *h) { - DrawImage image = img; - - // Gets the image size - *w = image->w; - *h = image->h; -} - -///////////////////////////// -// Draw_SetOffset -// Draw_GetOffset -// -// Sets and Gets the image offset. -void Draw_SetOffset(DrawImg img, int x, int y) { - DrawImage image = img; - - // Sets the image offset - image->x = x; - image->y = y; -} -void Draw_GetOffset(DrawImg img, int *x, int *y) { - DrawImage image = img; - - // Gets the image offset - *x = image->x; - *y = image->y; -} - -///////////////////////////// -// Draw_SetFlip -// Draw_GetFlip -// -// -void Draw_SetFlip(DrawImg img, int flip) { - DrawImage image = img; - image->flip = flip; -} -int Draw_GetFlip(DrawImg img) { - DrawImage image = img; - return image->flip; -} - -///////////////////////////// -// Draw_SetPixel -// Draw_AddPixel -// -// -DrawImg Draw_SetPixel(DrawImg img, const int x, const int y, const ColorRgba color) { - DrawImage image = img; - if (x < 0 || y < 0) { - return img; - } - if (x >= image->w || y >= image->h) { - return img; - } - const int offset = (x + y * image->w) * 4; - image->data[offset + 0] = color[0]; - image->data[offset + 1] = color[1]; - image->data[offset + 2] = color[2]; - image->data[offset + 3] = color[3]; - image->changed = 1; - return img; -} -DrawImg Draw_AddPixel(DrawImg img, const int x, const int y, const ColorRgba color, const float factor) { - const float alpha = factor * ((float)color[3] / 255); - if (alpha <= 0) { - return img; - } - if (alpha >= 255) { - Draw_SetPixel(img, x, y, color); - return img; - } - DrawImage image = img; - if (x < 0 || y < 0) { - return img; - } - if (x >= image->w || y >= image->h) { - return img; - } - - const uint8_t a = (uint8_t)(alpha * 255); - const uint8_t r = (int)((float)color[0] * alpha); - const uint8_t g = (int)((float)color[1] * alpha); - const uint8_t b = (int)((float)color[2] * alpha); - - const int offset = (x + y * image->w) * 4; - image->data[offset + 0] = SumClamp_uint8(image->data[offset + 0] * (1 - alpha), r); - image->data[offset + 1] = SumClamp_uint8(image->data[offset + 1] * (1 - alpha), g); - image->data[offset + 2] = SumClamp_uint8(image->data[offset + 2] * (1 - alpha), b); - image->data[offset + 3] = SumClamp_uint8(image->data[offset + 3], a); - image->changed = 1; - return img; -} - -///////////////////////////// -// Draw_DrawBoxFilled -// -// -DrawImg Draw_DrawBoxFilled(DrawImg img, const int x1, const int y1, const int x2, const int y2, const ColorRgba color) { - for (int y = y1; y < y2; y++) { - for (int x = x1; x < x2; x++) { - Draw_SetPixel(img, x, y, color); - } - } - return img; -} - -///////////////////////////// -// Draw_DrawBox -// -// -DrawImg Draw_DrawBox(DrawImg img, const int x1, const int y1, const int x2, const int y2, const ColorRgba color) { - for (int x = x1; x < x2; x++) { - Draw_SetPixel(img, x, y1, color); - Draw_SetPixel(img, x, y2 - 1, color); - } - for (int y = y1 + 1; y < y2 - 1; y++) { - Draw_SetPixel(img, x1, y, color); - Draw_SetPixel(img, x2 - 1, y, color); - } - return (img); -} - -///////////////////////////// -// Draw_DrawCircle -// -// -DrawImg Draw_DrawCircle(DrawImg img, int centerX, int centerY, int radius, int innerRadius, const ColorRgba color) { - for (int y = -centerY; y < centerY; y++) { - for (int x = -centerX; x < centerX; x++) { - const float dist = sqrtf((float)(x * x + y * y)); - if (dist <= (float)radius) { - const float delta = (float)radius - dist; - if (delta > 1.0f) { - // In - const float innerDelta = (float)innerRadius - dist; - if (innerDelta > 1.0f) { - // In - } else if (innerDelta <= 1.0f && innerDelta >= 0.0f) { - // Edge - Draw_AddPixel(img, centerX + x, centerY + y, color, 1.0f - innerDelta); - } else { - // Out - Draw_AddPixel(img, centerX + x, centerY + y, color, 1.0f); - } - } else if (delta <= 1.0f && delta >= 0.0f) { - // Edge - Draw_AddPixel(img, centerX + x, centerY + y, color, delta); - } else { - // Out - } - } - } - } - return img; -} - -///////////////////////////// -// Draw_DrawImg -// -// Draws an image. -void Draw_DrawImg(DrawImg img, int x, int y, const float scale[2]) { - DrawImage image = img; - float u1 = 0.0f, u2 = 1.0f; - float v1 = 0.0f, v2 = 1.0f; - - // Prepare screen coordinates - const float x1 = (float)x + ((float)image->x * scale[0]); - const float y1 = (float)y + ((float)image->y * scale[1]); - const float x2 = x1 + ((float)image->w * scale[0]); - const float y2 = y1 + ((float)image->h * scale[1]); - - // Apply flipping - if (image->flip & 1) { - const float t = u1; - u1 = u2; - u2 = t; - } - if (image->flip & 2) { - const float t = v1; - v1 = v2; - v2 = t; - } - - // Draw a quad - if (g_CurrentImg != image) { - Draw_Flush(); - g_CurrentImg = image; - } - QuadArray2D_AddQuad(g_QuadArray, x1, y1, u1, v1, x2, y2, u2, v2, g_Color); -} - -///////////////////////////// -// Draw_DrawImgResized -// -// Draws an image, resizing. -void Draw_DrawImgResized(DrawImg img, int x, int y, float w, float h) { - DrawImage image = img; - float u1 = 0.0f, u2 = 1.0f; - float v1 = 0.0f, v2 = 1.0f; - - // Prepare - const float x1 = (float)x + (float)image->x; - const float y1 = (float)y + (float)image->y; - const float x2 = x1 + w; - const float y2 = y1 + h; - - // Apply flipping - if (image->flip & 1) { - const float t = u1; - u1 = u2; - u2 = t; - } - if (image->flip & 2) { - const float t = v1; - v1 = v2; - v2 = t; - } - - // Draw a quad - if (g_CurrentImg != image) { - Draw_Flush(); - g_CurrentImg = image; - } - QuadArray2D_AddQuad(g_QuadArray, x1, y1, u1, v1, x2, y2, u2, v2, g_Color); -} - -///////////////////////////// -// Draw_DrawImgPart -// -// Draws an image part. -void Draw_DrawImgPart(DrawImg img, int x, int y, int w, int h, int i, int j, const float scale[2]) { - DrawImage image = img; - - // Prepare screen coordinates - const float x1 = (float)x + ((float)image->x * scale[0]); - const float y1 = (float)y + ((float)image->y * scale[1]); - const float x2 = x1 + ((float)w * scale[0]); - const float y2 = y1 + ((float)h * scale[1]); - - // Prepare image coordinates - const float us = 1.0f / (float)image->w; - float u1 = us * (float)(i * w); - float u2 = u1 + (us * (float)w); - const float vs = 1.0f / (float)image->h; - float v1 = vs * (float)(j * h); - float v2 = v1 + (vs * (float)h); - - // Apply flipping - if (image->flip & 1) { - const float t = u1; - u1 = u2; - u2 = t; - } - if (image->flip & 2) { - const float t = v1; - v1 = v2; - v2 = t; - } - - // Draw a quad - if (g_CurrentImg != image) { - Draw_Flush(); - g_CurrentImg = image; - } - QuadArray2D_AddQuad(g_QuadArray, x1, y1, u1, v1, x2, y2, u2, v2, g_Color); -} - -///////////////////////////// -// Draw_DrawImgPartHoriz -// -// Draws an image part horizontally. -void Draw_DrawImgPartHoriz(DrawImg img, int x, int y, int w, int i, const float scale[2]) { - DrawImage image = img; - float v1 = 0.0f, v2 = 1.0f; - - // Prepare screen coordinates - const float x1 = (float)x + ((float)image->x * scale[0]); - const float y1 = (float)y + ((float)image->y * scale[1]); - const float x2 = x1 + ((float)w * scale[0]); - const float y2 = y1 + ((float)image->h * scale[1]); - - // Prepare image coordinates - const float us = 1.0f / (float)image->w; - float u1 = us * (float)(i * w); - float u2 = u1 + (us * (float)w); - - // Apply flipping - if (image->flip & 1) { - const float t = u1; - u1 = u2; - u2 = t; - } - if (image->flip & 2) { - const float t = v1; - v1 = v2; - v2 = t; - } - - // Draw a quad - if (g_CurrentImg != image) { - Draw_Flush(); - g_CurrentImg = image; - } - QuadArray2D_AddQuad(g_QuadArray, x1, y1, u1, v1, x2, y2, u2, v2, g_Color); -} - -///////////////////////////// -// Draw_ImgParallax -// -// -void Draw_ImgParallax( - DrawImg img, int imgSize[2], const int imgOffset[2], const float parallaxFactor[2], const int gamePos[2], - const int gameSize[2]) { - int parallaxPos[2]; - int multiply[2]; - - parallaxPos[0] = (int)((float)gamePos[0] * parallaxFactor[0]) + imgOffset[0]; - parallaxPos[1] = (int)((float)gamePos[1] * parallaxFactor[1]) + imgOffset[1]; - - multiply[0] = (int)floorf((float)parallaxPos[0] / (float)imgSize[0]); - if (parallaxPos[0] < 0) { - multiply[0]--; - } - multiply[1] = (int)floorf((float)parallaxPos[1] / (float)imgSize[1]); - if (parallaxPos[1] < 0) { - multiply[1]--; - } - - int y = (multiply[1] * imgSize[1]) - parallaxPos[1]; - while (y < gameSize[1]) { - int x = (multiply[0] * imgSize[0]) - parallaxPos[0]; - while (x < gameSize[0]) { - Draw_DrawImgResized(img, x, y, (float)imgSize[0], (float)imgSize[1]); - x += imgSize[0]; - } - y += imgSize[1]; - } -} - -///////////////////////////// -// Draw_SetColor -// -// -void Draw_SetColor(float r, float g, float b, float a) { - g_Color[0] = r; - g_Color[1] = g; - g_Color[2] = b; - g_Color[3] = a; -} - -//////////////////////////////////////////////// -// DrawFnt // -///////////// -// Reference to a Font. -typedef struct { - DrawImage img; - int w, h; - int min, max; - float scale[2]; -} DrawFont; - -///////////////////////////// -// Draw_DefaultImage -// -// Creates an image with the default font. -#include "FontData.h" -DrawImage Draw_DefaultFontImage(const ColorRgba color) { - - // Create the image and colors - DrawImage img = Draw_CreateImage(8 * 256, 8); - Draw_SetOffset(img, 0, 0); - - // Draw the font - for (int c = 0; c < 256; c++) { - for (int y = 0; y < 8; y++) { - for (int x = 0; x < 8; x++) { - const int offset = ((c * 8 + x) + (8 * 256 * y)) * 4; - img->data[offset + 0] = color[0]; - img->data[offset + 1] = color[1]; - img->data[offset + 2] = color[2]; - if (((fontData_8x8[c * 8 + y] >> (7 - x)) & 0x01) == 1) { - img->data[offset + 3] = color[3]; - } else { - img->data[offset + 3] = 0x00; - } - } - } - } - img->changed = 1; - - return (img); -} - -///////////////////////////// -// Draw_DefaultFont -// -// Creates the default font. -DrawFnt Draw_DefaultFont(ColorRgba color) { - - // Create the default font - DrawFont *font = malloc(sizeof(DrawFont)); - font->img = Draw_DefaultFontImage(color); - font->w = 8; - font->h = 8; - font->min = 0; - font->max = 256; - font->scale[0] = 1.0f; - font->scale[1] = 1.0f; - - return ((DrawFnt)font); -} - -///////////////////////////// -// Draw_LoadFont -// -// Load a font from a file. -DrawFnt Draw_LoadFont(char *fichero, int min, int max) { - - // Create the font form the image - DrawFont *font = malloc(sizeof(DrawFont)); - font->img = Draw_LoadImage(fichero); - font->w = font->img->w / (max - min); - font->h = font->img->h; - font->min = min; - font->max = max; - font->scale[0] = 1.0f; - font->scale[1] = 1.0f; - - return ((DrawFnt)font); -} - -///////////////////////////// -// Draw_FontScale -// -void Draw_FontScale(DrawFnt f, const float scale[2]) { - DrawFont *font = f; - - font->scale[0] = scale[0]; - font->scale[1] = scale[1]; -} - -///////////////////////////// -// Draw_DrawText -// -// Draws text using a font. -void Draw_DrawText(DrawFnt f, const char *text, int x, int y) { - DrawFont *font = f; - - // Iterate the string - const char *ptr = text; - while (*ptr) { - if ((*ptr) < font->max) { - Draw_DrawImgPartHoriz(font->img, x, y, font->w, (*ptr) - font->min, font->scale); - } - x += (int)((float)font->w * font->scale[0]); - ptr++; - } -} - -///////////////////////////// -// Draw_SaveRGBAToBMP -// -// -void Draw_SaveRGBAToBMP(const char *filename, const uint8_t *data, const int width, const int height) { - - // Create the surface - SDL_Surface *surf = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32, 0, 0, 0, 0); - surf->format->Amask = 0xFF000000; - surf->format->Ashift = 24; - // SDL_SetAlpha(surf, GL_SRC_ALPHA, 255); - SDL_LockSurface(surf); - memcpy(surf->pixels, data, width * height * 4); - SDL_UnlockSurface(surf); - - // Swap RGB to BGR - Uint32 *ptr = (Uint32 *)surf->pixels; - const Uint32 *ptr_end = ptr + (surf->w * surf->h); - while (ptr < ptr_end) { - uint8_t *pixel = (uint8_t *)ptr; - const uint8_t temp = pixel[2]; - pixel[2] = pixel[0]; - pixel[0] = temp; - ptr++; - } - - // Save the image - SDL_SaveBMP(surf, filename); - - // Cleanup - SDL_FreeSurface(surf); -} - -///////////////////////////// -// Draw_SaveRGBAToPNG -// -// -void Draw_SaveRGBAToPNG(const char *filename, const uint8_t *data, const int width, const int height) { - unsigned error = lodepng_encode32_file(filename, data, width, height); - if (error) { - Print("Draw_SaveRGBAToPNG: Error %u: %s\n", error, lodepng_error_text(error)); - } -} - -///////////////////////////// -// Draw_SaveScreenshot -// -// -void Draw_SaveScreenshot(char *filename) { -#if USE_OpenGL - uint8_t *pixelData; - uint8_t *image_line; - int i, half_height, line_size; - - pixelData = malloc(g_Width * g_Height * 4); - - glReadPixels(0, 0, g_Width, g_Height, GL_RGBA, GL_UNSIGNED_BYTE, pixelData); - - // Flip the image data - line_size = g_Width * 4; - half_height = g_Height / 2; - image_line = malloc(line_size); - for (i = 0; i < half_height; i++) { - memcpy(image_line, pixelData + i * line_size, line_size); - memcpy(pixelData + i * line_size, pixelData + (g_Height - (i + 1)) * line_size, line_size); - memcpy(pixelData + (g_Height - (i + 1)) * line_size, image_line, line_size); - } - - // Save the image - if (EndsWith(filename, ".bmp") || EndsWith(filename, ".BMP")) { - Draw_SaveRGBAToBMP(filename, pixelData, g_Width, g_Height); - } else if (EndsWith(filename, ".png") || EndsWith(filename, ".PNG")) { - Draw_SaveRGBAToPNG(filename, pixelData, g_Width, g_Height); - } - - // Cleanup - free(pixelData); -#endif -} - -///////////////////////////// -// Draw_ShowCursor -// -// -void Draw_ShowCursor(int showCursor) { - if (showCursor) { - SDL_ShowCursor(31); - } else { - SDL_ShowCursor(0); - } -} diff --git a/src/Draw.h b/src/Draw.h deleted file mode 100644 index a89adf7..0000000 --- a/src/Draw.h +++ /dev/null @@ -1,201 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef Draw_H -#define Draw_H - -#include - -///////////////////////////// -// Draw_Init -// -// Initializes the game window. -int Draw_Init(int width, int height, const char *title, int pFps, int fps); - -///////////////////////////// -// Draw_Clean -// -// Cleans the game window. -void Draw_Clean(uint8_t r, uint8_t g, uint8_t b); - -///////////////////////////// -// Draw_Loop -// -// Loops updating the game window. -void Draw_Loop(void (*proc)(void *data), void (*draw)(void *data, float f), void *data); - -///////////////////////////// -// Draw_BreakLoop -// -// Breaks the drawing loop -void Draw_BreakLoop(); - -///////////////////////////// -// Draw_OverrideExit -// -// Overrides the default exit mechanism -void Draw_OverrideExit(int override); - -///////////////////////////// -// Draw_Flush -// -// Performs all the queued draw actions. -void Draw_Flush(); - -//////////////////////////////////////////////// -// DrawImg // -///////////// -// Reference to an image. -typedef void *DrawImg; -typedef uint8_t ColorRgba[4]; - -///////////////////////////// -// Draw_CreateImage -// -DrawImg Draw_CreateImage(int w, int h); - -///////////////////////////// -// Draw_LoadImage -// -// Loads an image, giving a reference. -DrawImg Draw_LoadImage(char *filename); - -///////////////////////////// -// Draw_GetSize -// -// Gets the image size. -void Draw_GetSize(DrawImg img, int *w, int *h); - -///////////////////////////// -// Draw_SetOffset -// Draw_GetOffset -// -// Sets and Gets the image offset. -void Draw_SetOffset(DrawImg img, int x, int y); -void Draw_GetOffset(DrawImg img, int *x, int *y); - -///////////////////////////// -// Draw_SetFlip -// Draw_GetFlip -// -// -void Draw_SetFlip(DrawImg img, int flip); -int Draw_GetFlip(DrawImg img); - -///////////////////////////// -// Draw_SetPixel -// Draw_AddPixel -// -// -DrawImg Draw_SetPixel(DrawImg img, int x, int y, const ColorRgba color); -DrawImg Draw_AddPixel(DrawImg img, int x, int y, const ColorRgba color, float factor); - -///////////////////////////// -// Draw_DrawBoxFilled -// -// -DrawImg Draw_DrawBoxFilled(DrawImg img, int x1, int y1, int x2, int y2, const ColorRgba color); - -///////////////////////////// -// Draw_DrawBox -// -// -DrawImg Draw_DrawBox(DrawImg img, int x1, int y1, int x2, int y2, const ColorRgba color); - -///////////////////////////// -// Draw_DrawCircle -// -// -DrawImg Draw_DrawCircle(DrawImg img, int centerX, int centerY, int radius, int innerRadius, const ColorRgba color); - -///////////////////////////// -// Draw_DrawImg -// -// Draws an image. -void Draw_DrawImg(DrawImg img, int x, int y, const float scale[2]); - -///////////////////////////// -// Draw_DrawImgResized -// -// Draws an image, resizing. -void Draw_DrawImgResized(DrawImg img, int x, int y, float w, float h); - -///////////////////////////// -// Draw_DrawImgPart -// -// Draws an image part. -void Draw_DrawImgPart(DrawImg img, int x, int y, int w, int h, int i, int j, const float scale[2]); - -///////////////////////////// -// Draw_DrawImgPartHoriz -// -// Draws an image part horizontally. -void Draw_DrawImgPartHoriz(DrawImg img, int x, int y, int w, int i, const float scale[2]); - -///////////////////////////// -// Draw_ImgParallax -// -// -void Draw_ImgParallax( - DrawImg img, int imgSize[2], const int imgOffset[2], const float parallaxFactor[2], const int gamePos[2], - const int gameSize[2]); - -///////////////////////////// -// Draw_SetColor -// -// -void Draw_SetColor(float r, float g, float b, float a); - -//////////////////////////////////////////////// -// DrawFnt // -///////////// -// Reference to a Font. -typedef void *DrawFnt; - -///////////////////////////// -// Draw_DefaultFont -// -// Creates the default font. -DrawFnt Draw_DefaultFont(ColorRgba color); - -///////////////////////////// -// Draw_LoadFont -// -// Load a font from a file. -DrawFnt Draw_LoadFont(char *fichero, int min, int max); - -///////////////////////////// -// Draw_FontScale -// -void Draw_FontScale(DrawFnt f, const float scale[2]); - -///////////////////////////// -// Draw_DrawText -// -// Draws text using a font -void Draw_DrawText(DrawFnt f, const char *text, int x, int y); - -///////////////////////////// -// Draw_SaveRGBAToBMP -// -// -void Draw_SaveRGBAToBMP(const char *filename, const uint8_t *data, int width, int height); - -///////////////////////////// -// Draw_SaveRGBAToPNG -// -// -void Draw_SaveRGBAToPNG(const char *filename, const uint8_t *data, int width, int height); - -///////////////////////////// -// Draw_SaveScreenshot -// -// -void Draw_SaveScreenshot(char *filename); - -///////////////////////////// -// Draw_ShowCursor -// -// -void Draw_ShowCursor(int showCursor); - -#endif diff --git a/src/Entity.c b/src/Entity.c deleted file mode 100644 index d458eb9..0000000 --- a/src/Entity.c +++ /dev/null @@ -1,1038 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#include -#include -#include - -#include "Anim.h" -#include "Draw.h" -#include "Util.h" - -#include "Bucket.h" -#include "Entity.h" - -#define EntityIntFlag_UpdateLight 1 -#define EntityIntFlag_UpdatedPos 2 -#define EntityIntFlag_UpdatedColor 4 -#define EntityIntFlag_UpdateColor 8 -#define EntityIntFlag_UpdatedScale 16 - -///////////////////////////// -// Entity_GetFree -// -// -Entity g_FreeEntity = NULL; -Entity Entity_GetFree() { - Entity e; - - if (!g_FreeEntity) { - // Allocate a big block of entities - int n = 1024, i; - TEntity *newEntities = malloc(sizeof(TEntity) * n); - for (i = 0; i < n; i++) { - if (i < (n - 1)) { - newEntities[i].next = &newEntities[i + 1]; - } else { - newEntities[i].next = NULL; - } - } - g_FreeEntity = newEntities; - } - e = g_FreeEntity; - g_FreeEntity = e->next; - return e; -} - -///////////////////////////// -// Entity_New -// -// -Entity Entity_New() { - Entity e = Entity_GetFree(); - - e->base = NULL; - e->type = 0; - vec2_set(e->pos0, 0.0f, 0.0f); - vec2_set(e->pos, 0.0f, 0.0f); - e->flags = EntityFlag_Collision | EntityFlag_Overlap; - e->internalFlags = EntityIntFlag_UpdateColor; - e->zorder = 1; - e->sortYOffset = 0; - - vec2_set(e->dir, 0.0f, 0.0f); - - vec2_set(e->vel, 0.0f, 0.0f); - e->radius = 1.0f; - e->width = 1.0f; - e->height = 1.0f; - e->mass = 1.0f; - e->elast = 0.0f; - e->backFric_static = 0.0f; - - e->backFric_dynamic = 0.0f; - e->fric_static = 0.0f; - e->fric_dynamic = 0.0f; - - AnimPlay_SetImg(&e->anim, NULL); - - e->color0[0] = e->color0[1] = e->color0[2] = e->color0[3] = 1.0f; - e->color[0] = e->color[1] = e->color[2] = e->color[3] = 1.0f; - - e->light[0] = e->light[1] = e->light[2] = e->light[3] = 1.0f; - e->defaultColor[0] = e->defaultColor[1] = e->defaultColor[2] = e->defaultColor[3] = 1.0f; - - e->scale0[0] = 1.0f; - e->scale0[1] = 1.0f; - e->scale[0] = 1.0f; - e->scale[1] = 1.0f; - - e->oncopy = NULL; - e->oninit = NULL; - e->ondelete = NULL; - e->proc = NULL; - e->postproc = NULL; - e->collision = NULL; - e->overlap = NULL; - - e->A = 0; - e->B = 0; - e->C = 0; - e->D = 0; - e->E = 0; - vec2_set(e->VecA, 0.0f, 0.0f); - vec2_set(e->VecB, 0.0f, 0.0f); - e->child = NULL; - - e->next = NULL; - - return (e); -} - -///////////////////////////// -// Entity_Init -// -Entity Entity_Init(Entity e) { - if (e->oninit) { - e->oninit(e); - } - return (e); -} - -///////////////////////////// -// Entity_Destroy -// -// -void Entity_Destroy(Entity e) { - if (e->ondelete) { - e->ondelete(e); - } - e->next = g_FreeEntity; - g_FreeEntity = e; -} - -///////////////////////////// -// Entity_Copy -// -// -Entity Entity_Copy(Entity e) { - Entity n; - - n = Entity_New(); - - n->base = e; - n->type = e->type; - vec2_set(n->pos, e->pos[0], e->pos[1]); - n->flags = e->flags; - n->internalFlags = e->internalFlags; - n->zorder = e->zorder; - n->sortYOffset = e->sortYOffset; - - vec2_set(n->vel, e->vel[0], e->vel[1]); - n->radius = e->radius; - n->width = e->width; - n->height = e->height; - n->mass = e->mass; - n->elast = e->elast; - n->backFric_static = e->backFric_static; - n->backFric_dynamic = e->backFric_dynamic; - n->fric_static = e->fric_static; - n->fric_dynamic = e->fric_dynamic; - - AnimPlay_Copy(&n->anim, &e->anim); - n->color0[0] = e->color0[0]; - n->color0[1] = e->color0[1]; - n->color0[2] = e->color0[2]; - n->color0[3] = e->color0[3]; - n->color[0] = e->color[0]; - n->color[1] = e->color[1]; - n->color[2] = e->color[2]; - n->color[3] = e->color[3]; - n->light[0] = e->light[0]; - n->light[1] = e->light[1]; - n->light[2] = e->light[2]; - n->light[3] = e->light[3]; - n->defaultColor[0] = e->defaultColor[0]; - n->defaultColor[1] = e->defaultColor[1]; - n->defaultColor[2] = e->defaultColor[2]; - n->defaultColor[3] = e->defaultColor[3]; - - n->scale0[0] = e->scale[0]; - n->scale0[1] = e->scale[1]; - n->scale[0] = e->scale[0]; - n->scale[1] = e->scale[1]; - - n->oncopy = e->oncopy; - n->oninit = e->oninit; - n->ondelete = e->ondelete; - n->proc = e->proc; - n->postproc = e->postproc; - n->collision = e->collision; - n->overlap = e->overlap; - - n->A = e->A; - n->B = e->B; - n->C = e->C; - n->D = e->D; - n->E = e->E; - n->child = e->child; - - n->bbox.parent = n; - Entity_CalcBBox(n); - - // Call the copy event - if (n->oncopy) { - n->oncopy(n); - } - - return (n); -} - -///////////////////////////// -// Entity_CalcBBox -// -// -#define BBox_ExtraMargin 10 -#define max(a, b) ((a) > (b) ? (a) : (b)) -void Entity_CalcBBox(Entity e) { - float hHeight = (max(e->height, e->radius) / 2) + BBox_ExtraMargin; - float hWidth = (max(e->width, e->radius) / 2) + BBox_ExtraMargin; - if (e->vel[0] > 0) { - e->bbox.x2 = e->pos[0] + e->vel[0] + hWidth; - e->bbox.x1 = e->pos[0] - hWidth; - } else { - e->bbox.x1 = (e->pos[0] + e->vel[0]) - hWidth; - e->bbox.x2 = e->pos[0] + hWidth; - } - if (e->vel[1] > 0) { - e->bbox.y2 = e->pos[1] + e->vel[1] + hHeight; - e->bbox.y1 = e->pos[1] - hHeight; - } else { - e->bbox.y1 = (e->pos[1] + e->vel[1]) - hHeight; - e->bbox.y2 = e->pos[1] + hHeight; - } - e->bbox.changed = 1; -} - -///////////////////////////// -// Entity_BBoxIntersect -// -// -int Entity_BBoxIntersect(Entity ent1, Entity ent2) { - return BBox_Intersect(&ent1->bbox, &ent2->bbox); -} - -///////////////////////////// -// Entity_Draw -// -// -void Entity_Draw(Entity e, int x, int y, float f) { - vec2 fPos; - float scale[2]; - if (e->internalFlags & EntityIntFlag_UpdatedColor) { - Draw_SetColor( - e->color0[0] - f * (e->color0[0] - e->color[0]), - e->color0[1] - f * (e->color0[1] - e->color[1]), - e->color0[2] - f * (e->color0[2] - e->color[2]), - e->color0[3] - f * (e->color0[3] - e->color[3])); - } else { - Draw_SetColor(e->color[0], e->color[1], e->color[2], e->color[3]); - } - if (e->internalFlags & EntityIntFlag_UpdatedScale) { - scale[0] = e->scale0[0] - f * (e->scale0[0] - e->scale[0]); - scale[1] = e->scale0[1] - f * (e->scale0[1] - e->scale[1]); - } else { - scale[0] = e->scale[0]; - scale[1] = e->scale[1]; - } - if (e->internalFlags & EntityIntFlag_UpdatedPos) { - vec2_interpol(fPos, e->pos0, e->pos, f); - AnimPlay_Draw(&e->anim, (int)(fPos[0] + x), fPos[1] + y, scale); - } else { - AnimPlay_Draw(&e->anim, e->pos[0] + x, e->pos[1] + y, scale); - } -} - -///////////////////////////// -// Entity_IsVisible -// -// -int Entity_IsVisible(Entity e, int x, int y, int w, int h) { - int xmax, xmin; - int ymax, ymin; - int ih, iw; - - AnimPlay_GetSize(&e->anim, &iw, &ih); - - xmin = x - iw; - xmax = x + w + iw; - ymin = y - ih; - ymax = y + h + ih; - - if (e->pos[0] < xmin || e->pos[0] > xmax || e->pos[1] < ymin || e->pos[1] > ymax) { - return (0); - } - return (1); -} - -///////////////////////////// -// Entity_Process -// -// -void Entity_Process(Entity e, int ft) { - if (e->internalFlags & EntityIntFlag_UpdatedPos) { - vec2_copy(e->pos0, e->pos); - e->internalFlags &= ~EntityIntFlag_UpdatedPos; - } - - if (e->internalFlags & EntityIntFlag_UpdatedScale) { - e->scale0[0] = e->scale[0]; - e->scale0[1] = e->scale[1]; - e->internalFlags &= ~EntityIntFlag_UpdatedScale; - } - - if (e->internalFlags & EntityIntFlag_UpdatedColor) { - e->color0[0] = e->color[0]; - e->color0[1] = e->color[1]; - e->color0[2] = e->color[2]; - e->color0[3] = e->color[3]; - e->internalFlags &= ~EntityIntFlag_UpdatedColor; - } - - // Launch method - if (e->proc) { - e->proc(e, ft); - } -} - -///////////////////////////// -// Entity_PostProcess -// -// -void Entity_PostProcess(Entity e, int ft) { - float qlen, len; - - // Determine if there is movement - qlen = vec2_dot(e->vel, e->vel); - if (qlen > 0.0f) { - - // Update position - vec2_plus(e->pos, e->pos, e->vel); - - // Apply friction - len = sqrtf(qlen); - if (len < e->backFric_static) { - // Stopped by static friction - vec2_set(e->vel, 0, 0); - } else { - // Apply dynamic friction - vec2_scale(e->vel, e->vel, 1.0f - (e->backFric_dynamic + (e->backFric_static / len))); - } - - // Mark the update of the position. - vec2_copy(e->oldpos, e->pos); - e->internalFlags |= EntityIntFlag_UpdatedPos; - - Entity_CalcBBox(e); - } - - // Launch method - if (e->postproc) { - e->postproc(e, ft); - } - - // Animate - AnimPlay_IncTime(&e->anim, ft); -} - -///////////////////////////// -// CollisionInfo_New -// -// -CollisionInfo g_FreeCollisionInfo = NULL; -CollisionInfo CollisionInfo_New(int responseType, Entity ent1, Entity ent2, float t, const vec2 n, int applyFriction) { - CollisionInfo collInfo; - - if (!g_FreeCollisionInfo) { - collInfo = malloc(sizeof(TCollisionInfo)); - } else { - collInfo = g_FreeCollisionInfo; - g_FreeCollisionInfo = collInfo->next; - } - collInfo->next = NULL; - - collInfo->responseType = responseType; - collInfo->ent1 = ent1; - collInfo->ent2 = ent2; - collInfo->t = t; - vec2_copy(collInfo->n, n); - collInfo->applyFriction = applyFriction; - - return collInfo; -} - -///////////////////////////// -// CollisionInfo_Destroy -// -// -void CollisionInfo_Destroy(CollisionInfo *collInfoRef) { - if (collInfoRef == NULL || collInfoRef[0] == NULL) { - return; - } - - CollisionInfo collInfo = collInfoRef[0]; - CollisionInfo nextCollInfo; - while (collInfo != NULL) { - nextCollInfo = collInfo->next; - collInfo->next = g_FreeCollisionInfo; - g_FreeCollisionInfo = collInfo; - collInfo = nextCollInfo; - } - collInfoRef[0] = NULL; -} - -///////////////////////////// -// CollisionInfo_Add -// -// -void CollisionInfo_Add( - CollisionInfo *collInfoRef, int responseType, Entity ent1, Entity ent2, float t, vec2 n, int applyFriction) { - if (collInfoRef == NULL) { - return; - } - CollisionInfo prevCollInfo = NULL; - CollisionInfo collInfo = collInfoRef[0]; - CollisionInfo newCollInfo = CollisionInfo_New(responseType, ent1, ent2, t, n, applyFriction); - - while (collInfo != NULL && collInfo->t < t) { - prevCollInfo = collInfo; - collInfo = collInfo->next; - } - if (prevCollInfo == NULL) { - collInfoRef[0] = newCollInfo; - } else { - prevCollInfo->next = newCollInfo; - } - newCollInfo->next = collInfo; -} - -///////////////////////////// -// CollisionInfo_CheckRepetition -// -// -int CollisionInfo_CheckRepetition(CollisionInfo collInfo, Entity ent1, Entity ent2) { - while (collInfo != NULL) { - if ((collInfo->ent1 == ent1 && collInfo->ent2 == ent2) || (collInfo->ent1 == ent2 && collInfo->ent2 == ent1)) { - return (1); - } - collInfo = collInfo->next; - } - return (0); -} - -///////////////////////////// -// Entity_CheckCollisions -// -// -int Entity_CheckCollision(Entity ent1, Entity ent2, CollisionInfo *collInfoRef) { - float t; - vec2 n; - vec2 vel; - int flags = ent1->flags | ent2->flags; - - if (flags & EntityFlag_Block) { - // One of the entities is a block and none is a platform - Entity ent, ent_block; - float auxT, block_len; - vec2 auxN, p; - int applyFriction; - - // Decide who is the block and who is the ent - if (ent1->mass <= 0.0f && ent2->mass > 0.0f) { - ent = ent2; - ent_block = ent1; - } else if (ent2->mass <= 0.0f && ent1->mass > 0.0f) { - ent = ent1; - ent_block = ent2; - } else { - // Two static or two dinamic entities?!? - return (0); - } - - // Prepare some variables - t = 1.0f; - applyFriction = 1; - - if (flags & EntityFlag_BlockTop) { - vec2_set(auxN, 0, -1); - vec2_scaleadd(p, ent_block->pos, auxN, (ent->height + ent_block->height) / 2); - block_len = ent_block->width + ent->width; - if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len, &auxT)) { - if (auxT < t) { - vec2_copy(n, auxN); - t = auxT; - applyFriction = 1; - } - } - } - - if (flags & EntityFlag_BlockBottom) { - vec2_set(auxN, 0, 1); - vec2_scaleadd(p, ent_block->pos, auxN, (ent->height + ent_block->height) / 2); - block_len = ent_block->width + ent->width; - if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len, &auxT)) { - if (auxT < t) { - vec2_copy(n, auxN); - t = auxT; - applyFriction = 1; - } - } - } - - if (flags & EntityFlag_BlockRight) { - vec2_set(auxN, 1, 0); - vec2_scaleadd(p, ent_block->pos, auxN, (ent->width + ent_block->width) / 2); - block_len = ent_block->height + ent->height; - if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len, &auxT)) { - if (auxT < t) { - vec2_copy(n, auxN); - t = auxT; - applyFriction = 0; - } - } - } - - if (flags & EntityFlag_BlockLeft) { - vec2_set(auxN, -1, 0); - vec2_scaleadd(p, ent_block->pos, auxN, (ent->width + ent_block->width) / 2); - block_len = ent_block->height + ent->height; - if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len, &auxT)) { - if (auxT < t) { - vec2_copy(n, auxN); - t = auxT; - applyFriction = 0; - } - } - } - - if (t < 1.0f) { - CollisionInfo_Add(collInfoRef, CollisionResponse_Line, ent, ent_block, t, n, applyFriction); - return (1); - } - - return (0); - } - - // Circle-Circle test from ent1 - vec2_minus(vel, ent1->vel, ent2->vel); - if (Collision_CircleCircle(ent1->pos, ent1->radius, vel, ent2->pos, ent2->radius, &t, n)) { - CollisionInfo_Add(collInfoRef, CollisionResponse_Circle, ent1, ent2, t, n, 0); - return (1); - } - return (0); -} - -///////////////////////////// -// Entity_CollisionResponseCircle -// -// Normal response to a collision between circles. -void Entity_CollisionResponseCircle(Entity b1, Entity b2, float t, const vec2 n) { - float moment; - vec2 temp; - float elast; - - if (b1->mass > 0.0f && b2->mass > 0.0f) { - // Calculate elasticity - elast = (b1->mass * b1->elast + b2->mass * b2->elast) / (b1->mass + b2->mass); - - // Collision between two massed balls - moment = ((1.0f + elast) * b1->mass * b2->mass * (fabs(vec2_dot(b1->vel, n)) + fabs(vec2_dot(b2->vel, n)))) / - (b1->mass + b2->mass); - vec2_scale(temp, n, moment / b1->mass); - vec2_minus(b1->vel, b1->vel, temp); - Entity_CalcBBox(b1); - vec2_scale(temp, n, moment / b2->mass); - vec2_plus(b2->vel, b2->vel, temp); - Entity_CalcBBox(b2); - } else if (b1->mass > 0.0f && b2->mass <= 0.0f) { - // Collision between a massed ball and a fixed ball - moment = (1.0f + b1->elast) * (vec2_dot(b1->vel, n)); - vec2_scale(temp, n, moment); - vec2_minus(b1->vel, b1->vel, temp); - Entity_CalcBBox(b1); - } else if (b1->mass <= 0.0f && b2->mass > 0.0f) { - // Collision between a massed ball and a fixed ball - // (imposible, but better safe) - moment = (1.0f + b2->elast) * (vec2_dot(b2->vel, n)); - vec2_scale(temp, n, moment); - vec2_plus(b2->vel, b2->vel, temp); - Entity_CalcBBox(b2); - } else { - // Collision between 2 fixed balls - // (imposible, but better safe) - vec2_set(b1->vel, 0, 0); - Entity_CalcBBox(b1); - vec2_set(b2->vel, 0, 0); - Entity_CalcBBox(b2); - } -} - -///////////////////////////// -// Entity_CollisionResponseLine -// -// Normal response to a collision with a line. -void Entity_CollisionResponseLine(Entity ent, Entity ent2, float t, vec2 norm, int applyFriction) { - vec2 pos2, vel2, velFric, intersection; - float dist, fric_static, fric_dynamic, fricLen; - - // Calculate end position - vec2_scale(vel2, ent->vel, 1.0f - t); - dist = -vec2_dot(norm, vel2); - vec2_plus(pos2, ent->pos, ent->vel); - vec2_scaleadd(pos2, pos2, norm, dist); - - // Calculate intersection - vec2_scaleadd(intersection, ent->pos, ent->vel, t); - - if (applyFriction) { - // Calculate friction - fric_static = (ent->fric_static + ent2->fric_static) / 2; - fric_dynamic = (ent->fric_dynamic + ent2->fric_dynamic) / 2; - - // Apply friction - vec2_minus(velFric, pos2, intersection); - fricLen = sqrtf(vec2_dot(velFric, velFric)); - if (fricLen < fric_static) { - // Apply static friction - vec2_copy(pos2, intersection); - } else { - // Apply dynamic friction - if (fricLen > 0.0f) { - vec2_scaleadd(pos2, intersection, velFric, 1.0f - (fric_dynamic + (fric_static / fricLen))); - } else { - vec2_scaleadd(pos2, intersection, velFric, 1.0f - fric_dynamic); - } - } - } - - // Apply to velocity - vec2_scaleadd(pos2, pos2, norm, 0.1f); - vec2_minus(ent->vel, pos2, ent->pos); - - Entity_CalcBBox(ent); -} - -///////////////////////////// -// Entity_CollisionInfoResponse -// -// -int Entity_CollisionInfoResponse(CollisionInfo collInfo) { - while (collInfo != NULL) { - // Handle colision - int response = 1; - int rc; - vec2 n1; - vec2 n2; - vec2_copy(n1, collInfo->n); - vec2_scale(n2, collInfo->n, -1.0f); - - // Check the collision methods - if (collInfo->ent1->collision) { - rc = collInfo->ent1->collision(collInfo->ent1, collInfo->ent2, collInfo->t, n1); - if (rc == 0) - response = 0; - if (rc > 1) - response = 2; - } - if (collInfo->ent2->collision) { - rc = collInfo->ent2->collision(collInfo->ent2, collInfo->ent1, collInfo->t, n2); - if (rc == 0) - response = 0; - if (rc > 1) - response = 2; - } - - // Collision response - if (response == 1) { - if (collInfo->responseType == CollisionResponse_Line) { - Entity_CollisionResponseLine( - collInfo->ent1, collInfo->ent2, collInfo->t, collInfo->n, collInfo->applyFriction); - } else if (collInfo->responseType == CollisionResponse_Circle) { - if (vec2_dot(collInfo->ent1->vel, collInfo->ent1->vel) > - vec2_dot(collInfo->ent2->vel, collInfo->ent2->vel)) { - Entity_CollisionResponseCircle(collInfo->ent1, collInfo->ent2, collInfo->t, n2); - } else { - Entity_CollisionResponseCircle(collInfo->ent2, collInfo->ent1, collInfo->t, n1); - } - } - return (1); - } - if (response == 2) { - return (1); - } - - collInfo = collInfo->next; - } - return (0); -} - -///////////////////////////// -// Entity_Overlaps -// -// -void Entity_Overlaps(Entity b1, Entity b2) { - vec2 len; - - vec2_minus(len, b1->pos, b2->pos); - - vec2_set(len, fabs(b1->pos[0] - b2->pos[0]), fabs(b1->pos[1] - b2->pos[1])); - if (b1->overlap) { - if (len[0] <= b1->radius && len[1] <= b1->radius) { - b1->overlap(b1, b2); - } - } - if (b2->overlap) { - if (len[0] <= b2->radius && len[1] <= b2->radius) { - b2->overlap(b2, b1); - } - } -} - -///////////////////////////// -// Entity_GetPos -// -// -void Entity_GetPos(Entity e, vec2 pos) { vec2_copy(pos, e->pos); } - -///////////////////////////// -// Entity_SetPos -// -// -void Entity_SetPos(Entity e, const vec2 pos) { - vec2_copy(e->pos, pos); - vec2_copy(e->oldpos, pos); - vec2_copy(e->pos0, pos); - Entity_CalcBBox(e); -} - -///////////////////////////// -// Entity_AddPos -// -// -void Entity_AddPos(Entity e, const vec2 pos) { - vec2_plus(e->pos, e->pos, pos); - vec2_copy(e->oldpos, e->pos); - vec2_copy(e->pos0, e->pos); - Entity_CalcBBox(e); -} - -///////////////////////////// -// Entity_UpdatePos -// -// -void Entity_UpdatePos(Entity e, const vec2 pos) { - - // Mark the update of the position. - vec2_copy(e->oldpos, e->pos); - e->internalFlags |= EntityIntFlag_UpdatedPos; - - vec2_copy(e->pos, pos); -} - -///////////////////////////// -// Entity_AddVel -// -void Entity_AddVel(Entity e, const vec2 vel) { - vec2_plus(e->vel, e->vel, vel); - Entity_CalcBBox(e); -} - -///////////////////////////// -// Entity_SetVel -// -void Entity_SetVel(Entity e, const vec2 vel) { - vec2_copy(e->vel, vel); - Entity_CalcBBox(e); -} - -///////////////////////////// -// Entity_SetVelH -// -void Entity_SetVelH(Entity e, float v) { - e->vel[0] = v; - Entity_CalcBBox(e); -} - -///////////////////////////// -// Entity_SetVelV -// -void Entity_SetVelV(Entity e, float v) { - e->vel[1] = v; - Entity_CalcBBox(e); -} - -///////////////////////////// -// Entity_AddVelLimit -// -// -void Entity_AddVelLimit(Entity e, const vec2 vel, float limit) { - float vlen_orig, vlen; - vec2 dir, vel_temp; - - // Normalize vel getting vel - vlen_orig = sqrtf(vec2_dot(vel, vel)); - vec2_scale(dir, vel, 1.0f / vlen_orig); - - // Limit velocity - vlen = vec2_dot(e->vel, dir); - if (vlen < limit) { - vlen = limit - vlen; - if (vlen > vlen_orig) { - vlen = vlen_orig; - } - vec2_scale(vel_temp, dir, vlen); - vec2_plus(e->vel, e->vel, vel_temp); - } - Entity_CalcBBox(e); -} - -///////////////////////////// -// Entity_AddVelLimitH -// -void Entity_AddVelLimitH(Entity e, float v, float limit) { - e->vel[0] += v; - if (e->vel[0] > 0.0f) { - if (e->vel[0] > limit) { - e->vel[0] = limit; - } - } else { - if (e->vel[0] < -limit) { - e->vel[0] = -limit; - } - } - Entity_CalcBBox(e); -} - -///////////////////////////// -// Entity_AddVelLimitH -// -void Entity_AddVelLimitV(Entity e, float v, float limit) { - e->vel[1] += v; - if (e->vel[1] > 0.0f) { - if (e->vel[1] > limit) { - e->vel[1] = limit; - } - } else { - if (e->vel[1] < -limit) { - e->vel[1] = -limit; - } - } - Entity_CalcBBox(e); -} - -///////////////////////////// -// Entity_SetColor -// -// -void Entity_SetColor(Entity e, float r, float g, float b, float a) { - e->color[0] = r; - e->color[1] = g; - e->color[2] = b; - e->color[3] = a; - e->color0[0] = r; - e->color0[1] = g; - e->color0[2] = b; - e->color0[3] = a; - e->internalFlags &= ~EntityIntFlag_UpdatedColor; -} - -///////////////////////////// -// Entity_AddColor -// -// -void Entity_AddColor(Entity e, float r, float g, float b, float a) { - e->color[0] += r; - if (e->color[0] > 1.0f) - e->color[0] = 1.0f; - e->color[1] += g; - if (e->color[1] > 1.0f) - e->color[1] = 1.0f; - e->color[2] += b; - if (e->color[2] > 1.0f) - e->color[2] = 1.0f; - e->color[3] += a; - if (e->color[3] > 1.0f) - e->color[3] = 1.0f; - e->internalFlags |= EntityIntFlag_UpdatedColor; -} - -///////////////////////////// -// Entity_MultColor -// -// -void Entity_MultColor(Entity e, float r, float g, float b, float a) { - e->color[0] *= r; - e->color[1] *= g; - e->color[2] *= b; - e->color[3] *= a; - e->internalFlags |= EntityIntFlag_UpdatedColor; -} - -///////////////////////////// -// Entity_SetLight -// -// -void Entity_SetLight(Entity e, float r, float g, float b, float rad) { - e->light[0] = r; - e->light[1] = g; - e->light[2] = b; - e->light[3] = rad; - - if (!(e->flags & EntityFlag_Light)) { - e->internalFlags |= EntityIntFlag_UpdateLight; - } -} - -///////////////////////////// -// Entity_SetDefaultColor -// -// -void Entity_SetDefaultColor(Entity e, float r, float g, float b, float a) { - e->defaultColor[0] = r; - e->defaultColor[1] = g; - e->defaultColor[2] = b; - e->defaultColor[3] = a; -} - -///////////////////////////// -// Entity_SetScale -// -void Entity_SetScale(Entity e, const float scale[2]) { - e->scale[0] = scale[0]; - e->scale[1] = scale[1]; - e->internalFlags |= EntityIntFlag_UpdatedScale; -} - -///////////////////////////// -// Entity_GetScale -// -void Entity_GetScale(Entity e, float scale[2]) { - scale[0] = e->scale[0]; - scale[1] = e->scale[1]; -} - -///////////////////////////// -// Entity_Iluminate -// -// -void Entity_Iluminate(Entity e, Entity *entityList, int n) { - int i; - vec2 vdist; - float qdist, f; - float qrad; - - if (e->flags & EntityFlag_Light) { - Entity_SetColor(e, e->defaultColor[0], e->defaultColor[1], e->defaultColor[2], e->defaultColor[3]); - return; - } - - e->color[0] = e->light[0]; - e->color[1] = e->light[1]; - e->color[2] = e->light[2]; - - e->color[3] = e->color[3]; - - for (i = 0; i < n; i++) { - if (e == entityList[i] || !(entityList[i]->flags & EntityFlag_Light)) { - continue; - } - - vec2_minus(vdist, e->pos, entityList[i]->pos); - qdist = vec2_dot(vdist, vdist); - qrad = entityList[i]->light[3] * entityList[i]->light[3]; - if (qdist < qrad) { - f = 1.0f - qdist / qrad; - Entity_AddColor( - e, f * entityList[i]->light[0], f * entityList[i]->light[1], f * entityList[i]->light[2], 0.0f); - } - } - - Entity_MultColor(e, e->defaultColor[0], e->defaultColor[1], e->defaultColor[2], e->defaultColor[3]); - e->internalFlags &= ~EntityIntFlag_UpdateLight; - - if (e->internalFlags & EntityIntFlag_UpdateColor) { - e->color0[0] = e->color[0]; - e->color0[1] = e->color[1]; - e->color0[2] = e->color[2]; - e->color0[3] = e->color[3]; - e->internalFlags &= ~EntityIntFlag_UpdateColor; - } -} - -///////////////////////////// -// Entity_MarkUpdateLight -// -// -void Entity_MarkUpdateLight(Entity e, Entity *elist, int n) { - if (e->flags & EntityFlag_Light) { - int i; - vec2 max, min; - - if (e->pos0[0] < e->oldpos[0]) { - min[0] = e->pos0[0] - e->light[3]; - max[0] = e->oldpos[0] + e->light[3]; - } else { - min[0] = e->oldpos[0] - e->light[3]; - max[0] = e->pos0[0] + e->light[3]; - } - if (e->pos0[1] < e->oldpos[1]) { - min[1] = e->pos0[1] - e->light[3]; - max[1] = e->oldpos[1] + e->light[3]; - } else { - min[1] = e->oldpos[1] - e->light[3]; - max[1] = e->pos0[1] + e->light[3]; - } - for (i = 0; i < n; i++) { - if (elist[i] != NULL && min[0] <= elist[i]->pos0[0] && max[0] >= elist[i]->pos0[0] && - min[1] <= elist[i]->pos0[1] && max[1] >= elist[i]->pos0[1]) { - elist[i]->internalFlags |= EntityIntFlag_UpdateLight; - } - } - } else { - e->internalFlags |= EntityIntFlag_UpdateLight; - } -} - -///////////////////////////// -// Entity_IsLight -// -int Entity_IsLight(Entity e) { return (e->flags & EntityFlag_Light); } - -///////////////////////////// -// Entity_IsUpdateLight -// -int Entity_IsUpdateLight(Entity e) { return (e->internalFlags & EntityIntFlag_UpdateLight); } - -///////////////////////////// -// Entity_IsMoving -// -int Entity_IsMoving(Entity e) { return (e->internalFlags & EntityIntFlag_UpdatedPos); } diff --git a/src/Entity.h b/src/Entity.h deleted file mode 100644 index 4231cbe..0000000 --- a/src/Entity.h +++ /dev/null @@ -1,286 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef Entity_H -#define Entity_H - -#include "Anim.h" -#include "Bucket.h" -#include "Draw.h" -#include "Util.h" - -//////////////////////////////////////////////// -// Entity -// -#define EntityFlag_Collision 0x00000001 -#define EntityFlag_Overlap 0x00000002 -#define EntityFlag_Light 0x00000004 -#define EntityFlag_BlockTop 0x00000100 -#define EntityFlag_BlockRight 0x00000200 -#define EntityFlag_BlockBottom 0x00000400 -#define EntityFlag_BlockLeft 0x00000800 -#define EntityFlag_Block 0x0000FF00 -#define EntityFlag_PlatformCollision 0x00000101 -#define EntityFlag_BlockCollision 0x0000FF01 - -typedef struct TEntity TEntity, *Entity; -struct TEntity { - Entity base; - - int type; - vec2 oldpos; - vec2 pos0; - vec2 pos; - int flags; - int internalFlags; - int zorder; - float sortYOffset; - - vec2 dir; - - vec2 vel; - vec2 bod_offset; - float radius; - float width; - float height; - float mass; - float elast; - float backFric_static; - float backFric_dynamic; - float fric_static; - float fric_dynamic; - - AnimPlay anim; - - float color0[4]; - float color[4]; - - float light[4]; - float defaultColor[4]; - - float scale0[2]; - float scale[2]; - - void (*oncopy)(Entity ent); - void (*oninit)(Entity ent); - void (*ondelete)(Entity ent); - void (*proc)(Entity ent, int ft); - void (*postproc)(Entity ent, int ft); - int (*collision)(Entity ent, Entity ent2, float t, vec2 n); - void (*overlap)(Entity ent, Entity ent2); - - int A; - int B; - int C; - int D; - int E; - vec2 VecA; - vec2 VecB; - Entity child; - - TBBox bbox; - - Entity next; -}; - -///////////////////////////// -// Entity_GetFree -// -Entity Entity_GetFree(); - -///////////////////////////// -// Entity_New -// -Entity Entity_New(); - -///////////////////////////// -// Entity_Init -// -Entity Entity_Init(Entity e); - -///////////////////////////// -// Entity_Destroy -// -void Entity_Destroy(Entity e); - -///////////////////////////// -// Entity_Copy -// -Entity Entity_Copy(Entity e); - -///////////////////////////// -// Entity_CalcBBox -// -// -void Entity_CalcBBox(Entity e); - -///////////////////////////// -// Entity_BBoxIntersect -// -// -int Entity_BBoxIntersect(Entity ent1, Entity ent2); - -///////////////////////////// -// Entity_Draw -// -void Entity_Draw(Entity e, int x, int y, float f); - -///////////////////////////// -// Entity_IsVisible -// -int Entity_IsVisible(Entity e, int x, int y, int w, int h); - -///////////////////////////// -// Entity_Process -// -void Entity_Process(Entity e, int ft); - -///////////////////////////// -// Entity_PostProcess -// -void Entity_PostProcess(Entity e, int ft); - -//////////////////////////////////////////////// -// CollisionInfo -// -#define CollisionResponse_Circle 1 -#define CollisionResponse_Line 2 -typedef struct TCollisionInfo TCollisionInfo, *CollisionInfo; -struct TCollisionInfo { - int responseType; - Entity ent1; - Entity ent2; - float t; - vec2 n; - int applyFriction; - - CollisionInfo next; -}; - -///////////////////////////// -// CollisionInfo_New -// -// -CollisionInfo CollisionInfo_New(int responseType, Entity ent1, Entity ent2, float t, const vec2 n, int applyFriction); - -///////////////////////////// -// CollisionInfo_Destroy -// -// -void CollisionInfo_Destroy(CollisionInfo *collInfoRef); - -///////////////////////////// -// CollisionInfo_Add -// -// -void CollisionInfo_Add( - CollisionInfo *collInfo, int responseType, Entity ent1, Entity ent2, float t, vec2 n, int applyFriction); - -///////////////////////////// -// CollisionInfo_CheckRepetition -// -// -int CollisionInfo_CheckRepetition(CollisionInfo collInfo, Entity ent1, Entity ent2); - -///////////////////////////// -// Entity_CheckCollision -// -// -int Entity_CheckCollision(Entity ent1, Entity ent2, CollisionInfo *collInfoRef); - -///////////////////////////// -// Entity_CollisionResponseClircle -// -// Normal response to a collision of spheres. -void Entity_CollisionResponseCircle(Entity b1, Entity b2, float t, const vec2 n); - -///////////////////////////// -// Entity_CollisionResponseLine -// -// Normal response to a collision with a line. -void Entity_CollisionResponseLine(Entity ent, Entity ent2, float t, vec2 n, int applyFriction); - -///////////////////////////// -// Entity_CollisionInfoResponse -// -// -int Entity_CollisionInfoResponse(CollisionInfo collInfo); - -///////////////////////////// -// Entity_Overlaps -// -void Entity_Overlaps(Entity b1, Entity b2); - -///////////////////////////// -// Entity_GetPos -// Entity_SetPos -// Entity_AddPos -// Entity_UpdatePos -// -void Entity_GetPos(Entity e, vec2 pos); -void Entity_SetPos(Entity e, const vec2 pos); -void Entity_AddPos(Entity e, const vec2 pos); -void Entity_UpdatePos(Entity e, const vec2 pos); - -///////////////////////////// -// Entity_AddVel -// Entity_SetVel -// Entity_SetVelH -// Entity_SetVelV -// Entity_AddVelLimit -// Entity_AddVelLimitH -// Entity_AddVelLimitH -// -void Entity_AddVel(Entity e, const vec2 vel); -void Entity_SetVel(Entity e, const vec2 vel); -void Entity_SetVelH(Entity e, float v); -void Entity_SetVelV(Entity e, float v); -void Entity_AddVelLimit(Entity e, const vec2 vel, float limit); -void Entity_AddVelLimitH(Entity e, float v, float limit); -void Entity_AddVelLimitV(Entity e, float v, float limit); - -///////////////////////////// -// Entity_SetColor -// Entity_AddColor -// Entity_MultColor -// Entity_AddColor -// Entity_SetDefaultColor -// -void Entity_SetColor(Entity e, float r, float g, float b, float a); -void Entity_AddColor(Entity e, float r, float g, float b, float a); -void Entity_MultColor(Entity e, float r, float g, float b, float a); -void Entity_SetLight(Entity e, float r, float g, float b, float rad); -void Entity_SetDefaultColor(Entity e, float r, float g, float b, float a); - -///////////////////////////// -// Entity_SetScale -// Entity_GetScale -// -void Entity_SetScale(Entity e, const float scale[2]); -void Entity_GetScale(Entity e, float scale[2]); - -///////////////////////////// -// Entity_Iluminate -// -void Entity_Iluminate(Entity e, Entity *entityList, int n); - -///////////////////////////// -// Entity_MarkUpdateLight -// -void Entity_MarkUpdateLight(Entity e, Entity *elist, int n); - -///////////////////////////// -// Entity_IsLight -// -int Entity_IsLight(Entity e); - -///////////////////////////// -// Entity_IsUpdateLight -// -int Entity_IsUpdateLight(Entity e); - -///////////////////////////// -// Entity_IsMoving -// -int Entity_IsMoving(Entity e); - -#endif diff --git a/src/FontData.h b/src/FontData.h deleted file mode 100644 index 59fe67d..0000000 --- a/src/FontData.h +++ /dev/null @@ -1,260 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -static uint8_t fontData_8x8[2048] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x10, 0x38, 0x7c, 0xfe, 0x00, 0x00, // - 0x00, 0x00, 0xfe, 0x7c, 0x38, 0x10, 0x00, 0x00, // - 0x20, 0x30, 0x38, 0x3c, 0x38, 0x30, 0x20, 0x00, // - 0x04, 0x0c, 0x1c, 0x3c, 0x1c, 0x0c, 0x04, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x00, // - 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x6c, 0x6c, 0xfe, 0x6c, 0xfe, 0x6c, 0x6c, 0x00, // - 0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00, // - 0x00, 0xc6, 0xcc, 0x18, 0x30, 0x66, 0xc6, 0x00, // - 0x38, 0x6c, 0x38, 0x76, 0xdc, 0xcc, 0x76, 0x00, // - 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00, // - 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, // - 0x00, 0x6c, 0x38, 0xfe, 0x38, 0x6c, 0x00, 0x00, // - 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, // - 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, // - 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, // - 0x3c, 0x66, 0x6e, 0x76, 0x66, 0x3c, 0x00, 0x00, // - 0x18, 0x38, 0x78, 0x18, 0x18, 0x18, 0x00, 0x00, // - 0x3c, 0x66, 0x06, 0x1c, 0x30, 0x7e, 0x00, 0x00, // - 0x3c, 0x66, 0x0c, 0x06, 0x66, 0x3c, 0x00, 0x00, // - 0x1c, 0x3c, 0x6c, 0xcc, 0xfe, 0x0c, 0x00, 0x00, // - 0x7e, 0x60, 0x7c, 0x06, 0x66, 0x3c, 0x00, 0x00, // - 0x1c, 0x30, 0x60, 0x7c, 0x66, 0x3c, 0x00, 0x00, // - 0x7e, 0x06, 0x06, 0x0c, 0x18, 0x18, 0x00, 0x00, // - 0x3c, 0x66, 0x3c, 0x66, 0x66, 0x3c, 0x00, 0x00, // - 0x3c, 0x66, 0x3e, 0x06, 0x0c, 0x38, 0x00, 0x00, // - 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, // - 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x30, 0x00, // - 0x00, 0x06, 0x18, 0x60, 0x18, 0x06, 0x00, 0x00, // - 0x00, 0x00, 0x7e, 0x00, 0x7e, 0x00, 0x00, 0x00, // - 0x00, 0x60, 0x18, 0x06, 0x18, 0x60, 0x00, 0x00, // - 0x3c, 0x66, 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00, // - 0x3c, 0x66, 0x5a, 0x5a, 0x5e, 0x60, 0x3c, 0x00, // - 0x3c, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x00, 0x00, // - 0x7c, 0x66, 0x7c, 0x66, 0x66, 0x7c, 0x00, 0x00, // - 0x3c, 0x60, 0x60, 0x60, 0x60, 0x3c, 0x00, 0x00, // - 0x78, 0x6c, 0x66, 0x66, 0x6c, 0x78, 0x00, 0x00, // - 0x7e, 0x60, 0x78, 0x60, 0x60, 0x7e, 0x00, 0x00, // - 0x7e, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00, 0x00, // - 0x3c, 0x66, 0x60, 0x6e, 0x66, 0x3e, 0x00, 0x00, // - 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 0x00, // - 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, // - 0x06, 0x06, 0x06, 0x06, 0x66, 0x3c, 0x00, 0x00, // - 0xc6, 0xcc, 0xd8, 0xf8, 0xcc, 0xc6, 0x00, 0x00, // - 0x60, 0x60, 0x60, 0x60, 0x60, 0x7c, 0x00, 0x00, // - 0xc6, 0xee, 0xfe, 0xd6, 0xc6, 0xc6, 0x00, 0x00, // - 0xc6, 0xe6, 0xf6, 0xde, 0xce, 0xc6, 0x00, 0x00, // - 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, // - 0xfc, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0, 0x00, 0x00, // - 0x78, 0xcc, 0xcc, 0xcc, 0xdc, 0x7e, 0x00, 0x00, // - 0x7c, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x00, 0x00, // - 0x7c, 0xc6, 0x70, 0x1c, 0xc6, 0x7c, 0x00, 0x00, // - 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, // - 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, // - 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, // - 0xc6, 0xc6, 0xd6, 0xfe, 0xee, 0xc6, 0x00, 0x00, // - 0xc6, 0x6c, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, // - 0xc6, 0x6c, 0x38, 0x30, 0x30, 0x30, 0x00, 0x00, // - 0xfe, 0x0c, 0x18, 0x30, 0x60, 0xfe, 0x00, 0x00, // - 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c, 0x00, // - 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x02, 0x00, // - 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c, 0x00, // - 0x18, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, // - 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 0x00, // - 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00, 0x00, // - 0x00, 0x3c, 0x60, 0x60, 0x60, 0x3c, 0x00, 0x00, // - 0x06, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00, 0x00, // - 0x00, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 0x00, // - 0x1c, 0x30, 0x7c, 0x30, 0x30, 0x30, 0x00, 0x00, // - 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x3c, 0x00, // - 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x00, 0x00, // - 0x30, 0x00, 0x30, 0x30, 0x30, 0x18, 0x00, 0x00, // - 0x0c, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x78, 0x00, // - 0x60, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0x00, 0x00, // - 0x18, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x00, 0x00, // - 0x00, 0xec, 0xfe, 0xd6, 0xc6, 0xc6, 0x00, 0x00, // - 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, // - 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, // - 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x00, // - 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x00, // - 0x00, 0x7c, 0x66, 0x60, 0x60, 0x60, 0x00, 0x00, // - 0x00, 0x3c, 0x60, 0x3c, 0x06, 0x7c, 0x00, 0x00, // - 0x30, 0x30, 0x7c, 0x30, 0x30, 0x1c, 0x00, 0x00, // - 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, // - 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, // - 0x00, 0xc6, 0xc6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, // - 0x00, 0xcc, 0x78, 0x30, 0x78, 0xcc, 0x00, 0x00, // - 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x30, 0x00, // - 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00, 0x00, // - 0x0c, 0x18, 0x18, 0x30, 0x18, 0x18, 0x0c, 0x00, // - 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, // - 0x30, 0x18, 0x18, 0x0c, 0x18, 0x18, 0x30, 0x00, // - 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // -}; diff --git a/src/GameLib.c b/src/GameLib.c deleted file mode 100644 index b9212b2..0000000 --- a/src/GameLib.c +++ /dev/null @@ -1,808 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#include -#include -#include -#include -#include - -#include "GameLib.h" - -#include - -// Globals -Entity *g_Entity = NULL; -int *g_EntityFlag = NULL; -int g_NumEntities = 0; -int g_NumEntitiesAllocated = 0; -int g_EntitiesLock = 0; -int g_EntitiesCompactate = 0; -void (*g_GameProcFunc)() = NULL; -void (*g_GamePostProcFunc)() = NULL; -void (*g_GamePreDrawFunc)(float f) = NULL; -void (*g_GameDrawFunc)(float f) = NULL; -int g_ProcFt; -int g_GameSize[2]; -int g_GamePos0[2]; -int g_GamePos1[2]; -int g_GamePosOffset[2]; - -long long t_proc; -long long t_col; -long long t_over; -long long t_postproc; -long long t_draw; -int fproc_count; -int fdraw_count; - -typedef struct TParallaxBackground TParallaxBackground, *ParallaxBackground; -struct TParallaxBackground { - DrawImg img; - int imgSize[2]; - int imgOffset[2]; - float parallaxFactor[2]; -}; -#define MaxParallaxBackgrounds 10 -TParallaxBackground g_ParallaxBackground[MaxParallaxBackgrounds]; -int g_NumParallaxBackgrounds = 0; - -TBucketGrid g_BucketGrid; - -///////////////////////////// -// GameLib_Init -// -// Initializes the game. -int GameLib_Init(int w, int h, char *title, int pFps, int fps) { - if (!Draw_Init(w, h, title, pFps, fps)) { - return (0); - } - if (!Input_Init()) { - return (0); - } - Audio_Init(); - - g_GameSize[0] = w; - g_GameSize[1] = h; - g_GamePos0[0] = 0; - g_GamePos0[1] = 0; - g_GamePos1[0] = 0; - g_GamePos1[1] = 0; - - g_ProcFt = 1000 / pFps; - - BucketGrid_Init(&g_BucketGrid, 1, 1, 64, 32, 32); - - return (1); -} - -///////////////////////////// -// GameLib_PrepareSize -// -// -void GameLib_PrepareSize(const float x1, const float y1, const float x2, const float y2) { - const float bucketSize = 64; - - const float width = x2 - x1; - const float height = y2 - y1; - const int widthBuckets = (int)ceilf(width / bucketSize); - const int heightBuckets = (int)ceilf(height / bucketSize); - - BucketGrid_DeInit(&g_BucketGrid); - BucketGrid_Init(&g_BucketGrid, widthBuckets, heightBuckets, bucketSize, -x1, -y1); - for (int i = 0; i < g_NumEntities; i++) { - BucketGrid_AddItem(&g_BucketGrid, &g_Entity[i]->bbox); - } -} - -///////////////////////////// -// GameLib_CheckSize -// -// -void GameLib_CheckSize() { - float xMin = FLT_MAX; - float yMin = FLT_MAX; - float xMax = FLT_MIN; - float yMax = FLT_MIN; - for (int i = 0; i < g_NumEntities; i++) { - if (g_Entity[i]->bbox.x1 < xMin) - xMin = g_Entity[i]->bbox.x1; - if (g_Entity[i]->bbox.x2 > xMax) - xMax = g_Entity[i]->bbox.x2; - if (g_Entity[i]->bbox.y1 < yMin) - yMin = g_Entity[i]->bbox.y1; - if (g_Entity[i]->bbox.y2 > yMax) - yMax = g_Entity[i]->bbox.y2; - } - GameLib_PrepareSize(xMin, yMin, xMax, yMax); -} - -///////////////////////////// -// GameLib_AddEntity -// -// Adds an entity to the game. -void GameLib_AddEntity(Entity e) { - // Avoid duplications - for (int i = 0; i < g_NumEntities; i++) { - if (g_Entity[i] == e) { - return; - } - } - - if (g_NumEntities >= g_NumEntitiesAllocated) { - Entity *entity_aux; - int *entity_flag_aux; - int i; - - // Grow the array - if (g_NumEntitiesAllocated == 0) { - g_NumEntitiesAllocated = 32; - } else { - g_NumEntitiesAllocated *= 2; - } - entity_aux = malloc(sizeof(Entity) * g_NumEntitiesAllocated); - entity_flag_aux = malloc(sizeof(int) * g_NumEntitiesAllocated); - for (i = 0; i < g_NumEntities; i++) { - entity_aux[i] = g_Entity[i]; - entity_flag_aux[i] = g_EntityFlag[i]; - } - if (g_Entity) { - free(g_Entity); - free(g_EntityFlag); - } - g_Entity = entity_aux; - g_EntityFlag = entity_flag_aux; - } - - // Add the entity - g_Entity[g_NumEntities] = e; - g_EntityFlag[g_NumEntities] = 1; - g_NumEntities++; - - // Mark for light update - Entity_MarkUpdateLight(e, g_Entity, g_NumEntities); - - Entity_CalcBBox(e); - if (BucketGrid_AddItem(&g_BucketGrid, &e->bbox) == 0) { - GameLib_CheckSize(); - } - - Entity_Init(e); -} - -///////////////////////////// -// GameLib_RemoveEntity -// -// removes the entity. -int GameLib_RemoveEntity(Entity e) { - int i; - for (i = 0; i < g_NumEntities; i++) { - if (e == g_Entity[i]) { - // Mark to forget - g_EntityFlag[i] = -2; - g_EntitiesCompactate = 1; - return (i); - } - } - return (-1); -} - -///////////////////////////// -// GameLib_UnrefEntity -// -// removes the reference to the entity. -int GameLib_UnrefEntity(Entity e) { - int i; - for (i = 0; i < g_NumEntities; i++) { - if (e == g_Entity[i]) { - // Mark or unref - if (g_EntitiesLock) { - g_EntityFlag[i] = -2; - } else { - g_Entity[i] = NULL; - g_EntityFlag[i] = 0; - } - g_EntitiesCompactate = 1; - - // Mark for light update - Entity_MarkUpdateLight(e, g_Entity, g_NumEntities); - return (i); - } - } - return (-1); -} - -///////////////////////////// -// GameLib_DelEntity -// -// Adds an entity to the game. -int GameLib_DelEntity(Entity e) { - int i; - if ((i = GameLib_UnrefEntity(e)) == -1) { - return (0); - } - if (g_EntitiesLock) { - // Delete latter - g_Entity[i] = e; - g_EntityFlag[i] = -1; - } else { - // Delete now - BucketGrid_RemoveItem(&g_BucketGrid, &g_Entity[i]->bbox); - Entity_Destroy(e); - } - return (1); -} - -///////////////////////////// -// GameLib_Compactate -// -// -void GameLib_Compactate() { - int i, j; - j = 0; - if (!g_EntitiesCompactate) { - return; - } - for (i = 0; i < g_NumEntities; i++) { - if (!g_Entity[i] || g_EntityFlag[i] == -2) { - continue; - } - if (g_EntityFlag[i] == -1) { - BucketGrid_RemoveItem(&g_BucketGrid, &g_Entity[i]->bbox); - Entity_Destroy(g_Entity[i]); - continue; - } - if (i > j) { - g_Entity[j] = g_Entity[i]; - g_EntityFlag[j] = g_EntityFlag[i]; - } - j++; - } - g_NumEntities = j; - g_EntitiesCompactate = 0; -} - -///////////////////////////// -// GameLib_ProcLoop -// -// Process the loop. -void GameLib_ProcLoop(void *data) { - int i, j; - int repeat; - long long time; - - // Step the gamePosition - g_GamePos0[0] = g_GamePos1[0] + g_GamePosOffset[0]; - g_GamePos0[1] = g_GamePos1[1] + g_GamePosOffset[1]; - - // Process - time = Time_GetTime(); - g_EntitiesLock = 1; - if (g_GameProcFunc) { - g_GameProcFunc(); - } - for (i = 0; i < g_NumEntities; i++) { - if (!g_Entity[i]) { - continue; - } - Entity_Process(g_Entity[i], g_ProcFt); - } - GameLib_Compactate(); - g_EntitiesLock = 0; - - if (BucketGrid_ProcessChanged(&g_BucketGrid) == 0) { - Print("Rebuild BucketGrid"); - BucketGrid_Clean(&g_BucketGrid); - for (int i = 0; i < g_NumEntities; i++) { - BucketGrid_AddItem(&g_BucketGrid, &g_Entity[i]->bbox); - } - } - - t_proc += Time_GetTime() - time; - - // Collisions between entities - time = Time_GetTime(); - g_EntitiesLock = 1; - int count = 0; - int maxCount = 50; - do { - repeat = 0; - CollisionInfo collInfo = NULL; - for (i = 0; i < g_NumEntities; i++) { - Entity ent = g_Entity[i]; - if (!(ent->flags & EntityFlag_Collision) || ent->mass < 0.0f) { - continue; - } - if (ent->vel[0] <= 0.0f && ent->vel[0] >= -0.0f && ent->vel[1] <= 0.0f && ent->vel[1] >= -0.0f) { - continue; - } - TBucket bucket; - BucketGrid_Query(&g_BucketGrid, &ent->bbox, &bucket); - for (j = 0; j < bucket.count; j++) { - Entity entCollision = bucket.bbox[j]->parent; - if (ent == entCollision || !(entCollision->flags & EntityFlag_Collision) || - CollisionInfo_CheckRepetition(collInfo, ent, entCollision)) { - continue; - } - Entity_CheckCollision(ent, entCollision, &collInfo); - } - } - if (Entity_CollisionInfoResponse(collInfo)) { - repeat = 1; - } - CollisionInfo_Destroy(&collInfo); - count++; - } while (repeat && count < maxCount); - - // Stop remaining collisions - if (count >= maxCount) { - for (i = 0; i < g_NumEntities; i++) { - Entity ent = g_Entity[i]; - if (!(ent->flags & EntityFlag_Collision) || ent->mass < 0.0f) { - continue; - } - TBucket bucket; - BucketGrid_Query(&g_BucketGrid, &ent->bbox, &bucket); - for (j = 0; j < bucket.count; j++) { - Entity entCollision = bucket.bbox[j]->parent; - if (ent == entCollision || !(entCollision->flags & EntityFlag_Collision)) { - continue; - } - if (Entity_CheckCollision(ent, entCollision, NULL)) { - vec2_set(ent->vel, 0, 0); - Entity_CalcBBox(ent); - vec2_set(entCollision->vel, 0, 0); - Entity_CalcBBox(entCollision); - } - } - } - } - GameLib_Compactate(); - g_EntitiesLock = 0; - t_col += Time_GetTime() - time; - - // Process Overlaps - time = Time_GetTime(); - g_EntitiesLock = 1; - for (i = 0; i < g_NumEntities; i++) { - Entity ent = g_Entity[i]; - if (!(ent->flags & EntityFlag_Overlap) || ent->mass < 0.0f) { - continue; - } - TBucket bucket; - BucketGrid_Query(&g_BucketGrid, &ent->bbox, &bucket); - for (j = 0; j < bucket.count; j++) { - Entity entCollision = bucket.bbox[j]->parent; - if (!(entCollision->flags & EntityFlag_Overlap) || ent == entCollision) { - continue; - } - Entity_Overlaps(ent, entCollision); - } - } - GameLib_Compactate(); - g_EntitiesLock = 0; - t_over += Time_GetTime() - time; - - // Sort - int n = g_NumEntities; - do { - int n2 = 0; - for (i = 1; i < n; i++) { - Entity ent1 = g_Entity[i - 1]; - Entity ent2 = g_Entity[i]; - int swap = 0; - if (ent1->zorder > ent2->zorder) { - // Lower level - swap = 1; - } else if (ent1->zorder < ent2->zorder) { - // Upper level - } else { - // Same level - const float y1 = ent1->pos[1] + ent1->sortYOffset; - const float y2 = ent2->pos[1] + ent2->sortYOffset; - if (y1 == y2) { - if (ent1->pos[0] < ent2->pos[0]) { - swap = 1; - } - } else if (y1 > y2) { - swap = 1; - } - } - if (swap) { - Entity ent = g_Entity[i]; - g_Entity[i] = g_Entity[i - 1]; - g_Entity[i - 1] = ent; - n2 = i; - } - } - n = n2; - } while (n > 0); - - // PostProcess - time = Time_GetTime(); - g_EntitiesLock = 1; - for (i = 0; i < g_NumEntities; i++) { - Entity_PostProcess(g_Entity[i], g_ProcFt); - if (Entity_IsMoving(g_Entity[i])) { - Entity_MarkUpdateLight(g_Entity[i], g_Entity, g_NumEntities); - } - } - if (g_GamePostProcFunc) { - g_GamePostProcFunc(); - } - GameLib_Compactate(); - g_EntitiesLock = 0; - t_postproc += Time_GetTime() - time; - - fproc_count++; -} - -///////////////////////////// -// GameLib_DrawLoop -// -// -void GameLib_DrawLoop(void *data, float f) { - long long time; - int i; - int game_pos[2]; - - GameLib_GetPosInstant(game_pos, f); - - time = Time_GetTime(); - - // PreDraw - if (g_GamePreDrawFunc) { - g_GamePreDrawFunc(f); - } else { - if (g_NumParallaxBackgrounds == 0) { - // Clean screen - Draw_Clean(0, 0, 0); - } - } - - // Draw parallax backgrounds - for (i = 0; i < g_NumParallaxBackgrounds; i++) { - Draw_ImgParallax( - g_ParallaxBackground[i].img, - g_ParallaxBackground[i].imgSize, - g_ParallaxBackground[i].imgOffset, - g_ParallaxBackground[i].parallaxFactor, - game_pos, - g_GameSize); - } - - // Draw entities - GameLib_Compactate(); - for (i = 0; i < g_NumEntities; i++) { - Entity e = g_Entity[i]; - - // Check visibility - if (!Entity_IsVisible(e, game_pos[0], game_pos[1], g_GameSize[0], g_GameSize[1])) { - continue; - } - - // Update illumination of this entity - if (Entity_IsUpdateLight(e)) { - Entity_Iluminate(e, g_Entity, g_NumEntities); - } - - Entity_Draw(e, -game_pos[0], -game_pos[1], f); - } - Draw_SetColor(1, 1, 1, 1); - g_EntitiesLock = 1; - if (g_GameDrawFunc) { - g_GameDrawFunc(f); - } - GameLib_Compactate(); - g_EntitiesLock = 0; - - t_draw += Time_GetTime() - time; - - fdraw_count++; - -#ifndef EMSCRIPTEN - if (Input_GetKey(InputKey_Screenshot) == InputKey_Pressed) { - // Screenshot key - char strFile[255]; - int idx = -1; - do { - idx++; - snprintf(strFile, 255, "shot-%04d.png", idx); - } while (access(strFile, F_OK) != -1); - Draw_SaveScreenshot(strFile); - Print("Screenshot saved \"%s\"\n", strFile); - } -#endif // EMSCRIPTEN - - if (Input_GetKey(InputKey_DumpProfiling) == InputKey_Pressed && fproc_count > 0 && fdraw_count > 0) { - Print("Profiling:::::::::\n"); - Print("t_proc.....:%6lldus\n", t_proc / fproc_count); - Print("t_col......:%6lldus\n", t_col / fproc_count); - Print("t_over.....:%6lldus\n", t_over / fproc_count); - Print("t_postproc.:%6lldus\n", t_postproc / fproc_count); - Print("t_draw.....:%6lldus\n", t_draw / fdraw_count); - Print("n_ents.....:%6lld\n", g_NumEntities); - t_proc = 0; - t_col = 0; - t_over = 0; - t_postproc = 0; - t_draw = 0; - fproc_count = 0; - fdraw_count = 0; - } -} - -///////////////////////////// -// GameLib_Loop -// -// Loops the game. -void GameLib_Loop(void (*gameProc)(), void (*gamePostProc)(), void (*gamePreDraw)(float f), void (*gameDraw)(float f)) { - g_GameProcFunc = gameProc; - g_GamePostProcFunc = gamePostProc; - g_GamePreDrawFunc = gamePreDraw; - g_GameDrawFunc = gameDraw; - t_proc = 0; - t_col = 0; - t_over = 0; - t_postproc = 0; - t_draw = 0; - fproc_count = 0; - fdraw_count = 0; - Draw_Loop(GameLib_ProcLoop, GameLib_DrawLoop, NULL); -} - -///////////////////////////// -// GameLib_GetPos -// GameLib_SetPos -// GameLib_UpdatePos -// GameLib_SetPos -// GameLib_GetPosInstant -// GameLib_SetPosOffset -// -// -void GameLib_GetPos(int pos[2]) { - pos[0] = g_GamePos1[0]; - pos[1] = g_GamePos1[1]; -} -void GameLib_SetPos(const int pos[2]) { - g_GamePos0[0] = pos[0]; - g_GamePos0[1] = pos[1]; - g_GamePos1[0] = pos[0]; - g_GamePos1[1] = pos[1]; -} -void GameLib_UpdatePos(const int pos[2]) { - g_GamePos1[0] = pos[0]; - g_GamePos1[1] = pos[1]; -} -void GameLib_GetSize(int size[2]) { - size[0] = g_GameSize[0]; - size[1] = g_GameSize[1]; -} -void GameLib_GetPosInstant(int pos[2], float f) { - pos[0] = g_GamePos0[0] + f * ((g_GamePos1[0] + g_GamePosOffset[0]) - g_GamePos0[0]); - pos[1] = g_GamePos0[1] + f * ((g_GamePos1[1] + g_GamePosOffset[1]) - g_GamePos0[1]); -} -void GameLib_SetPosOffset(const int posOffset[2]) { - g_GamePosOffset[0] = posOffset[0]; - g_GamePosOffset[1] = posOffset[1]; -} - -///////////////////////////// -// GameLib_MoveToPos -// GameLib_MoveToPosH -// GameLib_MoveToPosV -// -// -void GameLib_MoveToPos(vec2 pos, float f) { - GameLib_MoveToPosH(pos, f); - GameLib_MoveToPosV(pos, f); -} -void GameLib_MoveToPosH(const vec2 pos, const float f) { - g_GamePos1[0] = g_GamePos1[0] + (pos[0] - (g_GamePos1[0] + (g_GameSize[0] / 2.0f))) * f; -} -void GameLib_MoveToPosV(const vec2 pos, const float f) { - g_GamePos1[1] = g_GamePos1[1] + (pos[1] - (g_GamePos1[1] + (g_GameSize[1] / 2.0f))) * f; -} - -///////////////////////////// -// GameLib_ForEachEn -// -// Deletes every entity. -void GameLib_DelEnts() { - for (int i = 0; i < g_NumEntities; i++) { - if (!g_Entity[i]) { - continue; - } - Entity_Destroy(g_Entity[i]); - } - g_NumEntities = 0; - BucketGrid_DeInit(&g_BucketGrid); - BucketGrid_Init(&g_BucketGrid, 1, 1, 100, 50, 50); -} - -///////////////////////////// -// GameLib_ForEachEn -// -// Iterates every entity. -void GameLib_ForEachEnt(int (*func)(Entity ent)) { - for (int i = 0; i < g_NumEntities; i++) { - if (!g_Entity[i]) { - continue; - } - if (!func(g_Entity[i])) { - break; - } - } -} - -///////////////////////////// -// GameLib_SearchEnt -// -// Searches through the entities. -Entity GameLib_SearchEnt(int (*func)(Entity ent, void *d), void *d) { - Entity ent = NULL; - for (int i = 0; i < g_NumEntities; i++) { - if (!g_Entity[i]) { - continue; - } - if (func(g_Entity[i], d)) { - ent = g_Entity[i]; - break; - } - } - return ent; -} - -///////////////////////////// -// GameLib_SearchEntInArea -// -// Searches through the entities, in an area. -Entity GameLib_SearchEntInArea(int (*func)(Entity ent, void *d), void *d, BBox area) { - TBucket searchBucket; - BucketGrid_Query(&g_BucketGrid, area, &searchBucket); - Entity ent = NULL; - for (int i = 0; i < searchBucket.count; i++) { - ent = searchBucket.bbox[i]->parent; - if (!ent) { - continue; - } - if (func(ent, d)) { - break; - } - } - return ent; -} - -///////////////////////////// -// GameLib_EntityCustomCheckCollision -// -// -int GameLib_EntityCustomCheckCollision(Entity ent, vec2 vel) { - int collision = 0; - CollisionInfo collInfo = NULL; - vec2 originalVel; - - vec2_copy(originalVel, ent->vel); - vec2_copy(ent->vel, vel); - Entity_CalcBBox(ent); - - for (int j = 0; j < g_NumEntities; j++) { - if (!(g_Entity[j]->flags & EntityFlag_Collision) || !Entity_BBoxIntersect(ent, g_Entity[j])) { - continue; - } - Entity_CheckCollision(ent, g_Entity[j], &collInfo); - if (collInfo != NULL) { - collision = 1; - break; - } - } - - vec2_copy(ent->vel, originalVel); - Entity_CalcBBox(ent); - - CollisionInfo_Destroy(&collInfo); - return collision; -} - -///////////////////////////// -// GameLib_PlaySound -// -// -void GameLib_PlaySound(AudioSnd snd, int x, int y) { - int r; - - // Get the screen context - int cx = g_GamePos1[0] + g_GameSize[0] / 2; - int cy = g_GamePos1[1] + g_GameSize[1] / 2; - if (g_GameSize[0] > g_GameSize[1]) { - r = g_GameSize[0] / 2; - } else { - r = g_GameSize[1] / 2; - } - r = r * 1.2f; - int off = r / 10.0f; - - // Calculate volumes - float dx = x - (cx + off); - float dy = y - (cy); - float vRight = 1.0f - (sqrtf(dx * dx + dy * dy) / (float)r); - dx = x - (cx - off); - dy = y - (cy); - float vLeft = 1.0f - (sqrtf(dx * dx + dy * dy) / (float)r); - - // Clamp to 0 - if (vLeft < 0.0f) { - vLeft = 0.0f; - } - if (vRight < 0.0f) { - vRight = 0.0f; - } - if (vLeft <= 0.0f && vRight <= 0.0f) { - return; - } - - // PLAY! - Audio_PlaySound(snd, vLeft, vRight, 0); -} - -///////////////////////////// -// GameLib_PlayLoopingSound -// -// -AudioChn GameLib_PlayLoopingSound(AudioSnd snd) { - // PLAY! - return Audio_PlaySound(snd, 1.0f, 1.0f, 1); -} - -///////////////////////////// -// GameLib_EntitySetLight -// -// -void GameLib_EntitySetLight(Entity e, float r, float g, float b, float rad) { - if (Entity_IsLight(e)) { - Entity_MarkUpdateLight(e, g_Entity, g_NumEntities); - Entity_SetLight(e, r, g, b, rad); - Entity_MarkUpdateLight(e, g_Entity, g_NumEntities); - } else { - Entity_SetLight(e, r, g, b, rad); - } -} - -///////////////////////////// -// GameLib_ConvertScreenPositionToGamePosition -// -// -void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos, float f) { - int game_pos[2]; - - game_pos[0] = g_GamePos0[0] + f * ((g_GamePos1[0] + g_GamePosOffset[0]) - g_GamePos0[0]); - game_pos[1] = g_GamePos0[1] + f * ((g_GamePos1[1] + g_GamePosOffset[1]) - g_GamePos0[1]); - - gamePos[0] = (screenPos[0] * g_GameSize[0]) + game_pos[0]; - gamePos[1] = (screenPos[1] * g_GameSize[1]) + game_pos[1]; -} - -///////////////////////////// -// GameLib_AddParallaxBackground -// -// -void GameLib_AddParallaxBackground(DrawImg img, int imgSize[2], int imgOffset[2], float parallaxFactor[2]) { - const int idx = g_NumParallaxBackgrounds; - if ((idx + 1) >= MaxParallaxBackgrounds) { - Print("GameLib: Can't add parallaxBackground, limit reached."); - return; - } - g_ParallaxBackground[idx].img = img; - g_ParallaxBackground[idx].imgSize[0] = imgSize[0]; - g_ParallaxBackground[idx].imgSize[1] = imgSize[1]; - g_ParallaxBackground[idx].imgOffset[0] = imgOffset[0]; - g_ParallaxBackground[idx].imgOffset[1] = imgOffset[1]; - g_ParallaxBackground[idx].parallaxFactor[0] = parallaxFactor[0]; - g_ParallaxBackground[idx].parallaxFactor[1] = parallaxFactor[1]; - g_NumParallaxBackgrounds++; -} - -///////////////////////////// -// GameLib_CleanParallaxBackgrounds -// -// -void GameLib_CleanParallaxBackgrounds() { g_NumParallaxBackgrounds = 0; } diff --git a/src/GameLib.h b/src/GameLib.h deleted file mode 100644 index 2cc7929..0000000 --- a/src/GameLib.h +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef GameLib_H -#define GameLib_H - -#include "Anim.h" -#include "Audio.h" -#include "Draw.h" -#include "Entity.h" -#include "Input.h" -#include "TimeUtils.h" -#include "Util.h" - -///////////////////////////// -// GameLib_Init -// -// Initializes the game. -int GameLib_Init(int w, int h, char *title, int pFps, int fps); - -///////////////////////////// -// GameLib_PrepareSize -// -// -void GameLib_PrepareSize(float x1, float y1, float x2, float y2); - -///////////////////////////// -// GameLib_CheckSize -// -// -void GameLib_CheckSize(); - -///////////////////////////// -// GameLib_AddEntity -// -// Adds an entity to the game. -void GameLib_AddEntity(Entity e); - -///////////////////////////// -// GameLib_RemoveEntity -// -// removes the entity. -int GameLib_RemoveEntity(Entity e); - -///////////////////////////// -// GameLib_UnrefEntity -// -// removes the reference to the entity. -int GameLib_UnrefEntity(Entity e); - -///////////////////////////// -// GameLib_DelEntity -// -// Adds an entity to the game. -int GameLib_DelEntity(Entity e); - -///////////////////////////// -// GameLib_Loop -// -// Loops the game. -void GameLib_Loop(void (*gameProc)(), void (*gamePostProc)(), void (*gamePreDraw)(float f), void (*gameDraw)(float f)); - -///////////////////////////// -// GameLib_GetPos -// GameLib_SetPos -// GameLib_UpdatePos -// GameLib_SetPos -// GameLib_GetPosInstant -// GameLib_SetPosOffset -// -// -void GameLib_GetPos(int pos[2]); -void GameLib_SetPos(const int pos[2]); -void GameLib_UpdatePos(const int pos[2]); -void GameLib_GetSize(int size[2]); -void GameLib_GetPosInstant(int pos[2], float f); -void GameLib_SetPosOffset(const int posOffset[2]); - -///////////////////////////// -// GameLib_MoveToPos -// GameLib_MoveToPosH -// GameLib_MoveToPosV -// -// -void GameLib_MoveToPos(vec2 pos, float f); -void GameLib_MoveToPosH(const vec2 pos, float f); -void GameLib_MoveToPosV(const vec2 pos, float f); - -///////////////////////////// -// GameLib_ForEachEn -// -// Deletes every entity. -void GameLib_DelEnts(); - -///////////////////////////// -// GameLib_ForEachEnt -// -// Iterates every entity. -void GameLib_ForEachEnt(int (*func)(Entity ent)); - -///////////////////////////// -// GameLib_SearchEnt -// -// Searches through the entities. -Entity GameLib_SearchEnt(int (*func)(Entity ent, void *d), void *d); - -///////////////////////////// -// GameLib_SearchEntInArea -// -// Searches through the entities, in an area. -Entity GameLib_SearchEntInArea(int (*func)(Entity ent, void *d), void *d, BBox area); - -///////////////////////////// -// GameLib_EntityCustomCheckCollision -// -// -int GameLib_EntityCustomCheckCollision(Entity ent, vec2 vel); - -///////////////////////////// -// GameLib_PlaySound -// -// Play a sound position aware. -void GameLib_PlaySound(AudioSnd snd, int x, int y); - -///////////////////////////// -// GameLib_PlayLoopingSound -// -// Play a sound looping -AudioChn GameLib_PlayLoopingSound(AudioSnd snd); - -///////////////////////////// -// GameLib_EntitySetLight -// -// -void GameLib_EntitySetLight(Entity e, float r, float g, float b, float rad); - -///////////////////////////// -// GameLib_ConvertScreenPositionToGamePosition -// -// -void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos, float f); - -///////////////////////////// -// GameLib_AddParallaxBackground -// -// -void GameLib_AddParallaxBackground(DrawImg img, int imgSize[2], int imgOffset[2], float parallaxFactor[2]); - -///////////////////////////// -// GameLib_CleanParallaxBackgrounds -// -// -void GameLib_CleanParallaxBackgrounds(); - -#endif diff --git a/src/Input.c b/src/Input.c deleted file mode 100644 index 136bf4c..0000000 --- a/src/Input.c +++ /dev/null @@ -1,226 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#include -#include -#ifdef EMSCRIPTEN -#define SDL_GetKeyState SDL_GetKeyboardState -#endif - -#include "Input.h" -#include "Util.h" - -// Globals -InputKeyStatus _keys[InputKey_Max]; - -int _pointerDown = 0; -float _pointerX = 0; -float _pointerY = 0; - -int _clicked = 0; -float _clickedPositionX = 0; -float _clickedPositionY = 0; - -///////////////////////////// -// Input_Init -// -// Initializes the game input. -int Input_Init() { - int i; - - // Mark released all the keys - for (i = 0; i < InputKey_Max; i++) { - _keys[i] = InputKey_Released; - } - - return (1); -} - -///////////////////////////// -// Input_Frame -// -// Notify a frame update to the input subsystem. -void Input_Frame() { - Uint8 *keys; - - // Get keyboard state - keys = (Uint8 *)SDL_GetKeyboardState(NULL); - - // Process Keys - Input_SetKey(InputKey_Action1, keys[SDL_SCANCODE_Z] | keys[SDL_SCANCODE_O]); - Input_SetKey(InputKey_Action2, keys[SDL_SCANCODE_X] | keys[SDL_SCANCODE_P]); - Input_SetKey(InputKey_Up, keys[SDL_SCANCODE_UP] | keys[SDL_SCANCODE_W]); - Input_SetKey(InputKey_Down, keys[SDL_SCANCODE_DOWN] | keys[SDL_SCANCODE_S]); - Input_SetKey(InputKey_Left, keys[SDL_SCANCODE_LEFT] | keys[SDL_SCANCODE_A]); - Input_SetKey(InputKey_Right, keys[SDL_SCANCODE_RIGHT] | keys[SDL_SCANCODE_D]); - Input_SetKey(InputKey_Jump, keys[SDL_SCANCODE_SPACE]); - Input_SetKey( - InputKey_Continue, - keys[SDL_SCANCODE_RETURN] | keys[SDL_SCANCODE_RETURN2] | keys[SDL_SCANCODE_KP_ENTER] | _pointerDown); - - Input_SetKey(InputKey_DumpProfiling, keys[SDL_SCANCODE_M]); - Input_SetKey(InputKey_Screenshot, keys[SDL_SCANCODE_F12]); -} - -///////////////////////////// -// Input_PostFrame -// -// Notify a frame update to the input subsystem. -void Input_PostFrame() { - Input_SetKey(InputKey_Exit, 0); - _clicked = 0; -} - -///////////////////////////// -// Input_SetKey -// -// Notify a key press to the input subsystem. -void Input_SetKey(InputKey key, int status) { - if (!status) { - _keys[key] = InputKey_Released; - } else { - if (_keys[key] >= InputKey_Pressed) { - _keys[key] = InputKey_Holded; - } else { - _keys[key] = InputKey_Pressed; - } - } -} - -///////////////////////////// -// Input_GetKey -// -// Reports a the status of a key. -InputKeyStatus Input_GetKey(InputKey key) { return (_keys[key]); } - -///////////////////////////// -// Input_SetPointerPosition -// -void Input_SetPointerPosition(float x, float y) { - _pointerX = x; - _pointerY = y; -} - -///////////////////////////// -// Input_SetPointerDown -// -void Input_SetPointerDown(int pointerDown) { - if (pointerDown == 0 && _pointerDown == 1) { - _clicked = 1; - _clickedPositionX = _pointerX; - _clickedPositionY = _pointerY; - } - _pointerDown = pointerDown; -} - -///////////////////////////// -// Input_GetPointerDown -// -int Input_GetPointerDown() { return _pointerDown; } - -///////////////////////////// -// Input_GetPointerPosition -// -int Input_GetPointerPosition(vec2 pointer) { - pointer[0] = _pointerX; - pointer[1] = _pointerY; - return _pointerDown; -} - -///////////////////////////// -// Input_GetClickedPosition -// -int Input_GetClickedPosition(vec2 clickPosition) { - clickPosition[0] = _clickedPositionX; - clickPosition[1] = _clickedPositionY; - return _clicked; -} - -///////////////////////////// -// Input_AnyKey -// -// -int Input_AnyKey() { - int i; - for (i = 0; i < InputKey_Max; i++) { - if (_keys[i] == InputKey_Pressed) { - return (1); - } - } - return (0); -} - -///////////////////////////// -// Input_GetDir -// -// Reports the direction of the dpad and mouse. -int Input_GetDir(vec2 dir) { - float vlen; - Uint8 buttons; - int mx, my; - float dlen; - extern int g_Width, g_Height; - - // Get mouse state - buttons = SDL_GetMouseState(&mx, &my); - if (buttons) { - // Use the mouse - vec2_set(dir, mx - (g_Width / 2), my - (g_Height / 2.0f)); - dlen = 1.0f / sqrtf(vec2_dot(dir, dir)); - vec2_scale(dir, dir, dlen); - return (1); - } else { - // Use the keyboar - vec2_set(dir, 0.0f, 0.0f); - if (Input_GetKey(InputKey_Up)) { - dir[1] -= 1.0f; - } - if (Input_GetKey(InputKey_Down)) { - dir[1] += 1.0f; - } - if (Input_GetKey(InputKey_Left)) { - dir[0] -= 1.0f; - } - if (Input_GetKey(InputKey_Right)) { - dir[0] += 1.0f; - } - vlen = vec2_dot(dir, dir); - if (vlen > 0.0f) { - vlen = sqrtf(vlen); - vec2_scale(dir, dir, 1.0f / vlen); - return (1); - } else { - return (0); - } - } -} - -///////////////////////////// -// Input_GetKeyDir -// -// Reports the direction of the dpad. -int Input_GetKeyDir(vec2 dir) { - float vlen; - - // Use the keyboard - vec2_set(dir, 0.0f, 0.0f); - if (Input_GetKey(InputKey_Up)) { - dir[1] -= 1.0f; - } - if (Input_GetKey(InputKey_Down)) { - dir[1] += 1.0f; - } - if (Input_GetKey(InputKey_Left)) { - dir[0] -= 1.0f; - } - if (Input_GetKey(InputKey_Right)) { - dir[0] += 1.0f; - } - vlen = vec2_dot(dir, dir); - if (vlen > 0.0f) { - vlen = sqrtf(vlen); - vec2_scale(dir, dir, 1.0f / vlen); - return (1); - } else { - return (0); - } -} diff --git a/src/Input.h b/src/Input.h deleted file mode 100644 index 9d15c17..0000000 --- a/src/Input.h +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef Input_H -#define Input_H - -#include "Util.h" - -///////////////////////////// -// Input_Init -// -// Initializes the game input. -int Input_Init(); - -///////////////////////////// -// Input_Frame -// -// Notify a frame update to the input subsystem. -void Input_Frame(); - -///////////////////////////// -// Input_PostFrame -// -// Notify a frame update end to the input subsystem. -void Input_PostFrame(); - -//////////////////////////////////////////////// -// InputKey // -////////////// -// Key enumeration. -typedef enum { - InputKey_Action1, - InputKey_Action2, - InputKey_Up, - InputKey_Down, - InputKey_Left, - InputKey_Right, - InputKey_Jump, - InputKey_Continue, - InputKey_Exit, - - InputKey_DumpProfiling, - InputKey_Screenshot, - - InputKey_Max -} InputKey; - -///////////////////////////// -// Input_SetKey -// -// Notify a key press to the input subsystem. -void Input_SetKey(InputKey key, int status); - -//////////////////////////////////////////////// -// InputKeyStatus // -/////////////////// -// Key status enumeration. -typedef enum { InputKey_Released, InputKey_Pressed, InputKey_Holded } InputKeyStatus; - -///////////////////////////// -// Input_GetKey -// -// Reports a the status of a key. -InputKeyStatus Input_GetKey(InputKey key); - -///////////////////////////// -// Input_SetPointerPosition -// -void Input_SetPointerPosition(float x, float y); - -///////////////////////////// -// Input_SetPointerDown -// -void Input_SetPointerDown(int pointerDown); - -///////////////////////////// -// Input_GetPointerDown -// -int Input_GetPointerDown(); - -///////////////////////////// -// Input_GetPointerPosition -// -int Input_GetPointerPosition(vec2 pointer); - -///////////////////////////// -// Input_GetClickedPosition -// -int Input_GetClickedPosition(vec2 clickPosition); - -///////////////////////////// -// Input_AnyKey -// -// -int Input_AnyKey(); - -///////////////////////////// -// Input_GetDir -// -// Reports the direction of the dpad and mouse. -int Input_GetDir(vec2 dir); - -///////////////////////////// -// Input_GetKeyDir -// -// Reports the direction of the dpad. -int Input_GetKeyDir(vec2 dir); - -#endif diff --git a/src/QuadArray2D.c b/src/QuadArray2D.c deleted file mode 100644 index bdd9041..0000000 --- a/src/QuadArray2D.c +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (C) 2013-2023 Valeriano Alfonso Rodriguez (Kableado) - -#include -#include - -#include "QuadArray2D.h" - -QuadArray2D QuadArray2D_Create(int resVertex) { - QuadArray2D quadArray = NULL; - - quadArray = malloc(sizeof(TQuadArray2D)); - - quadArray->vertexData = malloc(sizeof(float) * Vertex2D_Length * resVertex); - quadArray->nVertex = 0; - quadArray->resVertex = resVertex; - - return quadArray; -} - -void QuadArray2D_Destroy(QuadArray2D *quadArray) { - if (!quadArray) { - return; - } - if (!quadArray[0]) { - return; - } - - free(quadArray[0]->vertexData); - free(quadArray[0]); - quadArray[0] = NULL; -} - -void QuadArray2D_Clean(QuadArray2D quadArray) { quadArray->nVertex = 0; } - -void QuadArray2D_AddVertex(QuadArray2D quadArray, float v[]) { - if (quadArray->resVertex <= quadArray->nVertex) { - // Grow vertexData - quadArray->resVertex *= 2; - float *newVertexData = malloc(sizeof(float) * Vertex2D_Length * quadArray->resVertex); - memcpy(newVertexData, quadArray->vertexData, sizeof(float) * Vertex2D_Length * quadArray->nVertex); - free(quadArray->vertexData); - quadArray->vertexData = newVertexData; - } - - // Add the vertex - memcpy(quadArray->vertexData + (Vertex2D_Length * quadArray->nVertex), v, sizeof(float) * Vertex2D_Length); - quadArray->nVertex++; -} - -void QuadArray2D_AddQuad( - QuadArray2D quadArray, float x0, float y0, float u0, float v0, float x1, float y1, float u1, float v1, - const float color[]) { - float v[Vertex2D_Length]; - - // Set the color - v[4] = color[0]; - v[5] = color[1]; - v[6] = color[2]; - v[7] = color[3]; - - // Add the vertexes - v[0] = x0; - v[1] = y0; - v[2] = u0; - v[3] = v0; - QuadArray2D_AddVertex(quadArray, v); - v[0] = x1; - v[1] = y0; - v[2] = u1; - v[3] = v0; - QuadArray2D_AddVertex(quadArray, v); - v[0] = x1; - v[1] = y1; - v[2] = u1; - v[3] = v1; - QuadArray2D_AddVertex(quadArray, v); - - v[0] = x1; - v[1] = y1; - v[2] = u1; - v[3] = v1; - QuadArray2D_AddVertex(quadArray, v); - v[0] = x0; - v[1] = y1; - v[2] = u0; - v[3] = v1; - QuadArray2D_AddVertex(quadArray, v); - v[0] = x0; - v[1] = y0; - v[2] = u0; - v[3] = v0; - QuadArray2D_AddVertex(quadArray, v); -} diff --git a/src/QuadArray2D.h b/src/QuadArray2D.h deleted file mode 100644 index 4322a1f..0000000 --- a/src/QuadArray2D.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2013-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef QuadArray2D_H -#define QuadArray2D_H - -// Vertex2D -> (x,y) (u,v) (r,g,b,a) -#define Vertex2D_Length 8 - -//////////////////////////////////////////////// -// QuadArray2D -// -typedef struct TQuadArray2D TQuadArray2D, *QuadArray2D; -struct TQuadArray2D { - float *vertexData; - int nVertex; - int resVertex; -}; - -QuadArray2D QuadArray2D_Create(int resVertex); - -void QuadArray2D_Destroy(QuadArray2D *quadArray); - -void QuadArray2D_Clean(QuadArray2D quadArray); - -void QuadArray2D_AddVertex(QuadArray2D quadArray, float v[]); - -void QuadArray2D_AddQuad( - QuadArray2D quadArray, float x0, float y0, float u0, float v0, float x1, float y1, float u1, float v1, - const float color[]); - -#endif diff --git a/src/TimeUtils.c b/src/TimeUtils.c deleted file mode 100644 index 6094e3b..0000000 --- a/src/TimeUtils.c +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#include -#include - -#include "TimeUtils.h" - -///////////////////////////// -// Time_GetTime -// -// Gets the current time in usecs. -///////////////////////////// -// Time_Pause -// -// Pauses the execution for t usecs. -#if WIN32 -#include -// WIN32 -long long Time_GetTime() { - LARGE_INTEGER freq; - LARGE_INTEGER tim; - long long int microt; - - QueryPerformanceFrequency(&freq); - QueryPerformanceCounter(&tim); - microt = (tim.QuadPart * 1000000) / freq.QuadPart; - return (microt); -} -void Time_Pause(int pausa) { - long long tend, t, diff; - - t = Time_GetTime(); - tend = t + pausa; - do { - diff = tend - t; - if (diff > 1000) { - Sleep(diff / 1000); - } else { - Sleep(0); - } - t = Time_GetTime(); - } while (tend >= t); -} -#else -// UNIX -long long Time_GetTime() { - struct timeval t; - long long usecs; - gettimeofday(&t, NULL); - usecs = (t.tv_sec * 1000000ll) + (t.tv_usec); - return (usecs); -} -void Time_Pause(long long pause) { - struct timeval tv; - tv.tv_sec = (long long)pause / 1000000; - tv.tv_usec = (long long)pause % 1000000; - select(0, NULL, NULL, NULL, &tv); -} -#endif // if WIN32 diff --git a/src/TimeUtils.h b/src/TimeUtils.h deleted file mode 100644 index 5f0dc39..0000000 --- a/src/TimeUtils.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef TimeUtils_H -#define TimeUtils_H - -///////////////////////////// -// Time_GetTime -// -// Gets the current time in usecs. -long long Time_GetTime(); - -///////////////////////////// -// Time_Pause -// -// Pauses the execution for t usecs. -void Time_Pause(long long pause); - -#endif diff --git a/src/Util.c b/src/Util.c deleted file mode 100644 index c97172c..0000000 --- a/src/Util.c +++ /dev/null @@ -1,421 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#include -#include -#include - -#include "Util.h" - -///////////////////////////// -// Misc -// - -float CosineInterpolation(float f) { return (1.0f - cosf(f * Pi)) * 0.5f; } - -int MinimumInt(int i0, int i1) { - if (i1 < i0) { - return i1; - } - return i0; -} - -int MaximumInt(int i0, int i1) { - if (i1 > i0) { - return i1; - } - return i0; -} - -uint8_t SumClamp_uint8(const uint8_t a, const uint8_t b) { - const uint16_t sum = a + b; - if (sum > 255) { - return 255; - } - return sum; -} - -///////////////////////////// -// Rect -// - -void Rect_UnionRect(Rect r0, Rect r1, Rect rd) { - rd->x0 = MinimumInt(r0->x0, r1->x0); - rd->y0 = MinimumInt(r0->y0, r1->y0); - rd->x1 = MaximumInt(r0->x1, r1->x1); - rd->y1 = MaximumInt(r0->y1, r1->y1); -} - -int Rect_PointInside(Rect r, int x, int y) { return (x >= r->x0 && x < r->x1 && y >= r->y0 && y < r->y1); } - -int Rect_PointInsideAny(TRect r[], int rCount, int x, int y) { - int insideAny = 0; - int i; - for (i = 0; i < rCount; i++) { - if (Rect_PointInside(&(r[i]), x, y)) { - insideAny = 1; - break; - } - } - return insideAny; -} - -///////////////////////////// -// SolveQuadratic -// -// Solves a Quadratic equation using a, b and c coeficients. -int SolveQuadratic(float a, float b, float c, float *RMin, float *RMax) { - float root; - float divisor; - float b2; - b2 = b * b; - root = b2 - 4.0f * a * c; - if (root < 0) { - // Complex - return (0); - } - divisor = (2.0f * a); - if (fabsf(divisor) == 0.0f) { - // +inf -inf - return (0); - } - root = sqrtf(root); - RMin[0] = (float)((-b - root) / divisor); - RMax[0] = (float)((-b + root) / divisor); - return (1); -} - -//////////////////////////////////////////////// -// vec2 // -////////// -// A 2D vector. -float vec2_norm(vec2 v) { - float len; - len = vec2_len(v); - vec2_scale(v, v, 1.0f / len); - return (len); -} - -void vec2_orthogonalize4(vec2 v) { - if (fabsf(v[0]) > fabsf(v[1])) { - if (v[0] >= 0) { - v[0] = 1.0f; - v[1] = 0.0f; - } else { - v[0] = -1.0f; - v[1] = 0.0f; - } - } else { - if (v[1] >= 0) { - v[1] = 1.0f; - v[0] = 0.0f; - } else { - v[1] = -1.0f; - v[0] = 0.0f; - } - } -} - -void vec2_orthogonalize8(vec2 v) { - float diff = fabsf(fabsf(v[0]) - fabsf(v[1])); - if (diff > 0.2f) { - if (fabsf(v[0]) > fabsf(v[1])) { - if (v[0] >= 0) { - v[0] = 1.0f; - v[1] = 0.0f; - } else { - v[0] = -1.0f; - v[1] = 0.0f; - } - } else { - if (v[1] >= 0) { - v[1] = 1.0f; - v[0] = 0.0f; - } else { - v[1] = -1.0f; - v[0] = 0.0f; - } - } - } else { - if (v[0] > 0.0f) { - v[0] = 0.707f; - } else { - v[0] = -0.707f; - } - if (v[1] > 0.0f) { - v[1] = 0.707f; - } else { - v[1] = -0.707f; - } - } -} - -///////////////////////////// -// Intersect_RayUnitCircle -// -// Intersection between a ray and a Unit Circle. -int Intersect_RayUnitCircle(const vec2 orig, const vec2 vel, const vec2 center, float *t) { - float a, b, c; - float Rmin, Rmax; - vec2 distv; - float qlvel; - float qdistv; - - // Check if the collision is even posible - qlvel = vec2_dot(vel, vel); - if (fabsf(qlvel) <= 0.0f) { - return (0); - } - vec2_minus(distv, orig, center); - qdistv = vec2_dot(distv, distv); - - // Solve as a unit circle - a = qlvel; - b = 2.0f * vec2_dot(distv, vel); - c = qdistv - 1.0f; - if (SolveQuadratic(a, b, c, &Rmin, &Rmax)) { - if (Rmin >= -0.0f && Rmin < Rmax && Rmin <= 1.0f) { - *t = Rmin; - return (1); - } - if (Rmax >= -0.0f && Rmin > Rmax && Rmax <= 1.0f) { - *t = Rmax; - return (1); - } - } - return (0); -} - -///////////////////////////// -// Collision_CircleCircle -// -// Collision point of a circle against another circle. -int Collision_CircleCircle(const vec2 cir1, float ra, const vec2 vel, const vec2 cb, float rb, float *t, vec2 n) { - vec2 vel_a, orig_a, cen_a, temp; - float rads, invrads; - float maxx, minx; - float maxy, miny; - - // Check if the collision is even posible - rads = ra + rb; - minx = cir1[0] - rads; - maxx = cir1[0] + rads; - if (vel[0] > 0) { - maxx += vel[0]; - } else { - minx += vel[0]; - } - if (cb[0] < minx || cb[0] > maxx) - return (0); - miny = cir1[1] - rads; - maxy = cir1[1] + rads; - if (vel[1] > 0) { - maxy += vel[1]; - } else { - miny += vel[1]; - } - if (cb[1] < miny || cb[1] > maxy) - return (0); - - // Convert to a unit circle vs ray - invrads = 1.0f / rads; - vec2_scale(vel_a, vel, invrads); - vec2_scale(orig_a, cir1, invrads); - vec2_scale(cen_a, cb, invrads); - if (Intersect_RayUnitCircle(orig_a, vel_a, cen_a, t)) { - // Calculate n - vec2_scaleadd(temp, cir1, vel, *t); - vec2_minus(n, temp, cb); - vec2_scale(n, n, invrads); - return (1); - } - return (0); -} - -///////////////////////////// -// Intersect_RayEdge -// -// Intersection between a ray and an edge. -int Intersect_RayEdge(const vec2 pos, const vec2 vel, const vec2 norm, const vec2 edgePos, float len, float *t) { - vec2 pos2, intersection, perp, edgePos2; - float delta, d1, d2, hLen; - - vec2_plus(pos2, pos, vel); - hLen = len / 2; - - // Check intersection against the line - delta = vec2_dot(norm, edgePos); - d1 = vec2_dot(pos, norm) - delta; - d2 = vec2_dot(pos2, norm) - delta; - if (d1 >= -0.0001f && d2 <= 0.0001f) { - // Intersection with line, Calculate intersection point - *t = d1 / (d1 - d2); - vec2_scaleadd(intersection, pos, vel, *t); - - // Perpendicular - vec2_perp(perp, norm); - - // Check sides - vec2_scaleadd(edgePos2, edgePos, perp, -hLen); - delta = -vec2_dot(perp, edgePos2); - d1 = (-vec2_dot(perp, intersection)) - delta; - - vec2_scaleadd(edgePos2, edgePos, perp, hLen); - delta = vec2_dot(perp, edgePos2); - d2 = vec2_dot(perp, intersection) - delta; - - if (d1 <= 0.0f && d2 <= 0.0f) { - // Intersection inside Edge. - return (1); - } - } - return (0); -} - -///////////////////////////// -// AbsMod -// -int AbsMod(int v, int d) { - if (v < 0) { - v += d * (((v / d) * (-1)) + 1); - return (v); - } else { - return (v % d); - } -} -float AbsModFloat(float v, int d) { - if (v < 0) { - v += d * ((((int)(v / d)) * (-1)) + 1); - return (v); - } else { - v -= d * (((int)(v / d)) + 1); - return (v); - } -} - -///////////////////////////// -// IsBigEndian -// -int IsBigEndian() { - union { - unsigned int i; - char c[4]; - } bint = {0x01020304}; - return bint.c[0] == 1; -} - -///////////////////////////// -// EndsWith -// -int EndsWith(char *str, char *suffix) { - if (!str || !suffix) { - return 0; - } - size_t lenStr = strlen(str); - size_t lenSuffix = strlen(suffix); - if (lenSuffix > lenStr) { - return 0; - } - return strncmp(str + lenStr - lenSuffix, suffix, lenSuffix) == 0; -} - -///////////////////////////// -// Rand -// -// (LGC++) + Seed change - -#define g_LGC_Seed_N 30 -#define g_LGC_Seed_A 30 -#define g_LGC_Seed_B 5 -#define g_LGC_Seed_C 10 -#define g_LGC_Seed_D 15 -#define g_LGC_A 16807ul -#define g_LGC_C 2 -#define g_LGC_M 2147483647ul -unsigned g_LGC_Seeds[30]; -int g_LGC_Seed_I = -1; - -unsigned g_RandCount; -unsigned g_RandOrigSeed; - -void Rand_Seed(unsigned seed) { - int i; - g_LGC_Seeds[0] = seed; - for (i = 1; i < 30; i++) { - g_LGC_Seeds[i] = (g_LGC_Seeds[i - 1] * g_LGC_A + g_LGC_C) % g_LGC_M; - } - g_LGC_Seed_I = 29; - - // Cambio de semilla - g_RandCount = 0; - g_RandOrigSeed = seed; -} - -unsigned Rand_Get() { - unsigned val; - int a, b, c, d; - - if (g_LGC_Seed_I == -1) { - Rand_Seed(1); - } - - a = g_LGC_Seed_I - g_LGC_Seed_A; - if (a < 0) { - a += g_LGC_Seed_N; - } - b = g_LGC_Seed_I - g_LGC_Seed_B; - if (b < 0) { - b += g_LGC_Seed_N; - } - c = g_LGC_Seed_I - g_LGC_Seed_C; - if (c < 0) { - c += g_LGC_Seed_N; - } - d = g_LGC_Seed_I - g_LGC_Seed_D; - if (d < 0) { - d += g_LGC_Seed_N; - } - val = g_LGC_Seeds[a] ^ g_LGC_Seeds[b] ^ g_LGC_Seeds[c] ^ g_LGC_Seeds[d]; - - a = g_LGC_Seed_I - 1; - if (a < 0) { - a = g_LGC_Seed_N - 1; - } - g_LGC_Seeds[g_LGC_Seed_I] = (g_LGC_Seeds[a] * g_LGC_A + g_LGC_C) % g_LGC_M; - g_LGC_Seed_I++; - if (g_LGC_Seed_I == g_LGC_Seed_N) { - g_LGC_Seed_I = 0; - } - - // Cambio de semilla - g_RandCount++; - if (g_RandCount > (1 << 15)) { - Rand_Seed(g_RandOrigSeed + 1); - } - - return (val); -} - -unsigned Rand_GetBetween(int min, int max) { - if (min == max) { - return max; - } - return (Rand_Get() % (max - min)) + min; -} - -///////////////////////////// -// Print -// -// Prints the formatted text -int Print(char *fmt, ...) { - va_list ap; - int n; - - // Print - va_start(ap, fmt); - n = vprintf(fmt, ap); - va_end(ap); - - // Flush - fflush(stdout); - return (n); -} diff --git a/src/Util.h b/src/Util.h deleted file mode 100644 index 459bbd3..0000000 --- a/src/Util.h +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (C) 2011-2023 Valeriano Alfonso Rodriguez (Kableado) - -#ifndef Util_H -#define Util_H - -#include -#include -#include - -#define Pi (3.1415925f) - -///////////////////////////// -// Misc -// - -float CosineInterpolation(float f); - -int MinimumInt(int i0, int i1); - -int MaximumInt(int i0, int i1); - -uint8_t SumClamp_uint8(const uint8_t a, const uint8_t b); - -///////////////////////////// -// Rect -// - -typedef struct SRect TRect, *Rect; -struct SRect { - int x0; - int y0; - int x1; - int y1; -}; - -void Rect_UnionRect(Rect r0, Rect r1, Rect rd); -int Rect_PointInside(Rect r, int x, int y); -int Rect_PointInsideAny(TRect r[], int rCount, int x, int y); - -///////////////////////////// -// SolveQuadratic -// -// Solves a Quadratic equation using a, b and c coefficients. -int SolveQuadratic(float a, float b, float c, float *RMin, float *RMax); - -//////////////////////////////////////////////// -// vec2 // -////////// -// A 2D vector. -typedef float vec2[2]; -#define vec2_set(v, x, y) \ - (v)[0] = (x); \ - (v)[1] = (y) -#define vec2_copy(v1, v2) \ - (v1)[0] = (v2)[0]; \ - (v1)[1] = (v2)[1] -#define vec2_plus(v, v1, v2) \ - (v)[0] = (v1)[0] + (v2)[0]; \ - (v)[1] = (v1)[1] + (v2)[1] -#define vec2_minus(v, v1, v2) \ - (v)[0] = (v1)[0] - (v2)[0]; \ - (v)[1] = (v1)[1] - (v2)[1] -#define vec2_scale(v, v1, s) \ - (v)[0] = (v1)[0] * (s); \ - (v)[1] = (v1)[1] * (s) -#define vec2_dot(v1, v2) ((v1)[0] * (v2)[0] + (v1)[1] * (v2)[1]) -#define vec2_len(v) sqrtf((v)[0] * (v)[0] + (v)[1] * (v)[1]) -#define vec2_perp(v, n) \ - (v)[0] = -(n)[1]; \ - (v)[1] = (n)[0] -#define vec2_scaleadd(v, v1, v2, s) \ - (v)[0] = (v2)[0] * (s) + (v1)[0]; \ - (v)[1] = (v2)[1] * (s) + (v1)[1] -float vec2_norm(vec2 v); -#define vec2_interpol(v, v1, v2, f) \ - (v)[0] = (v1)[0] - f * ((v1)[0] - (v2)[0]); \ - (v)[1] = (v1)[1] - f * ((v1)[1] - (v2)[1]) -void vec2_orthogonalize4(vec2 v); -void vec2_orthogonalize8(vec2 v); - -///////////////////////////// -// Intersect_RayUnitCircle -// -// Intersection between a ray and a Unit Circle. -int Intersect_RayUnitCircle(const vec2 orig, const vec2 vel, const vec2 center, float *t); - -///////////////////////////// -// Collision_CircleCircle -// -// Collision point of a circle against another circle. -int Collision_CircleCircle(const vec2 cir1, float ra, const vec2 vel, const vec2 cb, float rb, float *t, vec2 n); - -///////////////////////////// -// Intersect_RayEdge -// -// Intersection between a ray and an edge. -int Intersect_RayEdge(const vec2 pos, const vec2 vel, const vec2 norm, const vec2 edgePos, float len, float *t); - -///////////////////////////// -// AbsMod -// -int AbsMod(int v, int d); -float AbsModFloat(float v, int d); - -///////////////////////////// -// IsBigEndian -// -int IsBigEndian(); - -///////////////////////////// -// EndsWith -// -int EndsWith(char *str, char *suffix); - -///////////////////////////// -// Rand -// - -void Rand_Seed(unsigned seed); - -unsigned Rand_Get(); - -#define Rand_GetFloat(x) (((float)(Rand_Get() % 1048576)) / 1048576.0f) - -unsigned Rand_GetBetween(int min, int max); - -///////////////////////////// -// Print -// -// Prints the formated text -int Print(char *fmt, ...); - -#endif diff --git a/src/lodepng.c b/src/lodepng.c deleted file mode 100644 index 52fff28..0000000 --- a/src/lodepng.c +++ /dev/null @@ -1,6044 +0,0 @@ -/* -LodePNG version 20160501 - -Copyright (c) 2005-2016 Lode Vandevenne - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*/ - -/* -The manual and changelog are in the header file "lodepng.h" -Rename this file to lodepng.cpp to use it for C++, or to lodepng.c to use it for C. -*/ - -#include "lodepng.h" - -#include -#include -#include - -#if defined(_MSC_VER) && (_MSC_VER >= 1310) /*Visual Studio: A few warning types are not desired here.*/ -#pragma warning(disable : 4244) /*implicit conversions: not warned by gcc -Wall -Wextra and requires too much casts*/ -#pragma warning(disable : 4996) /*VS does not like fopen, but fopen_s is not standard C so unusable here*/ -#endif /*_MSC_VER */ - -const char *LODEPNG_VERSION_STRING = "20160501"; - -/* -This source file is built up in the following large parts. The code sections -with the "LODEPNG_COMPILE_" #defines divide this up further in an intermixed way. --Tools for C and common code for PNG and Zlib --C Code for Zlib (huffman, deflate, ...) --C Code for PNG (file format chunks, adam7, PNG filters, color conversions, ...) --The C++ wrapper around all of the above -*/ - -/*The malloc, realloc and free functions defined here with "lodepng_" in front -of the name, so that you can easily change them to others related to your -platform if needed. Everything else in the code calls these. Pass --DLODEPNG_NO_COMPILE_ALLOCATORS to the compiler, or comment out -#define LODEPNG_COMPILE_ALLOCATORS in the header, to disable the ones here and -define them in your own project's source files without needing to change -lodepng source code. Don't forget to remove "static" if you copypaste them -from here.*/ - -#ifdef LODEPNG_COMPILE_ALLOCATORS -static void *lodepng_malloc(size_t size) { return malloc(size); } - -static void *lodepng_realloc(void *ptr, size_t new_size) { return realloc(ptr, new_size); } - -static void lodepng_free(void *ptr) { free(ptr); } -#else /*LODEPNG_COMPILE_ALLOCATORS*/ -void *lodepng_malloc(size_t size); -void *lodepng_realloc(void *ptr, size_t new_size); -void lodepng_free(void *ptr); -#endif /*LODEPNG_COMPILE_ALLOCATORS*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // Tools for C, and common code for PNG and Zlib. // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/* -Often in case of an error a value is assigned to a variable and then it breaks -out of a loop (to go to the cleanup phase of a function). This macro does that. -It makes the error handling code shorter and more readable. - -Example: if(!uivector_resizev(&frequencies_ll, 286, 0)) ERROR_BREAK(83); -*/ -#define CERROR_BREAK(errorvar, code) \ - { \ - errorvar = code; \ - break; \ - } - -/*version of CERROR_BREAK that assumes the common case where the error variable is named "error"*/ -#define ERROR_BREAK(code) CERROR_BREAK(error, code) - -/*Set error var to the error code, and return it.*/ -#define CERROR_RETURN_ERROR(errorvar, code) \ - { \ - errorvar = code; \ - return code; \ - } - -/*Try the code, if it returns error, also return the error.*/ -#define CERROR_TRY_RETURN(call) \ - { \ - unsigned error = call; \ - if (error) \ - return error; \ - } - -/*Set error var to the error code, and return from the void function.*/ -#define CERROR_RETURN(errorvar, code) \ - { \ - errorvar = code; \ - return; \ - } - -/* -About uivector, ucvector and string: --All of them wrap dynamic arrays or text strings in a similar way. --LodePNG was originally written in C++. The vectors replace the std::vectors that were used in the C++ version. --The string tools are made to avoid problems with compilers that declare things like strncat as deprecated. --They're not used in the interface, only internally in this file as static functions. --As with many other structs in this file, the init and cleanup functions serve as ctor and dtor. -*/ - -#ifdef LODEPNG_COMPILE_ZLIB -/*dynamic vector of unsigned ints*/ -typedef struct uivector { - unsigned *data; - size_t size; /*size in number of unsigned longs*/ - size_t allocsize; /*allocated size in bytes*/ -} uivector; - -static void uivector_cleanup(void *p) { - ((uivector *)p)->size = ((uivector *)p)->allocsize = 0; - lodepng_free(((uivector *)p)->data); - ((uivector *)p)->data = NULL; -} - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_reserve(uivector *p, size_t allocsize) { - if (allocsize > p->allocsize) { - size_t newsize = (allocsize > p->allocsize * 2) ? allocsize : (allocsize * 3 / 2); - void *data = lodepng_realloc(p->data, newsize); - if (data) { - p->allocsize = newsize; - p->data = (unsigned *)data; - } else - return 0; /*error: not enough memory*/ - } - return 1; -} - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_resize(uivector *p, size_t size) { - if (!uivector_reserve(p, size * sizeof(unsigned))) - return 0; - p->size = size; - return 1; /*success*/ -} - -/*resize and give all new elements the value*/ -static unsigned uivector_resizev(uivector *p, size_t size, unsigned value) { - size_t oldsize = p->size, i; - if (!uivector_resize(p, size)) - return 0; - for (i = oldsize; i < size; ++i) - p->data[i] = value; - return 1; -} - -static void uivector_init(uivector *p) { - p->data = NULL; - p->size = p->allocsize = 0; -} - -#ifdef LODEPNG_COMPILE_ENCODER -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_push_back(uivector *p, unsigned c) { - if (!uivector_resize(p, p->size + 1)) - return 0; - p->data[p->size - 1] = c; - return 1; -} -#endif /*LODEPNG_COMPILE_ENCODER*/ -#endif /*LODEPNG_COMPILE_ZLIB*/ - -/* /////////////////////////////////////////////////////////////////////////// */ - -/*dynamic vector of uint8_ts*/ -typedef struct ucvector { - uint8_t *data; - size_t size; /*used size*/ - size_t allocsize; /*allocated size*/ -} ucvector; - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_reserve(ucvector *p, size_t allocsize) { - if (allocsize > p->allocsize) { - size_t newsize = (allocsize > p->allocsize * 2) ? allocsize : (allocsize * 3 / 2); - void *data = lodepng_realloc(p->data, newsize); - if (data) { - p->allocsize = newsize; - p->data = (uint8_t *)data; - } else - return 0; /*error: not enough memory*/ - } - return 1; -} - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_resize(ucvector *p, size_t size) { - if (!ucvector_reserve(p, size * sizeof(uint8_t))) - return 0; - p->size = size; - return 1; /*success*/ -} - -#ifdef LODEPNG_COMPILE_PNG - -static void ucvector_cleanup(void *p) { - ((ucvector *)p)->size = ((ucvector *)p)->allocsize = 0; - lodepng_free(((ucvector *)p)->data); - ((ucvector *)p)->data = NULL; -} - -static void ucvector_init(ucvector *p) { - p->data = NULL; - p->size = p->allocsize = 0; -} -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ZLIB -/*you can both convert from vector to buffer&size and vica versa. If you use -init_buffer to take over a buffer and size, it is not needed to use cleanup*/ -static void ucvector_init_buffer(ucvector *p, uint8_t *buffer, size_t size) { - p->data = buffer; - p->allocsize = p->size = size; -} -#endif /*LODEPNG_COMPILE_ZLIB*/ - -#if (defined(LODEPNG_COMPILE_PNG) && defined(LODEPNG_COMPILE_ANCILLARY_CHUNKS)) || defined(LODEPNG_COMPILE_ENCODER) -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_push_back(ucvector *p, uint8_t c) { - if (!ucvector_resize(p, p->size + 1)) - return 0; - p->data[p->size - 1] = c; - return 1; -} -#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER)*/ - -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_PNG -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned string_resize(char **out, size_t size) { - char *data = (char *)lodepng_realloc(*out, size + 1); - if (data) { - data[size] = 0; /*null termination char*/ - *out = data; - } - return data != 0; -} - -/*init a {char*, size_t} pair for use as string*/ -static void string_init(char **out) { - *out = NULL; - string_resize(out, 0); -} - -/*free the above pair again*/ -static void string_cleanup(char **out) { - lodepng_free(*out); - *out = NULL; -} - -static void string_set(char **out, const char *in) { - size_t insize = strlen(in), i; - if (string_resize(out, insize)) { - for (i = 0; i != insize; ++i) { - (*out)[i] = in[i]; - } - } -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -/* ////////////////////////////////////////////////////////////////////////// */ - -unsigned lodepng_read32bitInt(const uint8_t *buffer) { - return (unsigned)((buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]); -} - -#if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER) -/*buffer must have at least 4 allocated bytes available*/ -static void lodepng_set32bitInt(uint8_t *buffer, unsigned value) { - buffer[0] = (uint8_t)((value >> 24) & 0xff); - buffer[1] = (uint8_t)((value >> 16) & 0xff); - buffer[2] = (uint8_t)((value >> 8) & 0xff); - buffer[3] = (uint8_t)((value) & 0xff); -} -#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER)*/ - -#ifdef LODEPNG_COMPILE_ENCODER -static void lodepng_add32bitInt(ucvector *buffer, unsigned value) { - ucvector_resize(buffer, buffer->size + 4); /*todo: give error if resize failed*/ - lodepng_set32bitInt(&buffer->data[buffer->size - 4], value); -} -#endif /*LODEPNG_COMPILE_ENCODER*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / File IO / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_DISK - -/* returns negative value on error. This should be pure C compatible, so no fstat. */ -static long lodepng_filesize(const char *filename) { - FILE *file; - long size; - file = fopen(filename, "rb"); - if (!file) - return -1; - - if (fseek(file, 0, SEEK_END) != 0) { - fclose(file); - return -1; - } - - size = ftell(file); - /* It may give LONG_MAX as directory size, this is invalid for us. */ - if (size == LONG_MAX) - size = -1; - - fclose(file); - return size; -} - -/* load file into buffer that already has the correct allocated size. Returns error code.*/ -static unsigned lodepng_buffer_file(uint8_t *out, size_t size, const char *filename) { - FILE *file; - size_t readsize; - file = fopen(filename, "rb"); - if (!file) - return 78; - - readsize = fread(out, 1, size, file); - fclose(file); - - if (readsize != size) - return 78; - return 0; -} - -unsigned lodepng_load_file(uint8_t **out, size_t *outsize, const char *filename) { - long size = lodepng_filesize(filename); - if (size < 0) - return 78; - *outsize = (size_t)size; - - *out = (uint8_t *)lodepng_malloc((size_t)size); - if (!(*out) && size > 0) - return 83; /*the above malloc failed*/ - - return lodepng_buffer_file(*out, (size_t)size, filename); -} - -/*write given buffer to the file, overwriting the file, it doesn't append to it.*/ -unsigned lodepng_save_file(const uint8_t *buffer, size_t buffersize, const char *filename) { - FILE *file; - file = fopen(filename, "wb"); - if (!file) - return 79; - fwrite((char *)buffer, 1, buffersize, file); - fclose(file); - return 0; -} - -#endif /*LODEPNG_COMPILE_DISK*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // End of common code and tools. Begin of Zlib related code. // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_ZLIB -#ifdef LODEPNG_COMPILE_ENCODER -/*TODO: this ignores potential out of memory errors*/ -#define addBitToStream(/*size_t**/ bitpointer, /*ucvector**/ bitstream, /*uint8_t*/ bit) \ - { \ - /*add a new byte at the end*/ \ - if (((*bitpointer) & 7) == 0) \ - ucvector_push_back(bitstream, (uint8_t)0); \ - /*earlier bit of huffman code is in a lesser significant bit of an earlier byte*/ \ - (bitstream->data[bitstream->size - 1]) |= (bit << ((*bitpointer) & 0x7)); \ - ++(*bitpointer); \ - } - -static void addBitsToStream(size_t *bitpointer, ucvector *bitstream, unsigned value, size_t nbits) { - size_t i; - for (i = 0; i != nbits; ++i) - addBitToStream(bitpointer, bitstream, (uint8_t)((value >> i) & 1)); -} - -static void addBitsToStreamReversed(size_t *bitpointer, ucvector *bitstream, unsigned value, size_t nbits) { - size_t i; - for (i = 0; i != nbits; ++i) - addBitToStream(bitpointer, bitstream, (uint8_t)((value >> (nbits - 1 - i)) & 1)); -} -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_DECODER - -#define READBIT(bitpointer, bitstream) ((bitstream[bitpointer >> 3] >> (bitpointer & 0x7)) & (uint8_t)1) - -static uint8_t readBitFromStream(size_t *bitpointer, const uint8_t *bitstream) { - uint8_t result = (uint8_t)(READBIT(*bitpointer, bitstream)); - ++(*bitpointer); - return result; -} - -static unsigned readBitsFromStream(size_t *bitpointer, const uint8_t *bitstream, size_t nbits) { - unsigned result = 0, i; - for (i = 0; i != nbits; ++i) { - result += ((unsigned)READBIT(*bitpointer, bitstream)) << i; - ++(*bitpointer); - } - return result; -} -#endif /*LODEPNG_COMPILE_DECODER*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Deflate - Huffman / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#define FIRST_LENGTH_CODE_INDEX 257 -#define LAST_LENGTH_CODE_INDEX 285 -/*256 literals, the end code, some length codes, and 2 unused codes*/ -#define NUM_DEFLATE_CODE_SYMBOLS 288 -/*the distance codes have their own symbols, 30 used, 2 unused*/ -#define NUM_DISTANCE_SYMBOLS 32 -/*the code length codes. 0-15: code lengths, 16: copy previous 3-6 times, 17: 3-10 zeros, 18: 11-138 zeros*/ -#define NUM_CODE_LENGTH_CODES 19 - -/*the base lengths represented by codes 257-285*/ -static const unsigned LENGTHBASE[29] = {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}; - -/*the extra bits used by codes 257-285 (added to base length)*/ -static const unsigned LENGTHEXTRA[29] = {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}; - -/*the base backwards distances (the bits of distance codes appear after length codes and use their own huffman tree)*/ -static const unsigned DISTANCEBASE[30] = {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}; - -/*the extra bits of backwards distances (added to base)*/ -static const unsigned DISTANCEEXTRA[30] = {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}; - -/*the order in which "code length alphabet code lengths" are stored, out of this -the huffman tree of the dynamic huffman tree lengths is generated*/ -static const unsigned CLCL_ORDER[NUM_CODE_LENGTH_CODES] = - {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - -/* ////////////////////////////////////////////////////////////////////////// */ - -/* -Huffman tree struct, containing multiple representations of the tree -*/ -typedef struct HuffmanTree { - unsigned *tree2d; - unsigned *tree1d; - unsigned *lengths; /*the lengths of the codes of the 1d-tree*/ - unsigned maxbitlen; /*maximum number of bits a single code can get*/ - unsigned numcodes; /*number of symbols in the alphabet = number of codes*/ -} HuffmanTree; - -/*function used for debug purposes to draw the tree in ascii art with C++*/ -/* -static void HuffmanTree_draw(HuffmanTree* tree) -{ - std::cout << "tree. length: " << tree->numcodes << " maxbitlen: " << tree->maxbitlen << std::endl; - for(size_t i = 0; i != tree->tree1d.size; ++i) - { - if(tree->lengths.data[i]) - std::cout << i << " " << tree->tree1d.data[i] << " " << tree->lengths.data[i] << std::endl; - } - std::cout << std::endl; -}*/ - -static void HuffmanTree_init(HuffmanTree *tree) { - tree->tree2d = 0; - tree->tree1d = 0; - tree->lengths = 0; -} - -static void HuffmanTree_cleanup(HuffmanTree *tree) { - lodepng_free(tree->tree2d); - lodepng_free(tree->tree1d); - lodepng_free(tree->lengths); -} - -/*the tree representation used by the decoder. return value is error*/ -static unsigned HuffmanTree_make2DTree(HuffmanTree *tree) { - unsigned nodefilled = 0; /*up to which node it is filled*/ - unsigned treepos = 0; /*position in the tree (1 of the numcodes columns)*/ - unsigned n, i; - - tree->tree2d = (unsigned *)lodepng_malloc(tree->numcodes * 2 * sizeof(unsigned)); - if (!tree->tree2d) - return 83; /*alloc fail*/ - - /* - convert tree1d[] to tree2d[][]. In the 2D array, a value of 32767 means - uninited, a value >= numcodes is an address to another bit, a value < numcodes - is a code. The 2 rows are the 2 possible bit values (0 or 1), there are as - many columns as codes - 1. - A good huffman tree has N * 2 - 1 nodes, of which N - 1 are internal nodes. - Here, the internal nodes are stored (what their 0 and 1 option point to). - There is only memory for such good tree currently, if there are more nodes - (due to too long length codes), error 55 will happen - */ - for (n = 0; n < tree->numcodes * 2; ++n) { - tree->tree2d[n] = 32767; /*32767 here means the tree2d isn't filled there yet*/ - } - - for (n = 0; n < tree->numcodes; ++n) /*the codes*/ - { - for (i = 0; i != tree->lengths[n]; ++i) /*the bits for this code*/ - { - uint8_t bit = (uint8_t)((tree->tree1d[n] >> (tree->lengths[n] - i - 1)) & 1); - /*oversubscribed, see comment in lodepng_error_text*/ - if (treepos > 2147483647 || treepos + 2 > tree->numcodes) - return 55; - if (tree->tree2d[2 * treepos + bit] == 32767) /*not yet filled in*/ - { - if (i + 1 == tree->lengths[n]) /*last bit*/ - { - tree->tree2d[2 * treepos + bit] = n; /*put the current code in it*/ - treepos = 0; - } else { - /*put address of the next step in here, first that address has to be found of course - (it's just nodefilled + 1)...*/ - ++nodefilled; - /*addresses encoded with numcodes added to it*/ - tree->tree2d[2 * treepos + bit] = nodefilled + tree->numcodes; - treepos = nodefilled; - } - } else - treepos = tree->tree2d[2 * treepos + bit] - tree->numcodes; - } - } - - for (n = 0; n < tree->numcodes * 2; ++n) { - if (tree->tree2d[n] == 32767) - tree->tree2d[n] = 0; /*remove possible remaining 32767's*/ - } - - return 0; -} - -/* -Second step for the ...makeFromLengths and ...makeFromFrequencies functions. -numcodes, lengths and maxbitlen must already be filled in correctly. return -value is error. -*/ -static unsigned HuffmanTree_makeFromLengths2(HuffmanTree *tree) { - uivector blcount; - uivector nextcode; - unsigned error = 0; - unsigned bits, n; - - uivector_init(&blcount); - uivector_init(&nextcode); - - tree->tree1d = (unsigned *)lodepng_malloc(tree->numcodes * sizeof(unsigned)); - if (!tree->tree1d) - error = 83; /*alloc fail*/ - - if (!uivector_resizev(&blcount, tree->maxbitlen + 1, 0) || !uivector_resizev(&nextcode, tree->maxbitlen + 1, 0)) - error = 83; /*alloc fail*/ - - if (!error) { - /*step 1: count number of instances of each code length*/ - for (bits = 0; bits != tree->numcodes; ++bits) - ++blcount.data[tree->lengths[bits]]; - /*step 2: generate the nextcode values*/ - for (bits = 1; bits <= tree->maxbitlen; ++bits) { - nextcode.data[bits] = (nextcode.data[bits - 1] + blcount.data[bits - 1]) << 1; - } - /*step 3: generate all the codes*/ - for (n = 0; n != tree->numcodes; ++n) { - if (tree->lengths[n] != 0) - tree->tree1d[n] = nextcode.data[tree->lengths[n]]++; - } - } - - uivector_cleanup(&blcount); - uivector_cleanup(&nextcode); - - if (!error) - return HuffmanTree_make2DTree(tree); - else - return error; -} - -/* -given the code lengths (as stored in the PNG file), generate the tree as defined -by Deflate. maxbitlen is the maximum bits that a code in the tree can have. -return value is error. -*/ -static unsigned -HuffmanTree_makeFromLengths(HuffmanTree *tree, const unsigned *bitlen, size_t numcodes, unsigned maxbitlen) { - unsigned i; - tree->lengths = (unsigned *)lodepng_malloc(numcodes * sizeof(unsigned)); - if (!tree->lengths) - return 83; /*alloc fail*/ - for (i = 0; i != numcodes; ++i) - tree->lengths[i] = bitlen[i]; - tree->numcodes = (unsigned)numcodes; /*number of symbols*/ - tree->maxbitlen = maxbitlen; - return HuffmanTree_makeFromLengths2(tree); -} - -#ifdef LODEPNG_COMPILE_ENCODER - -/*BPM: Boundary Package Merge, see "A Fast and Space-Economical Algorithm for Length-Limited Coding", -Jyrki Katajainen, Alistair Moffat, Andrew Turpin, 1995.*/ - -/*chain node for boundary package merge*/ -typedef struct BPMNode { - int weight; /*the sum of all weights in this chain*/ - unsigned index; /*index of this leaf node (called "count" in the paper)*/ - struct BPMNode *tail; /*the next nodes in this chain (null if last)*/ - int in_use; -} BPMNode; - -/*lists of chains*/ -typedef struct BPMLists { - /*memory pool*/ - unsigned memsize; - BPMNode *memory; - unsigned numfree; - unsigned nextfree; - BPMNode **freelist; - /*two heads of lookahead chains per list*/ - unsigned listsize; - BPMNode **chains0; - BPMNode **chains1; -} BPMLists; - -/*creates a new chain node with the given parameters, from the memory in the lists */ -static BPMNode *bpmnode_create(BPMLists *lists, int weight, unsigned index, BPMNode *tail) { - unsigned i; - BPMNode *result; - - /*memory full, so garbage collect*/ - if (lists->nextfree >= lists->numfree) { - /*mark only those that are in use*/ - for (i = 0; i != lists->memsize; ++i) - lists->memory[i].in_use = 0; - for (i = 0; i != lists->listsize; ++i) { - BPMNode *node; - for (node = lists->chains0[i]; node != 0; node = node->tail) - node->in_use = 1; - for (node = lists->chains1[i]; node != 0; node = node->tail) - node->in_use = 1; - } - /*collect those that are free*/ - lists->numfree = 0; - for (i = 0; i != lists->memsize; ++i) { - if (!lists->memory[i].in_use) - lists->freelist[lists->numfree++] = &lists->memory[i]; - } - lists->nextfree = 0; - } - - result = lists->freelist[lists->nextfree++]; - result->weight = weight; - result->index = index; - result->tail = tail; - return result; -} - -/*sort the leaves with stable mergesort*/ -static void bpmnode_sort(BPMNode *leaves, size_t num) { - BPMNode *mem = (BPMNode *)lodepng_malloc(sizeof(*leaves) * num); - size_t width, counter = 0; - for (width = 1; width < num; width *= 2) { - BPMNode *a = (counter & 1) ? mem : leaves; - BPMNode *b = (counter & 1) ? leaves : mem; - size_t p; - for (p = 0; p < num; p += 2 * width) { - size_t q = (p + width > num) ? num : (p + width); - size_t r = (p + 2 * width > num) ? num : (p + 2 * width); - size_t i = p, j = q, k; - for (k = p; k < r; k++) { - if (i < q && (j >= r || a[i].weight <= a[j].weight)) - b[k] = a[i++]; - else - b[k] = a[j++]; - } - } - counter++; - } - if (counter & 1) - memcpy(leaves, mem, sizeof(*leaves) * num); - lodepng_free(mem); -} - -/*Boundary Package Merge step, numpresent is the amount of leaves, and c is the current chain.*/ -static void boundaryPM(BPMLists *lists, BPMNode *leaves, size_t numpresent, int c, int num) { - unsigned lastindex = lists->chains1[c]->index; - - if (c == 0) { - if (lastindex >= numpresent) - return; - lists->chains0[c] = lists->chains1[c]; - lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, 0); - } else { - /*sum of the weights of the head nodes of the previous lookahead chains.*/ - int sum = lists->chains0[c - 1]->weight + lists->chains1[c - 1]->weight; - lists->chains0[c] = lists->chains1[c]; - if (lastindex < numpresent && sum > leaves[lastindex].weight) { - lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, lists->chains1[c]->tail); - return; - } - lists->chains1[c] = bpmnode_create(lists, sum, lastindex, lists->chains1[c - 1]); - /*in the end we are only interested in the chain of the last list, so no - need to recurse if we're at the last one (this gives measurable speedup)*/ - if (num + 1 < (int)(2 * numpresent - 2)) { - boundaryPM(lists, leaves, numpresent, c - 1, num); - boundaryPM(lists, leaves, numpresent, c - 1, num); - } - } -} - -unsigned -lodepng_huffman_code_lengths(unsigned *lengths, const unsigned *frequencies, size_t numcodes, unsigned maxbitlen) { - unsigned error = 0; - unsigned i; - size_t numpresent = 0; /*number of symbols with non-zero frequency*/ - BPMNode *leaves; /*the symbols, only those with > 0 frequency*/ - - if (numcodes == 0) - return 80; /*error: a tree of 0 symbols is not supposed to be made*/ - if ((1u << maxbitlen) < numcodes) - return 80; /*error: represent all symbols*/ - - leaves = (BPMNode *)lodepng_malloc(numcodes * sizeof(*leaves)); - if (!leaves) - return 83; /*alloc fail*/ - - for (i = 0; i != numcodes; ++i) { - if (frequencies[i] > 0) { - leaves[numpresent].weight = (int)frequencies[i]; - leaves[numpresent].index = i; - ++numpresent; - } - } - - for (i = 0; i != numcodes; ++i) - lengths[i] = 0; - - /*ensure at least two present symbols. There should be at least one symbol - according to RFC 1951 section 3.2.7. Some decoders incorrectly require two. To - make these work as well ensure there are at least two symbols. The - Package-Merge code below also doesn't work correctly if there's only one - symbol, it'd give it the theoritical 0 bits but in practice zlib wants 1 bit*/ - if (numpresent == 0) { - lengths[0] = lengths[1] = 1; /*note that for RFC 1951 section 3.2.7, only lengths[0] = 1 is needed*/ - } else if (numpresent == 1) { - lengths[leaves[0].index] = 1; - lengths[leaves[0].index == 0 ? 1 : 0] = 1; - } else { - BPMLists lists; - BPMNode *node; - - bpmnode_sort(leaves, numpresent); - - lists.listsize = maxbitlen; - lists.memsize = 2 * maxbitlen * (maxbitlen + 1); - lists.nextfree = 0; - lists.numfree = lists.memsize; - lists.memory = (BPMNode *)lodepng_malloc(lists.memsize * sizeof(*lists.memory)); - lists.freelist = (BPMNode **)lodepng_malloc(lists.memsize * sizeof(BPMNode *)); - lists.chains0 = (BPMNode **)lodepng_malloc(lists.listsize * sizeof(BPMNode *)); - lists.chains1 = (BPMNode **)lodepng_malloc(lists.listsize * sizeof(BPMNode *)); - if (!lists.memory || !lists.freelist || !lists.chains0 || !lists.chains1) - error = 83; /*alloc fail*/ - - if (!error) { - for (i = 0; i != lists.memsize; ++i) - lists.freelist[i] = &lists.memory[i]; - - bpmnode_create(&lists, leaves[0].weight, 1, 0); - bpmnode_create(&lists, leaves[1].weight, 2, 0); - - for (i = 0; i != lists.listsize; ++i) { - lists.chains0[i] = &lists.memory[0]; - lists.chains1[i] = &lists.memory[1]; - } - - /*each boundaryPM call adds one chain to the last list, and we need 2 * numpresent - 2 chains.*/ - for (i = 2; i != 2 * numpresent - 2; ++i) - boundaryPM(&lists, leaves, numpresent, (int)maxbitlen - 1, (int)i); - - for (node = lists.chains1[maxbitlen - 1]; node; node = node->tail) { - for (i = 0; i != node->index; ++i) - ++lengths[leaves[i].index]; - } - } - - lodepng_free(lists.memory); - lodepng_free(lists.freelist); - lodepng_free(lists.chains0); - lodepng_free(lists.chains1); - } - - lodepng_free(leaves); - return error; -} - -/*Create the Huffman tree given the symbol frequencies*/ -static unsigned HuffmanTree_makeFromFrequencies( - HuffmanTree *tree, const unsigned *frequencies, size_t mincodes, size_t numcodes, unsigned maxbitlen) { - unsigned error = 0; - while (!frequencies[numcodes - 1] && numcodes > mincodes) - --numcodes; /*trim zeroes*/ - tree->maxbitlen = maxbitlen; - tree->numcodes = (unsigned)numcodes; /*number of symbols*/ - tree->lengths = (unsigned *)lodepng_realloc(tree->lengths, numcodes * sizeof(unsigned)); - if (!tree->lengths) - return 83; /*alloc fail*/ - /*initialize all lengths to 0*/ - memset(tree->lengths, 0, numcodes * sizeof(unsigned)); - - error = lodepng_huffman_code_lengths(tree->lengths, frequencies, numcodes, maxbitlen); - if (!error) - error = HuffmanTree_makeFromLengths2(tree); - return error; -} - -static unsigned HuffmanTree_getCode(const HuffmanTree *tree, unsigned index) { return tree->tree1d[index]; } - -static unsigned HuffmanTree_getLength(const HuffmanTree *tree, unsigned index) { return tree->lengths[index]; } -#endif /*LODEPNG_COMPILE_ENCODER*/ - -/*get the literal and length code tree of a deflated block with fixed tree, as per the deflate specification*/ -static unsigned generateFixedLitLenTree(HuffmanTree *tree) { - unsigned i, error = 0; - unsigned *bitlen = (unsigned *)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); - if (!bitlen) - return 83; /*alloc fail*/ - - /*288 possible codes: 0-255=literals, 256=endcode, 257-285=lengthcodes, 286-287=unused*/ - for (i = 0; i <= 143; ++i) - bitlen[i] = 8; - for (i = 144; i <= 255; ++i) - bitlen[i] = 9; - for (i = 256; i <= 279; ++i) - bitlen[i] = 7; - for (i = 280; i <= 287; ++i) - bitlen[i] = 8; - - error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DEFLATE_CODE_SYMBOLS, 15); - - lodepng_free(bitlen); - return error; -} - -/*get the distance code tree of a deflated block with fixed tree, as specified in the deflate specification*/ -static unsigned generateFixedDistanceTree(HuffmanTree *tree) { - unsigned i, error = 0; - unsigned *bitlen = (unsigned *)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); - if (!bitlen) - return 83; /*alloc fail*/ - - /*there are 32 distance codes, but 30-31 are unused*/ - for (i = 0; i != NUM_DISTANCE_SYMBOLS; ++i) - bitlen[i] = 5; - error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DISTANCE_SYMBOLS, 15); - - lodepng_free(bitlen); - return error; -} - -#ifdef LODEPNG_COMPILE_DECODER - -/* -returns the code, or (unsigned)(-1) if error happened -inbitlength is the length of the complete buffer, in bits (so its byte length times 8) -*/ -static unsigned -huffmanDecodeSymbol(const uint8_t *in, size_t *bp, const HuffmanTree *codetree, size_t inbitlength) { - unsigned treepos = 0, ct; - for (;;) { - if (*bp >= inbitlength) - return (unsigned)(-1); /*error: end of input memory reached without endcode*/ - /* - decode the symbol from the tree. The "readBitFromStream" code is inlined in - the expression below because this is the biggest bottleneck while decoding - */ - ct = codetree->tree2d[(treepos << 1) + READBIT(*bp, in)]; - ++(*bp); - if (ct < codetree->numcodes) - return ct; /*the symbol is decoded, return it*/ - else - treepos = ct - codetree->numcodes; /*symbol not yet decoded, instead move tree position*/ - - if (treepos >= codetree->numcodes) - return (unsigned)(-1); /*error: it appeared outside the codetree*/ - } -} -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_DECODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Inflator (Decompressor) / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*get the tree of a deflated block with fixed tree, as specified in the deflate specification*/ -static void getTreeInflateFixed(HuffmanTree *tree_ll, HuffmanTree *tree_d) { - /*TODO: check for out of memory errors*/ - generateFixedLitLenTree(tree_ll); - generateFixedDistanceTree(tree_d); -} - -/*get the tree of a deflated block with dynamic tree, the tree itself is also Huffman compressed with a known tree*/ -static unsigned -getTreeInflateDynamic(HuffmanTree *tree_ll, HuffmanTree *tree_d, const uint8_t *in, size_t *bp, size_t inlength) { - /*make sure that length values that aren't filled in will be 0, or a wrong tree will be generated*/ - unsigned error = 0; - unsigned n, HLIT, HDIST, HCLEN, i; - size_t inbitlength = inlength * 8; - - /*see comments in deflateDynamic for explanation of the context and these variables, it is analogous*/ - unsigned *bitlen_ll = 0; /*lit,len code lengths*/ - unsigned *bitlen_d = 0; /*dist code lengths*/ - /*code length code lengths ("clcl"), the bit lengths of the huffman tree used to compress bitlen_ll and bitlen_d*/ - unsigned *bitlen_cl = 0; - HuffmanTree tree_cl; /*the code tree for code length codes (the huffman tree for compressed huffman trees)*/ - - if ((*bp) + 14 > (inlength << 3)) - return 49; /*error: the bit pointer is or will go past the memory*/ - - /*number of literal/length codes + 257. Unlike the spec, the value 257 is added to it here already*/ - HLIT = readBitsFromStream(bp, in, 5) + 257; - /*number of distance codes. Unlike the spec, the value 1 is added to it here already*/ - HDIST = readBitsFromStream(bp, in, 5) + 1; - /*number of code length codes. Unlike the spec, the value 4 is added to it here already*/ - HCLEN = readBitsFromStream(bp, in, 4) + 4; - - if ((*bp) + HCLEN * 3 > (inlength << 3)) - return 50; /*error: the bit pointer is or will go past the memory*/ - - HuffmanTree_init(&tree_cl); - - while (!error) { - /*read the code length codes out of 3 * (amount of code length codes) bits*/ - - bitlen_cl = (unsigned *)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(unsigned)); - if (!bitlen_cl) - ERROR_BREAK(83 /*alloc fail*/); - - for (i = 0; i != NUM_CODE_LENGTH_CODES; ++i) { - if (i < HCLEN) - bitlen_cl[CLCL_ORDER[i]] = readBitsFromStream(bp, in, 3); - else - bitlen_cl[CLCL_ORDER[i]] = 0; /*if not, it must stay 0*/ - } - - error = HuffmanTree_makeFromLengths(&tree_cl, bitlen_cl, NUM_CODE_LENGTH_CODES, 7); - if (error) - break; - - /*now we can use this tree to read the lengths for the tree that this function will return*/ - bitlen_ll = (unsigned *)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); - bitlen_d = (unsigned *)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); - if (!bitlen_ll || !bitlen_d) - ERROR_BREAK(83 /*alloc fail*/); - for (i = 0; i != NUM_DEFLATE_CODE_SYMBOLS; ++i) - bitlen_ll[i] = 0; - for (i = 0; i != NUM_DISTANCE_SYMBOLS; ++i) - bitlen_d[i] = 0; - - /*i is the current symbol we're reading in the part that contains the code lengths of lit/len and dist codes*/ - i = 0; - while (i < HLIT + HDIST) { - unsigned code = huffmanDecodeSymbol(in, bp, &tree_cl, inbitlength); - if (code <= 15) /*a length code*/ - { - if (i < HLIT) - bitlen_ll[i] = code; - else - bitlen_d[i - HLIT] = code; - ++i; - } else if (code == 16) /*repeat previous*/ - { - unsigned replength = 3; /*read in the 2 bits that indicate repeat length (3-6)*/ - unsigned value; /*set value to the previous code*/ - - if (i == 0) - ERROR_BREAK(54); /*can't repeat previous if i is 0*/ - - if ((*bp + 2) > inbitlength) - ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - replength += readBitsFromStream(bp, in, 2); - - if (i < HLIT + 1) - value = bitlen_ll[i - 1]; - else - value = bitlen_d[i - HLIT - 1]; - /*repeat this value in the next lengths*/ - for (n = 0; n < replength; ++n) { - if (i >= HLIT + HDIST) - ERROR_BREAK(13); /*error: i is larger than the amount of codes*/ - if (i < HLIT) - bitlen_ll[i] = value; - else - bitlen_d[i - HLIT] = value; - ++i; - } - } else if (code == 17) /*repeat "0" 3-10 times*/ - { - unsigned replength = 3; /*read in the bits that indicate repeat length*/ - if ((*bp + 3) > inbitlength) - ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - replength += readBitsFromStream(bp, in, 3); - - /*repeat this value in the next lengths*/ - for (n = 0; n < replength; ++n) { - if (i >= HLIT + HDIST) - ERROR_BREAK(14); /*error: i is larger than the amount of codes*/ - - if (i < HLIT) - bitlen_ll[i] = 0; - else - bitlen_d[i - HLIT] = 0; - ++i; - } - } else if (code == 18) /*repeat "0" 11-138 times*/ - { - unsigned replength = 11; /*read in the bits that indicate repeat length*/ - if ((*bp + 7) > inbitlength) - ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - replength += readBitsFromStream(bp, in, 7); - - /*repeat this value in the next lengths*/ - for (n = 0; n < replength; ++n) { - if (i >= HLIT + HDIST) - ERROR_BREAK(15); /*error: i is larger than the amount of codes*/ - - if (i < HLIT) - bitlen_ll[i] = 0; - else - bitlen_d[i - HLIT] = 0; - ++i; - } - } else /*if(code == (unsigned)(-1))*/ /*huffmanDecodeSymbol returns (unsigned)(-1) in case of error*/ - { - if (code == (unsigned)(-1)) { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - error = (*bp) > inbitlength ? 10 : 11; - } else - error = 16; /*unexisting code, this can never happen*/ - break; - } - } - if (error) - break; - - if (bitlen_ll[256] == 0) - ERROR_BREAK(64); /*the length of the end code 256 must be larger than 0*/ - - /*now we've finally got HLIT and HDIST, so generate the code trees, and the function is done*/ - error = HuffmanTree_makeFromLengths(tree_ll, bitlen_ll, NUM_DEFLATE_CODE_SYMBOLS, 15); - if (error) - break; - error = HuffmanTree_makeFromLengths(tree_d, bitlen_d, NUM_DISTANCE_SYMBOLS, 15); - - break; /*end of error-while*/ - } - - lodepng_free(bitlen_cl); - lodepng_free(bitlen_ll); - lodepng_free(bitlen_d); - HuffmanTree_cleanup(&tree_cl); - - return error; -} - -/*inflate a block with dynamic of fixed Huffman tree*/ -static unsigned -inflateHuffmanBlock(ucvector *out, const uint8_t *in, size_t *bp, size_t *pos, size_t inlength, unsigned btype) { - unsigned error = 0; - HuffmanTree tree_ll; /*the huffman tree for literal and length codes*/ - HuffmanTree tree_d; /*the huffman tree for distance codes*/ - size_t inbitlength = inlength * 8; - - HuffmanTree_init(&tree_ll); - HuffmanTree_init(&tree_d); - - if (btype == 1) - getTreeInflateFixed(&tree_ll, &tree_d); - else if (btype == 2) - error = getTreeInflateDynamic(&tree_ll, &tree_d, in, bp, inlength); - - while (!error) /*decode all symbols until end reached, breaks at end code*/ - { - /*code_ll is literal, length or end code*/ - unsigned code_ll = huffmanDecodeSymbol(in, bp, &tree_ll, inbitlength); - if (code_ll <= 255) /*literal symbol*/ - { - /*ucvector_push_back would do the same, but for some reason the two lines below run 10% faster*/ - if (!ucvector_resize(out, (*pos) + 1)) - ERROR_BREAK(83 /*alloc fail*/); - out->data[*pos] = (uint8_t)code_ll; - ++(*pos); - } else if (code_ll >= FIRST_LENGTH_CODE_INDEX && code_ll <= LAST_LENGTH_CODE_INDEX) /*length code*/ - { - unsigned code_d, distance; - unsigned numextrabits_l, numextrabits_d; /*extra bits for length and distance*/ - size_t start, forward, backward, length; - - /*part 1: get length base*/ - length = LENGTHBASE[code_ll - FIRST_LENGTH_CODE_INDEX]; - - /*part 2: get extra bits and add the value of that to length*/ - numextrabits_l = LENGTHEXTRA[code_ll - FIRST_LENGTH_CODE_INDEX]; - if ((*bp + numextrabits_l) > inbitlength) - ERROR_BREAK(51); /*error, bit pointer will jump past memory*/ - length += readBitsFromStream(bp, in, numextrabits_l); - - /*part 3: get distance code*/ - code_d = huffmanDecodeSymbol(in, bp, &tree_d, inbitlength); - if (code_d > 29) { - if (code_ll == (unsigned)(-1)) /*huffmanDecodeSymbol returns (unsigned)(-1) in case of error*/ - { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - error = (*bp) > inlength * 8 ? 10 : 11; - } else - error = 18; /*error: invalid distance code (30-31 are never used)*/ - break; - } - distance = DISTANCEBASE[code_d]; - - /*part 4: get extra bits from distance*/ - numextrabits_d = DISTANCEEXTRA[code_d]; - if ((*bp + numextrabits_d) > inbitlength) - ERROR_BREAK(51); /*error, bit pointer will jump past memory*/ - distance += readBitsFromStream(bp, in, numextrabits_d); - - /*part 5: fill in all the out[n] values based on the length and dist*/ - start = (*pos); - if (distance > start) - ERROR_BREAK(52); /*too long backward distance*/ - backward = start - distance; - - if (!ucvector_resize(out, (*pos) + length)) - ERROR_BREAK(83 /*alloc fail*/); - if (distance < length) { - for (forward = 0; forward < length; ++forward) { - out->data[(*pos)++] = out->data[backward++]; - } - } else { - memcpy(out->data + *pos, out->data + backward, length); - *pos += length; - } - } else if (code_ll == 256) { - break; /*end code, break the loop*/ - } else /*if(code == (unsigned)(-1))*/ /*huffmanDecodeSymbol returns (unsigned)(-1) in case of error*/ - { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - error = ((*bp) > inlength * 8) ? 10 : 11; - break; - } - } - - HuffmanTree_cleanup(&tree_ll); - HuffmanTree_cleanup(&tree_d); - - return error; -} - -static unsigned inflateNoCompression(ucvector *out, const uint8_t *in, size_t *bp, size_t *pos, size_t inlength) { - size_t p; - unsigned LEN, NLEN, n, error = 0; - - /*go to first boundary of byte*/ - while (((*bp) & 0x7) != 0) - ++(*bp); - p = (*bp) / 8; /*byte position*/ - - /*read LEN (2 bytes) and NLEN (2 bytes)*/ - if (p + 4 >= inlength) - return 52; /*error, bit pointer will jump past memory*/ - LEN = in[p] + 256u * in[p + 1]; - p += 2; - NLEN = in[p] + 256u * in[p + 1]; - p += 2; - - /*check if 16-bit NLEN is really the one's complement of LEN*/ - if (LEN + NLEN != 65535) - return 21; /*error: NLEN is not one's complement of LEN*/ - - if (!ucvector_resize(out, (*pos) + LEN)) - return 83; /*alloc fail*/ - - /*read the literal data: LEN bytes are now stored in the out buffer*/ - if (p + LEN > inlength) - return 23; /*error: reading outside of in buffer*/ - for (n = 0; n < LEN; ++n) - out->data[(*pos)++] = in[p++]; - - (*bp) = p * 8; - - return error; -} - -static unsigned -lodepng_inflatev(ucvector *out, const uint8_t *in, size_t insize, const LodePNGDecompressSettings *settings) { - /*bit pointer in the "in" data, current byte is bp >> 3, current bit is bp & 0x7 (from lsb to msb of the byte)*/ - size_t bp = 0; - unsigned BFINAL = 0; - size_t pos = 0; /*byte position in the out buffer*/ - unsigned error = 0; - - (void)settings; - - while (!BFINAL) { - unsigned BTYPE; - if (bp + 2 >= insize * 8) - return 52; /*error, bit pointer will jump past memory*/ - BFINAL = readBitFromStream(&bp, in); - BTYPE = 1u * readBitFromStream(&bp, in); - BTYPE += 2u * readBitFromStream(&bp, in); - - if (BTYPE == 3) - return 20; /*error: invalid BTYPE*/ - else if (BTYPE == 0) - error = inflateNoCompression(out, in, &bp, &pos, insize); /*no compression*/ - else - error = inflateHuffmanBlock(out, in, &bp, &pos, insize, BTYPE); /*compression, BTYPE 01 or 10*/ - - if (error) - return error; - } - - return error; -} - -unsigned lodepng_inflate( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGDecompressSettings *settings) { - unsigned error; - ucvector v; - ucvector_init_buffer(&v, *out, *outsize); - error = lodepng_inflatev(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - return error; -} - -static unsigned inflate( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGDecompressSettings *settings) { - if (settings->custom_inflate) { - return settings->custom_inflate(out, outsize, in, insize, settings); - } else { - return lodepng_inflate(out, outsize, in, insize, settings); - } -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Deflator (Compressor) / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -static const size_t MAX_SUPPORTED_DEFLATE_LENGTH = 258; - -/*bitlen is the size in bits of the code*/ -static void addHuffmanSymbol(size_t *bp, ucvector *compressed, unsigned code, unsigned bitlen) { - addBitsToStreamReversed(bp, compressed, code, bitlen); -} - -/*search the index in the array, that has the largest value smaller than or equal to the given value, -given array must be sorted (if no value is smaller, it returns the size of the given array)*/ -static size_t searchCodeIndex(const unsigned *array, size_t array_size, size_t value) { - /*binary search (only small gain over linear). TODO: use CPU log2 instruction for getting symbols instead*/ - size_t left = 1; - size_t right = array_size - 1; - - while (left <= right) { - size_t mid = (left + right) >> 1; - if (array[mid] >= value) - right = mid - 1; - else - left = mid + 1; - } - if (left >= array_size || array[left] > value) - left--; - return left; -} - -static void addLengthDistance(uivector *values, size_t length, size_t distance) { - /*values in encoded vector are those used by deflate: - 0-255: literal bytes - 256: end - 257-285: length/distance pair (length code, followed by extra length bits, distance code, extra distance bits) - 286-287: invalid*/ - - unsigned length_code = (unsigned)searchCodeIndex(LENGTHBASE, 29, length); - unsigned extra_length = (unsigned)(length - LENGTHBASE[length_code]); - unsigned dist_code = (unsigned)searchCodeIndex(DISTANCEBASE, 30, distance); - unsigned extra_distance = (unsigned)(distance - DISTANCEBASE[dist_code]); - - uivector_push_back(values, length_code + FIRST_LENGTH_CODE_INDEX); - uivector_push_back(values, extra_length); - uivector_push_back(values, dist_code); - uivector_push_back(values, extra_distance); -} - -/*3 bytes of data get encoded into two bytes. The hash cannot use more than 3 -bytes as input because 3 is the minimum match length for deflate*/ -static const unsigned HASH_NUM_VALUES = 65536; -static const unsigned HASH_BIT_MASK = 65535; /*HASH_NUM_VALUES - 1, but C90 does not like that as initializer*/ - -typedef struct Hash { - int *head; /*hash value to head circular pos - can be outdated if went around window*/ - /*circular pos to prev circular pos*/ - unsigned short *chain; - int *val; /*circular pos to hash value*/ - - /*TODO: do this not only for zeros but for any repeated byte. However for PNG - it's always going to be the zeros that dominate, so not important for PNG*/ - int *headz; /*similar to head, but for chainz*/ - unsigned short *chainz; /*those with same amount of zeros*/ - unsigned short *zeros; /*length of zeros streak, used as a second hash chain*/ -} Hash; - -static unsigned hash_init(Hash *hash, unsigned windowsize) { - unsigned i; - hash->head = (int *)lodepng_malloc(sizeof(int) * HASH_NUM_VALUES); - hash->val = (int *)lodepng_malloc(sizeof(int) * windowsize); - hash->chain = (unsigned short *)lodepng_malloc(sizeof(unsigned short) * windowsize); - - hash->zeros = (unsigned short *)lodepng_malloc(sizeof(unsigned short) * windowsize); - hash->headz = (int *)lodepng_malloc(sizeof(int) * (MAX_SUPPORTED_DEFLATE_LENGTH + 1)); - hash->chainz = (unsigned short *)lodepng_malloc(sizeof(unsigned short) * windowsize); - - if (!hash->head || !hash->chain || !hash->val || !hash->headz || !hash->chainz || !hash->zeros) { - return 83; /*alloc fail*/ - } - - /*initialize hash table*/ - for (i = 0; i != HASH_NUM_VALUES; ++i) - hash->head[i] = -1; - for (i = 0; i != windowsize; ++i) - hash->val[i] = -1; - for (i = 0; i != windowsize; ++i) - hash->chain[i] = i; /*same value as index indicates uninitialized*/ - - for (i = 0; i <= MAX_SUPPORTED_DEFLATE_LENGTH; ++i) - hash->headz[i] = -1; - for (i = 0; i != windowsize; ++i) - hash->chainz[i] = i; /*same value as index indicates uninitialized*/ - - return 0; -} - -static void hash_cleanup(Hash *hash) { - lodepng_free(hash->head); - lodepng_free(hash->val); - lodepng_free(hash->chain); - - lodepng_free(hash->zeros); - lodepng_free(hash->headz); - lodepng_free(hash->chainz); -} - -static unsigned getHash(const uint8_t *data, size_t size, size_t pos) { - unsigned result = 0; - if (pos + 2 < size) { - /*A simple shift and xor hash is used. Since the data of PNGs is dominated - by zeroes due to the filters, a better hash does not have a significant - effect on speed in traversing the chain, and causes more time spend on - calculating the hash.*/ - result ^= (unsigned)(data[pos + 0] << 0u); - result ^= (unsigned)(data[pos + 1] << 4u); - result ^= (unsigned)(data[pos + 2] << 8u); - } else { - size_t amount, i; - if (pos >= size) - return 0; - amount = size - pos; - for (i = 0; i != amount; ++i) - result ^= (unsigned)(data[pos + i] << (i * 8u)); - } - return result & HASH_BIT_MASK; -} - -static unsigned countZeros(const uint8_t *data, size_t size, size_t pos) { - const uint8_t *start = data + pos; - const uint8_t *end = start + MAX_SUPPORTED_DEFLATE_LENGTH; - if (end > data + size) - end = data + size; - data = start; - while (data != end && *data == 0) - ++data; - /*subtracting two addresses returned as 32-bit number (max value is MAX_SUPPORTED_DEFLATE_LENGTH)*/ - return (unsigned)(data - start); -} - -/*wpos = pos & (windowsize - 1)*/ -static void updateHashChain(Hash *hash, size_t wpos, unsigned hashval, unsigned short numzeros) { - hash->val[wpos] = (int)hashval; - if (hash->head[hashval] != -1) - hash->chain[wpos] = hash->head[hashval]; - hash->head[hashval] = wpos; - - hash->zeros[wpos] = numzeros; - if (hash->headz[numzeros] != -1) - hash->chainz[wpos] = hash->headz[numzeros]; - hash->headz[numzeros] = wpos; -} - -/* -LZ77-encode the data. Return value is error code. The input are raw bytes, the output -is in the form of unsigned integers with codes representing for example literal bytes, or -length/distance pairs. -It uses a hash table technique to let it encode faster. When doing LZ77 encoding, a -sliding window (of windowsize) is used, and all past bytes in that window can be used as -the "dictionary". A brute force search through all possible distances would be slow, and -this hash technique is one out of several ways to speed this up. -*/ -static unsigned encodeLZ77( - uivector *out, Hash *hash, const uint8_t *in, size_t inpos, size_t insize, unsigned windowsize, - unsigned minmatch, unsigned nicematch, unsigned lazymatching) { - size_t pos; - unsigned i, error = 0; - /*for large window lengths, assume the user wants no compression loss. Otherwise, max hash chain length speedup.*/ - unsigned maxchainlength = windowsize >= 8192 ? windowsize : windowsize / 8; - unsigned maxlazymatch = windowsize >= 8192 ? MAX_SUPPORTED_DEFLATE_LENGTH : 64; - - unsigned usezeros = 1; /*not sure if setting it to false for windowsize < 8192 is better or worse*/ - unsigned numzeros = 0; - - unsigned offset; /*the offset represents the distance in LZ77 terminology*/ - unsigned length; - unsigned lazy = 0; - unsigned lazylength = 0, lazyoffset = 0; - unsigned hashval; - unsigned current_offset, current_length; - unsigned prev_offset; - const uint8_t *lastptr, *foreptr, *backptr; - unsigned hashpos; - - if (windowsize == 0 || windowsize > 32768) - return 60; /*error: windowsize smaller/larger than allowed*/ - if ((windowsize & (windowsize - 1)) != 0) - return 90; /*error: must be power of two*/ - - if (nicematch > MAX_SUPPORTED_DEFLATE_LENGTH) - nicematch = MAX_SUPPORTED_DEFLATE_LENGTH; - - for (pos = inpos; pos < insize; ++pos) { - size_t wpos = pos & (windowsize - 1); /*position for in 'circular' hash buffers*/ - unsigned chainlength = 0; - - hashval = getHash(in, insize, pos); - - if (usezeros && hashval == 0) { - if (numzeros == 0) - numzeros = countZeros(in, insize, pos); - else if (pos + numzeros > insize || in[pos + numzeros - 1] != 0) - --numzeros; - } else { - numzeros = 0; - } - - updateHashChain(hash, wpos, hashval, numzeros); - - /*the length and offset found for the current position*/ - length = 0; - offset = 0; - - hashpos = hash->chain[wpos]; - - lastptr = &in[insize < pos + MAX_SUPPORTED_DEFLATE_LENGTH ? insize : pos + MAX_SUPPORTED_DEFLATE_LENGTH]; - - /*search for the longest string*/ - prev_offset = 0; - for (;;) { - if (chainlength++ >= maxchainlength) - break; - current_offset = hashpos <= wpos ? wpos - hashpos : wpos - hashpos + windowsize; - - if (current_offset < prev_offset) - break; /*stop when went completely around the circular buffer*/ - prev_offset = current_offset; - if (current_offset > 0) { - /*test the next characters*/ - foreptr = &in[pos]; - backptr = &in[pos - current_offset]; - - /*common case in PNGs is lots of zeros. Quickly skip over them as a speedup*/ - if (numzeros >= 3) { - unsigned skip = hash->zeros[hashpos]; - if (skip > numzeros) - skip = numzeros; - backptr += skip; - foreptr += skip; - } - - while (foreptr != lastptr && *backptr == *foreptr) /*maximum supported length by deflate is max length*/ - { - ++backptr; - ++foreptr; - } - current_length = (unsigned)(foreptr - &in[pos]); - - if (current_length > length) { - length = current_length; /*the longest length*/ - offset = current_offset; /*the offset that is related to this longest length*/ - /*jump out once a length of max length is found (speed gain). This also jumps - out if length is MAX_SUPPORTED_DEFLATE_LENGTH*/ - if (current_length >= nicematch) - break; - } - } - - if (hashpos == hash->chain[hashpos]) - break; - - if (numzeros >= 3 && length > numzeros) { - hashpos = hash->chainz[hashpos]; - if (hash->zeros[hashpos] != numzeros) - break; - } else { - hashpos = hash->chain[hashpos]; - /*outdated hash value, happens if particular value was not encountered in whole last window*/ - if (hash->val[hashpos] != (int)hashval) - break; - } - } - - if (lazymatching) { - if (!lazy && length >= 3 && length <= maxlazymatch && length < MAX_SUPPORTED_DEFLATE_LENGTH) { - lazy = 1; - lazylength = length; - lazyoffset = offset; - continue; /*try the next byte*/ - } - if (lazy) { - lazy = 0; - if (pos == 0) - ERROR_BREAK(81); - if (length > lazylength + 1) { - /*push the previous character as literal*/ - if (!uivector_push_back(out, in[pos - 1])) - ERROR_BREAK(83 /*alloc fail*/); - } else { - length = lazylength; - offset = lazyoffset; - hash->head[hashval] = - -1; /*the same hashchain update will be done, this ensures no wrong alteration*/ - hash->headz[numzeros] = -1; /*idem*/ - --pos; - } - } - } - if (length >= 3 && offset > windowsize) - ERROR_BREAK(86 /*too big (or overflown negative) offset*/); - - /*encode it as length/distance pair or literal value*/ - if (length < 3) /*only lengths of 3 or higher are supported as length/distance pair*/ - { - if (!uivector_push_back(out, in[pos])) - ERROR_BREAK(83 /*alloc fail*/); - } else if (length < minmatch || (length == 3 && offset > 4096)) { - /*compensate for the fact that longer offsets have more extra bits, a - length of only 3 may be not worth it then*/ - if (!uivector_push_back(out, in[pos])) - ERROR_BREAK(83 /*alloc fail*/); - } else { - addLengthDistance(out, length, offset); - for (i = 1; i < length; ++i) { - ++pos; - wpos = pos & (windowsize - 1); - hashval = getHash(in, insize, pos); - if (usezeros && hashval == 0) { - if (numzeros == 0) - numzeros = countZeros(in, insize, pos); - else if (pos + numzeros > insize || in[pos + numzeros - 1] != 0) - --numzeros; - } else { - numzeros = 0; - } - updateHashChain(hash, wpos, hashval, numzeros); - } - } - } /*end of the loop through each character of input*/ - - return error; -} - -/* /////////////////////////////////////////////////////////////////////////// */ - -static unsigned deflateNoCompression(ucvector *out, const uint8_t *data, size_t datasize) { - /*non compressed deflate block data: 1 bit BFINAL,2 bits BTYPE,(5 bits): it jumps to start of next byte, - 2 bytes LEN, 2 bytes NLEN, LEN bytes literal DATA*/ - - size_t i, j, numdeflateblocks = (datasize + 65534) / 65535; - unsigned datapos = 0; - for (i = 0; i != numdeflateblocks; ++i) { - unsigned BFINAL, BTYPE, LEN, NLEN; - uint8_t firstbyte; - - BFINAL = (i == numdeflateblocks - 1); - BTYPE = 0; - - firstbyte = (uint8_t)(BFINAL + ((BTYPE & 1) << 1) + ((BTYPE & 2) << 1)); - ucvector_push_back(out, firstbyte); - - LEN = 65535; - if (datasize - datapos < 65535) - LEN = (unsigned)datasize - datapos; - NLEN = 65535 - LEN; - - ucvector_push_back(out, (uint8_t)(LEN & 255)); - ucvector_push_back(out, (uint8_t)(LEN >> 8)); - ucvector_push_back(out, (uint8_t)(NLEN & 255)); - ucvector_push_back(out, (uint8_t)(NLEN >> 8)); - - /*Decompressed data*/ - for (j = 0; j < 65535 && datapos < datasize; ++j) { - ucvector_push_back(out, data[datapos++]); - } - } - - return 0; -} - -/* -write the lz77-encoded data, which has lit, len and dist codes, to compressed stream using huffman trees. -tree_ll: the tree for lit and len codes. -tree_d: the tree for distance codes. -*/ -static void writeLZ77data( - size_t *bp, ucvector *out, const uivector *lz77_encoded, const HuffmanTree *tree_ll, const HuffmanTree *tree_d) { - size_t i = 0; - for (i = 0; i != lz77_encoded->size; ++i) { - unsigned val = lz77_encoded->data[i]; - addHuffmanSymbol(bp, out, HuffmanTree_getCode(tree_ll, val), HuffmanTree_getLength(tree_ll, val)); - if (val > 256) /*for a length code, 3 more things have to be added*/ - { - unsigned length_index = val - FIRST_LENGTH_CODE_INDEX; - unsigned n_length_extra_bits = LENGTHEXTRA[length_index]; - unsigned length_extra_bits = lz77_encoded->data[++i]; - - unsigned distance_code = lz77_encoded->data[++i]; - - unsigned distance_index = distance_code; - unsigned n_distance_extra_bits = DISTANCEEXTRA[distance_index]; - unsigned distance_extra_bits = lz77_encoded->data[++i]; - - addBitsToStream(bp, out, length_extra_bits, n_length_extra_bits); - addHuffmanSymbol( - bp, out, HuffmanTree_getCode(tree_d, distance_code), HuffmanTree_getLength(tree_d, distance_code)); - addBitsToStream(bp, out, distance_extra_bits, n_distance_extra_bits); - } - } -} - -/*Deflate for a block of type "dynamic", that is, with freely, optimally, created huffman trees*/ -static unsigned deflateDynamic( - ucvector *out, size_t *bp, Hash *hash, const uint8_t *data, size_t datapos, size_t dataend, - const LodePNGCompressSettings *settings, unsigned final) { - unsigned error = 0; - - /* - A block is compressed as follows: The PNG data is lz77 encoded, resulting in - literal bytes and length/distance pairs. This is then huffman compressed with - two huffman trees. One huffman tree is used for the lit and len values ("ll"), - another huffman tree is used for the dist values ("d"). These two trees are - stored using their code lengths, and to compress even more these code lengths - are also run-length encoded and huffman compressed. This gives a huffman tree - of code lengths "cl". The code lenghts used to describe this third tree are - the code length code lengths ("clcl"). - */ - - /*The lz77 encoded data, represented with integers since there will also be length and distance codes in it*/ - uivector lz77_encoded; - HuffmanTree tree_ll; /*tree for lit,len values*/ - HuffmanTree tree_d; /*tree for distance codes*/ - HuffmanTree tree_cl; /*tree for encoding the code lengths representing tree_ll and tree_d*/ - uivector frequencies_ll; /*frequency of lit,len codes*/ - uivector frequencies_d; /*frequency of dist codes*/ - uivector frequencies_cl; /*frequency of code length codes*/ - uivector bitlen_lld; /*lit,len,dist code lenghts (int bits), literally (without repeat codes).*/ - uivector bitlen_lld_e; /*bitlen_lld encoded with repeat codes (this is a rudemtary run length compression)*/ - /*bitlen_cl is the code length code lengths ("clcl"). The bit lengths of codes to represent tree_cl - (these are written as is in the file, it would be crazy to compress these using yet another huffman - tree that needs to be represented by yet another set of code lengths)*/ - uivector bitlen_cl; - size_t datasize = dataend - datapos; - - /* - Due to the huffman compression of huffman tree representations ("two levels"), there are some anologies: - bitlen_lld is to tree_cl what data is to tree_ll and tree_d. - bitlen_lld_e is to bitlen_lld what lz77_encoded is to data. - bitlen_cl is to bitlen_lld_e what bitlen_lld is to lz77_encoded. - */ - - unsigned BFINAL = final; - size_t numcodes_ll, numcodes_d, i; - unsigned HLIT, HDIST, HCLEN; - - uivector_init(&lz77_encoded); - HuffmanTree_init(&tree_ll); - HuffmanTree_init(&tree_d); - HuffmanTree_init(&tree_cl); - uivector_init(&frequencies_ll); - uivector_init(&frequencies_d); - uivector_init(&frequencies_cl); - uivector_init(&bitlen_lld); - uivector_init(&bitlen_lld_e); - uivector_init(&bitlen_cl); - - /*This while loop never loops due to a break at the end, it is here to - allow breaking out of it to the cleanup phase on error conditions.*/ - while (!error) { - if (settings->use_lz77) { - error = encodeLZ77( - &lz77_encoded, - hash, - data, - datapos, - dataend, - settings->windowsize, - settings->minmatch, - settings->nicematch, - settings->lazymatching); - if (error) - break; - } else { - if (!uivector_resize(&lz77_encoded, datasize)) - ERROR_BREAK(83 /*alloc fail*/); - for (i = datapos; i < dataend; ++i) - lz77_encoded.data[i - datapos] = data[i]; /*no LZ77, but still will be Huffman compressed*/ - } - - if (!uivector_resizev(&frequencies_ll, 286, 0)) - ERROR_BREAK(83 /*alloc fail*/); - if (!uivector_resizev(&frequencies_d, 30, 0)) - ERROR_BREAK(83 /*alloc fail*/); - - /*Count the frequencies of lit, len and dist codes*/ - for (i = 0; i != lz77_encoded.size; ++i) { - unsigned symbol = lz77_encoded.data[i]; - ++frequencies_ll.data[symbol]; - if (symbol > 256) { - unsigned dist = lz77_encoded.data[i + 2]; - ++frequencies_d.data[dist]; - i += 3; - } - } - frequencies_ll.data[256] = 1; /*there will be exactly 1 end code, at the end of the block*/ - - /*Make both huffman trees, one for the lit and len codes, one for the dist codes*/ - error = HuffmanTree_makeFromFrequencies(&tree_ll, frequencies_ll.data, 257, frequencies_ll.size, 15); - if (error) - break; - /*2, not 1, is chosen for mincodes: some buggy PNG decoders require at least 2 symbols in the dist tree*/ - error = HuffmanTree_makeFromFrequencies(&tree_d, frequencies_d.data, 2, frequencies_d.size, 15); - if (error) - break; - - numcodes_ll = tree_ll.numcodes; - if (numcodes_ll > 286) - numcodes_ll = 286; - numcodes_d = tree_d.numcodes; - if (numcodes_d > 30) - numcodes_d = 30; - /*store the code lengths of both generated trees in bitlen_lld*/ - for (i = 0; i != numcodes_ll; ++i) - uivector_push_back(&bitlen_lld, HuffmanTree_getLength(&tree_ll, (unsigned)i)); - for (i = 0; i != numcodes_d; ++i) - uivector_push_back(&bitlen_lld, HuffmanTree_getLength(&tree_d, (unsigned)i)); - - /*run-length compress bitlen_ldd into bitlen_lld_e by using repeat codes 16 (copy length 3-6 times), - 17 (3-10 zeroes), 18 (11-138 zeroes)*/ - for (i = 0; i != (unsigned)bitlen_lld.size; ++i) { - unsigned j = 0; /*amount of repititions*/ - while (i + j + 1 < (unsigned)bitlen_lld.size && bitlen_lld.data[i + j + 1] == bitlen_lld.data[i]) - ++j; - - if (bitlen_lld.data[i] == 0 && j >= 2) /*repeat code for zeroes*/ - { - ++j; /*include the first zero*/ - if (j <= 10) /*repeat code 17 supports max 10 zeroes*/ - { - uivector_push_back(&bitlen_lld_e, 17); - uivector_push_back(&bitlen_lld_e, j - 3); - } else /*repeat code 18 supports max 138 zeroes*/ - { - if (j > 138) - j = 138; - uivector_push_back(&bitlen_lld_e, 18); - uivector_push_back(&bitlen_lld_e, j - 11); - } - i += (j - 1); - } else if (j >= 3) /*repeat code for value other than zero*/ - { - size_t k; - unsigned num = j / 6, rest = j % 6; - uivector_push_back(&bitlen_lld_e, bitlen_lld.data[i]); - for (k = 0; k < num; ++k) { - uivector_push_back(&bitlen_lld_e, 16); - uivector_push_back(&bitlen_lld_e, 6 - 3); - } - if (rest >= 3) { - uivector_push_back(&bitlen_lld_e, 16); - uivector_push_back(&bitlen_lld_e, rest - 3); - } else - j -= rest; - i += j; - } else /*too short to benefit from repeat code*/ - { - uivector_push_back(&bitlen_lld_e, bitlen_lld.data[i]); - } - } - - /*generate tree_cl, the huffmantree of huffmantrees*/ - - if (!uivector_resizev(&frequencies_cl, NUM_CODE_LENGTH_CODES, 0)) - ERROR_BREAK(83 /*alloc fail*/); - for (i = 0; i != bitlen_lld_e.size; ++i) { - ++frequencies_cl.data[bitlen_lld_e.data[i]]; - /*after a repeat code come the bits that specify the number of repetitions, - those don't need to be in the frequencies_cl calculation*/ - if (bitlen_lld_e.data[i] >= 16) - ++i; - } - - error = - HuffmanTree_makeFromFrequencies(&tree_cl, frequencies_cl.data, frequencies_cl.size, frequencies_cl.size, 7); - if (error) - break; - - if (!uivector_resize(&bitlen_cl, tree_cl.numcodes)) - ERROR_BREAK(83 /*alloc fail*/); - for (i = 0; i != tree_cl.numcodes; ++i) { - /*lenghts of code length tree is in the order as specified by deflate*/ - bitlen_cl.data[i] = HuffmanTree_getLength(&tree_cl, CLCL_ORDER[i]); - } - while (bitlen_cl.data[bitlen_cl.size - 1] == 0 && bitlen_cl.size > 4) { - /*remove zeros at the end, but minimum size must be 4*/ - if (!uivector_resize(&bitlen_cl, bitlen_cl.size - 1)) - ERROR_BREAK(83 /*alloc fail*/); - } - if (error) - break; - - /* - Write everything into the output - - After the BFINAL and BTYPE, the dynamic block consists out of the following: - - 5 bits HLIT, 5 bits HDIST, 4 bits HCLEN - - (HCLEN+4)*3 bits code lengths of code length alphabet - - HLIT + 257 code lenghts of lit/length alphabet (encoded using the code length - alphabet, + possible repetition codes 16, 17, 18) - - HDIST + 1 code lengths of distance alphabet (encoded using the code length - alphabet, + possible repetition codes 16, 17, 18) - - compressed data - - 256 (end code) - */ - - /*Write block type*/ - addBitToStream(bp, out, BFINAL); - addBitToStream(bp, out, 0); /*first bit of BTYPE "dynamic"*/ - addBitToStream(bp, out, 1); /*second bit of BTYPE "dynamic"*/ - - /*write the HLIT, HDIST and HCLEN values*/ - HLIT = (unsigned)(numcodes_ll - 257); - HDIST = (unsigned)(numcodes_d - 1); - HCLEN = (unsigned)bitlen_cl.size - 4; - /*trim zeroes for HCLEN. HLIT and HDIST were already trimmed at tree creation*/ - while (!bitlen_cl.data[HCLEN + 4 - 1] && HCLEN > 0) - --HCLEN; - addBitsToStream(bp, out, HLIT, 5); - addBitsToStream(bp, out, HDIST, 5); - addBitsToStream(bp, out, HCLEN, 4); - - /*write the code lenghts of the code length alphabet*/ - for (i = 0; i != HCLEN + 4; ++i) - addBitsToStream(bp, out, bitlen_cl.data[i], 3); - - /*write the lenghts of the lit/len AND the dist alphabet*/ - for (i = 0; i != bitlen_lld_e.size; ++i) { - addHuffmanSymbol( - bp, - out, - HuffmanTree_getCode(&tree_cl, bitlen_lld_e.data[i]), - HuffmanTree_getLength(&tree_cl, bitlen_lld_e.data[i])); - /*extra bits of repeat codes*/ - if (bitlen_lld_e.data[i] == 16) - addBitsToStream(bp, out, bitlen_lld_e.data[++i], 2); - else if (bitlen_lld_e.data[i] == 17) - addBitsToStream(bp, out, bitlen_lld_e.data[++i], 3); - else if (bitlen_lld_e.data[i] == 18) - addBitsToStream(bp, out, bitlen_lld_e.data[++i], 7); - } - - /*write the compressed data symbols*/ - writeLZ77data(bp, out, &lz77_encoded, &tree_ll, &tree_d); - /*error: the length of the end code 256 must be larger than 0*/ - if (HuffmanTree_getLength(&tree_ll, 256) == 0) - ERROR_BREAK(64); - - /*write the end code*/ - addHuffmanSymbol(bp, out, HuffmanTree_getCode(&tree_ll, 256), HuffmanTree_getLength(&tree_ll, 256)); - - break; /*end of error-while*/ - } - - /*cleanup*/ - uivector_cleanup(&lz77_encoded); - HuffmanTree_cleanup(&tree_ll); - HuffmanTree_cleanup(&tree_d); - HuffmanTree_cleanup(&tree_cl); - uivector_cleanup(&frequencies_ll); - uivector_cleanup(&frequencies_d); - uivector_cleanup(&frequencies_cl); - uivector_cleanup(&bitlen_lld_e); - uivector_cleanup(&bitlen_lld); - uivector_cleanup(&bitlen_cl); - - return error; -} - -static unsigned deflateFixed( - ucvector *out, size_t *bp, Hash *hash, const uint8_t *data, size_t datapos, size_t dataend, - const LodePNGCompressSettings *settings, unsigned final) { - HuffmanTree tree_ll; /*tree for literal values and length codes*/ - HuffmanTree tree_d; /*tree for distance codes*/ - - unsigned BFINAL = final; - unsigned error = 0; - size_t i; - - HuffmanTree_init(&tree_ll); - HuffmanTree_init(&tree_d); - - generateFixedLitLenTree(&tree_ll); - generateFixedDistanceTree(&tree_d); - - addBitToStream(bp, out, BFINAL); - addBitToStream(bp, out, 1); /*first bit of BTYPE*/ - addBitToStream(bp, out, 0); /*second bit of BTYPE*/ - - if (settings->use_lz77) /*LZ77 encoded*/ - { - uivector lz77_encoded; - uivector_init(&lz77_encoded); - error = encodeLZ77( - &lz77_encoded, - hash, - data, - datapos, - dataend, - settings->windowsize, - settings->minmatch, - settings->nicematch, - settings->lazymatching); - if (!error) - writeLZ77data(bp, out, &lz77_encoded, &tree_ll, &tree_d); - uivector_cleanup(&lz77_encoded); - } else /*no LZ77, but still will be Huffman compressed*/ - { - for (i = datapos; i < dataend; ++i) { - addHuffmanSymbol(bp, out, HuffmanTree_getCode(&tree_ll, data[i]), HuffmanTree_getLength(&tree_ll, data[i])); - } - } - /*add END code*/ - if (!error) - addHuffmanSymbol(bp, out, HuffmanTree_getCode(&tree_ll, 256), HuffmanTree_getLength(&tree_ll, 256)); - - /*cleanup*/ - HuffmanTree_cleanup(&tree_ll); - HuffmanTree_cleanup(&tree_d); - - return error; -} - -static unsigned -lodepng_deflatev(ucvector *out, const uint8_t *in, size_t insize, const LodePNGCompressSettings *settings) { - unsigned error = 0; - size_t i, blocksize, numdeflateblocks; - size_t bp = 0; /*the bit pointer*/ - Hash hash; - - if (settings->btype > 2) - return 61; - else if (settings->btype == 0) - return deflateNoCompression(out, in, insize); - else if (settings->btype == 1) - blocksize = insize; - else /*if(settings->btype == 2)*/ - { - /*on PNGs, deflate blocks of 65-262k seem to give most dense encoding*/ - blocksize = insize / 8 + 8; - if (blocksize < 65536) - blocksize = 65536; - if (blocksize > 262144) - blocksize = 262144; - } - - numdeflateblocks = (insize + blocksize - 1) / blocksize; - if (numdeflateblocks == 0) - numdeflateblocks = 1; - - error = hash_init(&hash, settings->windowsize); - if (error) - return error; - - for (i = 0; i != numdeflateblocks && !error; ++i) { - unsigned final = (i == numdeflateblocks - 1); - size_t start = i * blocksize; - size_t end = start + blocksize; - if (end > insize) - end = insize; - - if (settings->btype == 1) - error = deflateFixed(out, &bp, &hash, in, start, end, settings, final); - else if (settings->btype == 2) - error = deflateDynamic(out, &bp, &hash, in, start, end, settings, final); - } - - hash_cleanup(&hash); - - return error; -} - -unsigned lodepng_deflate( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGCompressSettings *settings) { - unsigned error; - ucvector v; - ucvector_init_buffer(&v, *out, *outsize); - error = lodepng_deflatev(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - return error; -} - -static unsigned deflate( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGCompressSettings *settings) { - if (settings->custom_deflate) { - return settings->custom_deflate(out, outsize, in, insize, settings); - } else { - return lodepng_deflate(out, outsize, in, insize, settings); - } -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Adler32 */ -/* ////////////////////////////////////////////////////////////////////////// */ - -static unsigned update_adler32(unsigned adler, const uint8_t *data, unsigned len) { - unsigned s1 = adler & 0xffff; - unsigned s2 = (adler >> 16) & 0xffff; - - while (len > 0) { - /*at least 5550 sums can be done before the sums overflow, saving a lot of module divisions*/ - unsigned amount = len > 5550 ? 5550 : len; - len -= amount; - while (amount > 0) { - s1 += (*data++); - s2 += s1; - --amount; - } - s1 %= 65521; - s2 %= 65521; - } - - return (s2 << 16) | s1; -} - -/*Return the adler32 of the bytes data[0..len-1]*/ -static unsigned adler32(const uint8_t *data, unsigned len) { return update_adler32(1L, data, len); } - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Zlib / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_DECODER - -unsigned lodepng_zlib_decompress( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGDecompressSettings *settings) { - unsigned error = 0; - unsigned CM, CINFO, FDICT; - - if (insize < 2) - return 53; /*error, size of zlib data too small*/ - /*read information from zlib header*/ - if ((in[0] * 256 + in[1]) % 31 != 0) { - /*error: 256 * in[0] + in[1] must be a multiple of 31, the FCHECK value is supposed to be made that way*/ - return 24; - } - - CM = in[0] & 15; - CINFO = (in[0] >> 4) & 15; - /*FCHECK = in[1] & 31;*/ /*FCHECK is already tested above*/ - FDICT = (in[1] >> 5) & 1; - /*FLEVEL = (in[1] >> 6) & 3;*/ /*FLEVEL is not used here*/ - - if (CM != 8 || CINFO > 7) { - /*error: only compression method 8: inflate with sliding window of 32k is supported by the PNG spec*/ - return 25; - } - if (FDICT != 0) { - /*error: the specification of PNG says about the zlib stream: - "The additional flags shall not specify a preset dictionary."*/ - return 26; - } - - error = inflate(out, outsize, in + 2, insize - 2, settings); - if (error) - return error; - - if (!settings->ignore_adler32) { - unsigned ADLER32 = lodepng_read32bitInt(&in[insize - 4]); - unsigned checksum = adler32(*out, (unsigned)(*outsize)); - if (checksum != ADLER32) - return 58; /*error, adler checksum not correct, data must be corrupted*/ - } - - return 0; /*no error*/ -} - -static unsigned zlib_decompress( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGDecompressSettings *settings) { - if (settings->custom_zlib) { - return settings->custom_zlib(out, outsize, in, insize, settings); - } else { - return lodepng_zlib_decompress(out, outsize, in, insize, settings); - } -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER - -unsigned lodepng_zlib_compress( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGCompressSettings *settings) { - /*initially, *out must be NULL and outsize 0, if you just give some random *out - that's pointing to a non allocated buffer, this'll crash*/ - ucvector outv; - size_t i; - unsigned error; - uint8_t *deflatedata = 0; - size_t deflatesize = 0; - - /*zlib data: 1 byte CMF (CM+CINFO), 1 byte FLG, deflate data, 4 byte ADLER32 checksum of the Decompressed data*/ - unsigned CMF = 120; /*0b01111000: CM 8, CINFO 7. With CINFO 7, any window size up to 32768 can be used.*/ - unsigned FLEVEL = 0; - unsigned FDICT = 0; - unsigned CMFFLG = 256 * CMF + FDICT * 32 + FLEVEL * 64; - unsigned FCHECK = 31 - CMFFLG % 31; - CMFFLG += FCHECK; - - /*ucvector-controlled version of the output buffer, for dynamic array*/ - ucvector_init_buffer(&outv, *out, *outsize); - - ucvector_push_back(&outv, (uint8_t)(CMFFLG >> 8)); - ucvector_push_back(&outv, (uint8_t)(CMFFLG & 255)); - - error = deflate(&deflatedata, &deflatesize, in, insize, settings); - - if (!error) { - unsigned ADLER32 = adler32(in, (unsigned)insize); - for (i = 0; i != deflatesize; ++i) - ucvector_push_back(&outv, deflatedata[i]); - lodepng_free(deflatedata); - lodepng_add32bitInt(&outv, ADLER32); - } - - *out = outv.data; - *outsize = outv.size; - - return error; -} - -/* compress using the default or custom zlib function */ -static unsigned zlib_compress( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGCompressSettings *settings) { - if (settings->custom_zlib) { - return settings->custom_zlib(out, outsize, in, insize, settings); - } else { - return lodepng_zlib_compress(out, outsize, in, insize, settings); - } -} - -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#else /*no LODEPNG_COMPILE_ZLIB*/ - -#ifdef LODEPNG_COMPILE_DECODER -static unsigned zlib_decompress( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGDecompressSettings *settings) { - if (!settings->custom_zlib) - return 87; /*no custom zlib function provided */ - return settings->custom_zlib(out, outsize, in, insize, settings); -} -#endif /*LODEPNG_COMPILE_DECODER*/ -#ifdef LODEPNG_COMPILE_ENCODER -static unsigned zlib_compress( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGCompressSettings *settings) { - if (!settings->custom_zlib) - return 87; /*no custom zlib function provided */ - return settings->custom_zlib(out, outsize, in, insize, settings); -} -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#endif /*LODEPNG_COMPILE_ZLIB*/ - -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_ENCODER - -/*this is a good tradeoff between speed and compression ratio*/ -#define DEFAULT_WINDOWSIZE 2048 - -void lodepng_compress_settings_init(LodePNGCompressSettings *settings) { - /*compress with dynamic huffman tree (not in the mathematical sense, just not the predefined one)*/ - settings->btype = 2; - settings->use_lz77 = 1; - settings->windowsize = DEFAULT_WINDOWSIZE; - settings->minmatch = 3; - settings->nicematch = 128; - settings->lazymatching = 1; - - settings->custom_zlib = 0; - settings->custom_deflate = 0; - settings->custom_context = 0; -} - -const LodePNGCompressSettings lodepng_default_compress_settings = {2, 1, DEFAULT_WINDOWSIZE, 3, 128, 1, 0, 0, 0}; - -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_DECODER - -void lodepng_decompress_settings_init(LodePNGDecompressSettings *settings) { - settings->ignore_adler32 = 0; - - settings->custom_zlib = 0; - settings->custom_inflate = 0; - settings->custom_context = 0; -} - -const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, 0, 0, 0}; - -#endif /*LODEPNG_COMPILE_DECODER*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // End of Zlib related code. Begin of PNG related code. // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_PNG - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / CRC32 / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifndef LODEPNG_NO_COMPILE_CRC -/* CRC polynomial: 0xedb88320 */ -static unsigned lodepng_crc32_table[256] = { - 0u, 1996959894u, 3993919788u, 2567524794u, 124634137u, 1886057615u, 3915621685u, 2657392035u, 249268274u, - 2044508324u, 3772115230u, 2547177864u, 162941995u, 2125561021u, 3887607047u, 2428444049u, 498536548u, 1789927666u, - 4089016648u, 2227061214u, 450548861u, 1843258603u, 4107580753u, 2211677639u, 325883990u, 1684777152u, 4251122042u, - 2321926636u, 335633487u, 1661365465u, 4195302755u, 2366115317u, 997073096u, 1281953886u, 3579855332u, 2724688242u, - 1006888145u, 1258607687u, 3524101629u, 2768942443u, 901097722u, 1119000684u, 3686517206u, 2898065728u, 853044451u, - 1172266101u, 3705015759u, 2882616665u, 651767980u, 1373503546u, 3369554304u, 3218104598u, 565507253u, 1454621731u, - 3485111705u, 3099436303u, 671266974u, 1594198024u, 3322730930u, 2970347812u, 795835527u, 1483230225u, 3244367275u, - 3060149565u, 1994146192u, 31158534u, 2563907772u, 4023717930u, 1907459465u, 112637215u, 2680153253u, 3904427059u, - 2013776290u, 251722036u, 2517215374u, 3775830040u, 2137656763u, 141376813u, 2439277719u, 3865271297u, 1802195444u, - 476864866u, 2238001368u, 4066508878u, 1812370925u, 453092731u, 2181625025u, 4111451223u, 1706088902u, 314042704u, - 2344532202u, 4240017532u, 1658658271u, 366619977u, 2362670323u, 4224994405u, 1303535960u, 984961486u, 2747007092u, - 3569037538u, 1256170817u, 1037604311u, 2765210733u, 3554079995u, 1131014506u, 879679996u, 2909243462u, 3663771856u, - 1141124467u, 855842277u, 2852801631u, 3708648649u, 1342533948u, 654459306u, 3188396048u, 3373015174u, 1466479909u, - 544179635u, 3110523913u, 3462522015u, 1591671054u, 702138776u, 2966460450u, 3352799412u, 1504918807u, 783551873u, - 3082640443u, 3233442989u, 3988292384u, 2596254646u, 62317068u, 1957810842u, 3939845945u, 2647816111u, 81470997u, - 1943803523u, 3814918930u, 2489596804u, 225274430u, 2053790376u, 3826175755u, 2466906013u, 167816743u, 2097651377u, - 4027552580u, 2265490386u, 503444072u, 1762050814u, 4150417245u, 2154129355u, 426522225u, 1852507879u, 4275313526u, - 2312317920u, 282753626u, 1742555852u, 4189708143u, 2394877945u, 397917763u, 1622183637u, 3604390888u, 2714866558u, - 953729732u, 1340076626u, 3518719985u, 2797360999u, 1068828381u, 1219638859u, 3624741850u, 2936675148u, 906185462u, - 1090812512u, 3747672003u, 2825379669u, 829329135u, 1181335161u, 3412177804u, 3160834842u, 628085408u, 1382605366u, - 3423369109u, 3138078467u, 570562233u, 1426400815u, 3317316542u, 2998733608u, 733239954u, 1555261956u, 3268935591u, - 3050360625u, 752459403u, 1541320221u, 2607071920u, 3965973030u, 1969922972u, 40735498u, 2617837225u, 3943577151u, - 1913087877u, 83908371u, 2512341634u, 3803740692u, 2075208622u, 213261112u, 2463272603u, 3855990285u, 2094854071u, - 198958881u, 2262029012u, 4057260610u, 1759359992u, 534414190u, 2176718541u, 4139329115u, 1873836001u, 414664567u, - 2282248934u, 4279200368u, 1711684554u, 285281116u, 2405801727u, 4167216745u, 1634467795u, 376229701u, 2685067896u, - 3608007406u, 1308918612u, 956543938u, 2808555105u, 3495958263u, 1231636301u, 1047427035u, 2932959818u, 3654703836u, - 1088359270u, 936918000u, 2847714899u, 3736837829u, 1202900863u, 817233897u, 3183342108u, 3401237130u, 1404277552u, - 615818150u, 3134207493u, 3453421203u, 1423857449u, 601450431u, 3009837614u, 3294710456u, 1567103746u, 711928724u, - 3020668471u, 3272380065u, 1510334235u, 755167117u}; - -/*Return the CRC of the bytes buf[0..len-1].*/ -unsigned lodepng_crc32(const uint8_t *data, size_t length) { - unsigned r = 0xffffffffu; - size_t i; - for (i = 0; i < length; ++i) { - r = lodepng_crc32_table[(r ^ data[i]) & 0xff] ^ (r >> 8); - } - return r ^ 0xffffffffu; -} -#else /* !LODEPNG_NO_COMPILE_CRC */ -unsigned lodepng_crc32(const uint8_t *data, size_t length); -#endif /* !LODEPNG_NO_COMPILE_CRC */ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Reading and writing single bits and bytes from/to stream for LodePNG / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -static uint8_t readBitFromReversedStream(size_t *bitpointer, const uint8_t *bitstream) { - uint8_t result = (uint8_t)((bitstream[(*bitpointer) >> 3] >> (7 - ((*bitpointer) & 0x7))) & 1); - ++(*bitpointer); - return result; -} - -static unsigned readBitsFromReversedStream(size_t *bitpointer, const uint8_t *bitstream, size_t nbits) { - unsigned result = 0; - size_t i; - for (i = 0; i < nbits; ++i) { - result <<= 1; - result |= (unsigned)readBitFromReversedStream(bitpointer, bitstream); - } - return result; -} - -#ifdef LODEPNG_COMPILE_DECODER -static void setBitOfReversedStream0(size_t *bitpointer, uint8_t *bitstream, uint8_t bit) { - /*the current bit in bitstream must be 0 for this to work*/ - if (bit) { - /*earlier bit of huffman code is in a lesser significant bit of an earlier byte*/ - bitstream[(*bitpointer) >> 3] |= (bit << (7 - ((*bitpointer) & 0x7))); - } - ++(*bitpointer); -} -#endif /*LODEPNG_COMPILE_DECODER*/ - -static void setBitOfReversedStream(size_t *bitpointer, uint8_t *bitstream, uint8_t bit) { - /*the current bit in bitstream may be 0 or 1 for this to work*/ - if (bit == 0) - bitstream[(*bitpointer) >> 3] &= (uint8_t)(~(1 << (7 - ((*bitpointer) & 0x7)))); - else - bitstream[(*bitpointer) >> 3] |= (1 << (7 - ((*bitpointer) & 0x7))); - ++(*bitpointer); -} - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / PNG chunks / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -unsigned lodepng_chunk_length(const uint8_t *chunk) { return lodepng_read32bitInt(&chunk[0]); } - -void lodepng_chunk_type(char type[5], const uint8_t *chunk) { - unsigned i; - for (i = 0; i != 4; ++i) - type[i] = (char)chunk[4 + i]; - type[4] = 0; /*null termination char*/ -} - -uint8_t lodepng_chunk_type_equals(const uint8_t *chunk, const char *type) { - if (strlen(type) != 4) - return 0; - return (chunk[4] == type[0] && chunk[5] == type[1] && chunk[6] == type[2] && chunk[7] == type[3]); -} - -uint8_t lodepng_chunk_ancillary(const uint8_t *chunk) { return ((chunk[4] & 32) != 0); } - -uint8_t lodepng_chunk_private(const uint8_t *chunk) { return ((chunk[6] & 32) != 0); } - -uint8_t lodepng_chunk_safetocopy(const uint8_t *chunk) { return ((chunk[7] & 32) != 0); } - -uint8_t *lodepng_chunk_data(uint8_t *chunk) { return &chunk[8]; } - -const uint8_t *lodepng_chunk_data_const(const uint8_t *chunk) { return &chunk[8]; } - -unsigned lodepng_chunk_check_crc(const uint8_t *chunk) { - unsigned length = lodepng_chunk_length(chunk); - unsigned CRC = lodepng_read32bitInt(&chunk[length + 8]); - /*the CRC is taken of the data and the 4 chunk type letters, not the length*/ - unsigned checksum = lodepng_crc32(&chunk[4], length + 4); - if (CRC != checksum) - return 1; - else - return 0; -} - -void lodepng_chunk_generate_crc(uint8_t *chunk) { - unsigned length = lodepng_chunk_length(chunk); - unsigned CRC = lodepng_crc32(&chunk[4], length + 4); - lodepng_set32bitInt(chunk + 8 + length, CRC); -} - -uint8_t *lodepng_chunk_next(uint8_t *chunk) { - unsigned total_chunk_length = lodepng_chunk_length(chunk) + 12; - return &chunk[total_chunk_length]; -} - -const uint8_t *lodepng_chunk_next_const(const uint8_t *chunk) { - unsigned total_chunk_length = lodepng_chunk_length(chunk) + 12; - return &chunk[total_chunk_length]; -} - -unsigned lodepng_chunk_append(uint8_t **out, size_t *outlength, const uint8_t *chunk) { - unsigned i; - unsigned total_chunk_length = lodepng_chunk_length(chunk) + 12; - uint8_t *chunk_start, *new_buffer; - size_t new_length = (*outlength) + total_chunk_length; - if (new_length < total_chunk_length || new_length < (*outlength)) - return 77; /*integer overflow happened*/ - - new_buffer = (uint8_t *)lodepng_realloc(*out, new_length); - if (!new_buffer) - return 83; /*alloc fail*/ - (*out) = new_buffer; - (*outlength) = new_length; - chunk_start = &(*out)[new_length - total_chunk_length]; - - for (i = 0; i != total_chunk_length; ++i) - chunk_start[i] = chunk[i]; - - return 0; -} - -unsigned lodepng_chunk_create( - uint8_t **out, size_t *outlength, unsigned length, const char *type, const uint8_t *data) { - unsigned i; - uint8_t *chunk, *new_buffer; - size_t new_length = (*outlength) + length + 12; - if (new_length < length + 12 || new_length < (*outlength)) - return 77; /*integer overflow happened*/ - new_buffer = (uint8_t *)lodepng_realloc(*out, new_length); - if (!new_buffer) - return 83; /*alloc fail*/ - (*out) = new_buffer; - (*outlength) = new_length; - chunk = &(*out)[(*outlength) - length - 12]; - - /*1: length*/ - lodepng_set32bitInt(chunk, (unsigned)length); - - /*2: chunk name (4 letters)*/ - chunk[4] = (uint8_t)type[0]; - chunk[5] = (uint8_t)type[1]; - chunk[6] = (uint8_t)type[2]; - chunk[7] = (uint8_t)type[3]; - - /*3: the data*/ - for (i = 0; i != length; ++i) - chunk[8 + i] = data[i]; - - /*4: CRC (of the chunkname characters and the data)*/ - lodepng_chunk_generate_crc(chunk); - - return 0; -} - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Color types and such / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*return type is a LodePNG error code*/ -static unsigned checkColorValidity(LodePNGColorType colortype, unsigned bd) /*bd = bitdepth*/ -{ - switch (colortype) { - case 0: - if (!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16)) - return 37; - break; /*grey*/ - case 2: - if (!(bd == 8 || bd == 16)) - return 37; - break; /*RGB*/ - case 3: - if (!(bd == 1 || bd == 2 || bd == 4 || bd == 8)) - return 37; - break; /*palette*/ - case 4: - if (!(bd == 8 || bd == 16)) - return 37; - break; /*grey + alpha*/ - case 6: - if (!(bd == 8 || bd == 16)) - return 37; - break; /*RGBA*/ - default: - return 31; - } - return 0; /*allowed color type / bits combination*/ -} - -static unsigned getNumColorChannels(LodePNGColorType colortype) { - switch (colortype) { - case 0: - return 1; /*grey*/ - case 2: - return 3; /*RGB*/ - case 3: - return 1; /*palette*/ - case 4: - return 2; /*grey + alpha*/ - case 6: - return 4; /*RGBA*/ - } - return 0; /*unexisting color type*/ -} - -static unsigned lodepng_get_bpp_lct(LodePNGColorType colortype, unsigned bitdepth) { - /*bits per pixel is amount of channels * bits per channel*/ - return getNumColorChannels(colortype) * bitdepth; -} - -/* ////////////////////////////////////////////////////////////////////////// */ - -void lodepng_color_mode_init(LodePNGColorMode *info) { - info->key_defined = 0; - info->key_r = info->key_g = info->key_b = 0; - info->colortype = LCT_RGBA; - info->bitdepth = 8; - info->palette = 0; - info->palettesize = 0; -} - -void lodepng_color_mode_cleanup(LodePNGColorMode *info) { lodepng_palette_clear(info); } - -unsigned lodepng_color_mode_copy(LodePNGColorMode *dest, const LodePNGColorMode *source) { - size_t i; - lodepng_color_mode_cleanup(dest); - *dest = *source; - if (source->palette) { - dest->palette = (uint8_t *)lodepng_malloc(1024); - if (!dest->palette && source->palettesize) - return 83; /*alloc fail*/ - for (i = 0; i != source->palettesize * 4; ++i) - dest->palette[i] = source->palette[i]; - } - return 0; -} - -static int lodepng_color_mode_equal(const LodePNGColorMode *a, const LodePNGColorMode *b) { - size_t i; - if (a->colortype != b->colortype) - return 0; - if (a->bitdepth != b->bitdepth) - return 0; - if (a->key_defined != b->key_defined) - return 0; - if (a->key_defined) { - if (a->key_r != b->key_r) - return 0; - if (a->key_g != b->key_g) - return 0; - if (a->key_b != b->key_b) - return 0; - } - /*if one of the palette sizes is 0, then we consider it to be the same as the - other: it means that e.g. the palette was not given by the user and should be - considered the same as the palette inside the PNG.*/ - if (1 /*a->palettesize != 0 && b->palettesize != 0*/) { - if (a->palettesize != b->palettesize) - return 0; - for (i = 0; i != a->palettesize * 4; ++i) { - if (a->palette[i] != b->palette[i]) - return 0; - } - } - return 1; -} - -void lodepng_palette_clear(LodePNGColorMode *info) { - if (info->palette) - lodepng_free(info->palette); - info->palette = 0; - info->palettesize = 0; -} - -unsigned -lodepng_palette_add(LodePNGColorMode *info, uint8_t r, uint8_t g, uint8_t b, uint8_t a) { - uint8_t *data; - /*the same resize technique as C++ std::vectors is used, and here it's made so that for a palette with - the max of 256 colors, it'll have the exact alloc size*/ - if (!info->palette) /*allocate palette if empty*/ - { - /*room for 256 colors with 4 bytes each*/ - data = (uint8_t *)lodepng_realloc(info->palette, 1024); - if (!data) - return 83; /*alloc fail*/ - else - info->palette = data; - } - info->palette[4 * info->palettesize + 0] = r; - info->palette[4 * info->palettesize + 1] = g; - info->palette[4 * info->palettesize + 2] = b; - info->palette[4 * info->palettesize + 3] = a; - ++info->palettesize; - return 0; -} - -unsigned lodepng_get_bpp(const LodePNGColorMode *info) { - /*calculate bits per pixel out of colortype and bitdepth*/ - return lodepng_get_bpp_lct(info->colortype, info->bitdepth); -} - -unsigned lodepng_get_channels(const LodePNGColorMode *info) { return getNumColorChannels(info->colortype); } - -unsigned lodepng_is_greyscale_type(const LodePNGColorMode *info) { - return info->colortype == LCT_GREY || info->colortype == LCT_GREY_ALPHA; -} - -unsigned lodepng_is_alpha_type(const LodePNGColorMode *info) { return (info->colortype & 4) != 0; /*4 or 6*/ } - -unsigned lodepng_is_palette_type(const LodePNGColorMode *info) { return info->colortype == LCT_PALETTE; } - -unsigned lodepng_has_palette_alpha(const LodePNGColorMode *info) { - size_t i; - for (i = 0; i != info->palettesize; ++i) { - if (info->palette[i * 4 + 3] < 255) - return 1; - } - return 0; -} - -unsigned lodepng_can_have_alpha(const LodePNGColorMode *info) { - return info->key_defined || lodepng_is_alpha_type(info) || lodepng_has_palette_alpha(info); -} - -size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode *color) { - /*will not overflow for any color type if roughly w * h < 268435455*/ - size_t bpp = lodepng_get_bpp(color); - size_t n = w * h; - return ((n / 8) * bpp) + ((n & 7) * bpp + 7) / 8; -} - -size_t lodepng_get_raw_size_lct(unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { - /*will not overflow for any color type if roughly w * h < 268435455*/ - size_t bpp = lodepng_get_bpp_lct(colortype, bitdepth); - size_t n = w * h; - return ((n / 8) * bpp) + ((n & 7) * bpp + 7) / 8; -} - -#ifdef LODEPNG_COMPILE_PNG -#ifdef LODEPNG_COMPILE_DECODER -/*in an idat chunk, each scanline is a multiple of 8 bits, unlike the lodepng output buffer*/ -static size_t lodepng_get_raw_size_idat(unsigned w, unsigned h, const LodePNGColorMode *color) { - /*will not overflow for any color type if roughly w * h < 268435455*/ - size_t bpp = lodepng_get_bpp(color); - size_t line = ((w / 8) * bpp) + ((w & 7) * bpp + 7) / 8; - return h * line; -} -#endif /*LODEPNG_COMPILE_DECODER*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - -static void LodePNGUnknownChunks_init(LodePNGInfo *info) { - unsigned i; - for (i = 0; i != 3; ++i) - info->unknown_chunks_data[i] = 0; - for (i = 0; i != 3; ++i) - info->unknown_chunks_size[i] = 0; -} - -static void LodePNGUnknownChunks_cleanup(LodePNGInfo *info) { - unsigned i; - for (i = 0; i != 3; ++i) - lodepng_free(info->unknown_chunks_data[i]); -} - -static unsigned LodePNGUnknownChunks_copy(LodePNGInfo *dest, const LodePNGInfo *src) { - unsigned i; - - LodePNGUnknownChunks_cleanup(dest); - - for (i = 0; i != 3; ++i) { - size_t j; - dest->unknown_chunks_size[i] = src->unknown_chunks_size[i]; - dest->unknown_chunks_data[i] = (uint8_t *)lodepng_malloc(src->unknown_chunks_size[i]); - if (!dest->unknown_chunks_data[i] && dest->unknown_chunks_size[i]) - return 83; /*alloc fail*/ - for (j = 0; j < src->unknown_chunks_size[i]; ++j) { - dest->unknown_chunks_data[i][j] = src->unknown_chunks_data[i][j]; - } - } - - return 0; -} - -/******************************************************************************/ - -static void LodePNGText_init(LodePNGInfo *info) { - info->text_num = 0; - info->text_keys = NULL; - info->text_strings = NULL; -} - -static void LodePNGText_cleanup(LodePNGInfo *info) { - size_t i; - for (i = 0; i != info->text_num; ++i) { - string_cleanup(&info->text_keys[i]); - string_cleanup(&info->text_strings[i]); - } - lodepng_free(info->text_keys); - lodepng_free(info->text_strings); -} - -static unsigned LodePNGText_copy(LodePNGInfo *dest, const LodePNGInfo *source) { - size_t i = 0; - dest->text_keys = 0; - dest->text_strings = 0; - dest->text_num = 0; - for (i = 0; i != source->text_num; ++i) { - CERROR_TRY_RETURN(lodepng_add_text(dest, source->text_keys[i], source->text_strings[i])); - } - return 0; -} - -void lodepng_clear_text(LodePNGInfo *info) { LodePNGText_cleanup(info); } - -unsigned lodepng_add_text(LodePNGInfo *info, const char *key, const char *str) { - char **new_keys = (char **)(lodepng_realloc(info->text_keys, sizeof(char *) * (info->text_num + 1))); - char **new_strings = (char **)(lodepng_realloc(info->text_strings, sizeof(char *) * (info->text_num + 1))); - if (!new_keys || !new_strings) { - lodepng_free(new_keys); - lodepng_free(new_strings); - return 83; /*alloc fail*/ - } - - ++info->text_num; - info->text_keys = new_keys; - info->text_strings = new_strings; - - string_init(&info->text_keys[info->text_num - 1]); - string_set(&info->text_keys[info->text_num - 1], key); - - string_init(&info->text_strings[info->text_num - 1]); - string_set(&info->text_strings[info->text_num - 1], str); - - return 0; -} - -/******************************************************************************/ - -static void LodePNGIText_init(LodePNGInfo *info) { - info->itext_num = 0; - info->itext_keys = NULL; - info->itext_langtags = NULL; - info->itext_transkeys = NULL; - info->itext_strings = NULL; -} - -static void LodePNGIText_cleanup(LodePNGInfo *info) { - size_t i; - for (i = 0; i != info->itext_num; ++i) { - string_cleanup(&info->itext_keys[i]); - string_cleanup(&info->itext_langtags[i]); - string_cleanup(&info->itext_transkeys[i]); - string_cleanup(&info->itext_strings[i]); - } - lodepng_free(info->itext_keys); - lodepng_free(info->itext_langtags); - lodepng_free(info->itext_transkeys); - lodepng_free(info->itext_strings); -} - -static unsigned LodePNGIText_copy(LodePNGInfo *dest, const LodePNGInfo *source) { - size_t i = 0; - dest->itext_keys = 0; - dest->itext_langtags = 0; - dest->itext_transkeys = 0; - dest->itext_strings = 0; - dest->itext_num = 0; - for (i = 0; i != source->itext_num; ++i) { - CERROR_TRY_RETURN(lodepng_add_itext( - dest, - source->itext_keys[i], - source->itext_langtags[i], - source->itext_transkeys[i], - source->itext_strings[i])); - } - return 0; -} - -void lodepng_clear_itext(LodePNGInfo *info) { LodePNGIText_cleanup(info); } - -unsigned -lodepng_add_itext(LodePNGInfo *info, const char *key, const char *langtag, const char *transkey, const char *str) { - char **new_keys = (char **)(lodepng_realloc(info->itext_keys, sizeof(char *) * (info->itext_num + 1))); - char **new_langtags = (char **)(lodepng_realloc(info->itext_langtags, sizeof(char *) * (info->itext_num + 1))); - char **new_transkeys = (char **)(lodepng_realloc(info->itext_transkeys, sizeof(char *) * (info->itext_num + 1))); - char **new_strings = (char **)(lodepng_realloc(info->itext_strings, sizeof(char *) * (info->itext_num + 1))); - if (!new_keys || !new_langtags || !new_transkeys || !new_strings) { - lodepng_free(new_keys); - lodepng_free(new_langtags); - lodepng_free(new_transkeys); - lodepng_free(new_strings); - return 83; /*alloc fail*/ - } - - ++info->itext_num; - info->itext_keys = new_keys; - info->itext_langtags = new_langtags; - info->itext_transkeys = new_transkeys; - info->itext_strings = new_strings; - - string_init(&info->itext_keys[info->itext_num - 1]); - string_set(&info->itext_keys[info->itext_num - 1], key); - - string_init(&info->itext_langtags[info->itext_num - 1]); - string_set(&info->itext_langtags[info->itext_num - 1], langtag); - - string_init(&info->itext_transkeys[info->itext_num - 1]); - string_set(&info->itext_transkeys[info->itext_num - 1], transkey); - - string_init(&info->itext_strings[info->itext_num - 1]); - string_set(&info->itext_strings[info->itext_num - 1], str); - - return 0; -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -void lodepng_info_init(LodePNGInfo *info) { - lodepng_color_mode_init(&info->color); - info->interlace_method = 0; - info->compression_method = 0; - info->filter_method = 0; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - info->background_defined = 0; - info->background_r = info->background_g = info->background_b = 0; - - LodePNGText_init(info); - LodePNGIText_init(info); - - info->time_defined = 0; - info->phys_defined = 0; - - LodePNGUnknownChunks_init(info); -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} - -void lodepng_info_cleanup(LodePNGInfo *info) { - lodepng_color_mode_cleanup(&info->color); -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - LodePNGText_cleanup(info); - LodePNGIText_cleanup(info); - - LodePNGUnknownChunks_cleanup(info); -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} - -unsigned lodepng_info_copy(LodePNGInfo *dest, const LodePNGInfo *source) { - lodepng_info_cleanup(dest); - *dest = *source; - lodepng_color_mode_init(&dest->color); - CERROR_TRY_RETURN(lodepng_color_mode_copy(&dest->color, &source->color)); - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - CERROR_TRY_RETURN(LodePNGText_copy(dest, source)); - CERROR_TRY_RETURN(LodePNGIText_copy(dest, source)); - - LodePNGUnknownChunks_init(dest); - CERROR_TRY_RETURN(LodePNGUnknownChunks_copy(dest, source)); -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - return 0; -} - -void lodepng_info_swap(LodePNGInfo *a, LodePNGInfo *b) { - LodePNGInfo temp = *a; - *a = *b; - *b = temp; -} - -/* ////////////////////////////////////////////////////////////////////////// */ - -/*index: bitgroup index, bits: bitgroup size(1, 2 or 4), in: bitgroup value, out: octet array to add bits to*/ -static void addColorBits(uint8_t *out, size_t index, unsigned bits, unsigned in) { - unsigned m = bits == 1 ? 7 : bits == 2 ? 3 : 1; /*8 / bits - 1*/ - /*p = the partial index in the byte, e.g. with 4 palettebits it is 0 for first half or 1 for second half*/ - unsigned p = index & m; - in &= (1u << bits) - 1u; /*filter out any other bits of the input value*/ - in = in << (bits * (m - p)); - if (p == 0) - out[index * bits / 8] = in; - else - out[index * bits / 8] |= in; -} - -typedef struct ColorTree ColorTree; - -/* -One node of a color tree -This is the data structure used to count the number of unique colors and to get a palette -index for a color. It's like an octree, but because the alpha channel is used too, each -node has 16 instead of 8 children. -*/ -struct ColorTree { - ColorTree *children[16]; /*up to 16 pointers to ColorTree of next level*/ - int index; /*the payload. Only has a meaningful value if this is in the last level*/ -}; - -static void color_tree_init(ColorTree *tree) { - int i; - for (i = 0; i != 16; ++i) - tree->children[i] = 0; - tree->index = -1; -} - -static void color_tree_cleanup(ColorTree *tree) { - int i; - for (i = 0; i != 16; ++i) { - if (tree->children[i]) { - color_tree_cleanup(tree->children[i]); - lodepng_free(tree->children[i]); - } - } -} - -/*returns -1 if color not present, its index otherwise*/ -static int color_tree_get(ColorTree *tree, uint8_t r, uint8_t g, uint8_t b, uint8_t a) { - int bit = 0; - for (bit = 0; bit < 8; ++bit) { - int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); - if (!tree->children[i]) - return -1; - else - tree = tree->children[i]; - } - return tree ? tree->index : -1; -} - -#ifdef LODEPNG_COMPILE_ENCODER -static int color_tree_has(ColorTree *tree, uint8_t r, uint8_t g, uint8_t b, uint8_t a) { - return color_tree_get(tree, r, g, b, a) >= 0; -} -#endif /*LODEPNG_COMPILE_ENCODER*/ - -/*color is not allowed to already exist. -Index should be >= 0 (it's signed to be compatible with using -1 for "doesn't exist")*/ -static void -color_tree_add(ColorTree *tree, uint8_t r, uint8_t g, uint8_t b, uint8_t a, unsigned index) { - int bit; - for (bit = 0; bit < 8; ++bit) { - int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); - if (!tree->children[i]) { - tree->children[i] = (ColorTree *)lodepng_malloc(sizeof(ColorTree)); - color_tree_init(tree->children[i]); - } - tree = tree->children[i]; - } - tree->index = (int)index; -} - -/*put a pixel, given its RGBA color, into image of any color type*/ -static unsigned rgba8ToPixel( - uint8_t *out, size_t i, const LodePNGColorMode *mode, ColorTree *tree /*for palette*/, uint8_t r, - uint8_t g, uint8_t b, uint8_t a) { - if (mode->colortype == LCT_GREY) { - uint8_t grey = r; /*((unsigned short)r + g + b) / 3*/ - ; - if (mode->bitdepth == 8) - out[i] = grey; - else if (mode->bitdepth == 16) - out[i * 2 + 0] = out[i * 2 + 1] = grey; - else { - /*take the most significant bits of grey*/ - grey = (grey >> (8 - mode->bitdepth)) & ((1 << mode->bitdepth) - 1); - addColorBits(out, i, mode->bitdepth, grey); - } - } else if (mode->colortype == LCT_RGB) { - if (mode->bitdepth == 8) { - out[i * 3 + 0] = r; - out[i * 3 + 1] = g; - out[i * 3 + 2] = b; - } else { - out[i * 6 + 0] = out[i * 6 + 1] = r; - out[i * 6 + 2] = out[i * 6 + 3] = g; - out[i * 6 + 4] = out[i * 6 + 5] = b; - } - } else if (mode->colortype == LCT_PALETTE) { - int index = color_tree_get(tree, r, g, b, a); - if (index < 0) - return 82; /*color not in palette*/ - if (mode->bitdepth == 8) - out[i] = index; - else - addColorBits(out, i, mode->bitdepth, (unsigned)index); - } else if (mode->colortype == LCT_GREY_ALPHA) { - uint8_t grey = r; /*((unsigned short)r + g + b) / 3*/ - ; - if (mode->bitdepth == 8) { - out[i * 2 + 0] = grey; - out[i * 2 + 1] = a; - } else if (mode->bitdepth == 16) { - out[i * 4 + 0] = out[i * 4 + 1] = grey; - out[i * 4 + 2] = out[i * 4 + 3] = a; - } - } else if (mode->colortype == LCT_RGBA) { - if (mode->bitdepth == 8) { - out[i * 4 + 0] = r; - out[i * 4 + 1] = g; - out[i * 4 + 2] = b; - out[i * 4 + 3] = a; - } else { - out[i * 8 + 0] = out[i * 8 + 1] = r; - out[i * 8 + 2] = out[i * 8 + 3] = g; - out[i * 8 + 4] = out[i * 8 + 5] = b; - out[i * 8 + 6] = out[i * 8 + 7] = a; - } - } - - return 0; /*no error*/ -} - -/*put a pixel, given its RGBA16 color, into image of any color 16-bitdepth type*/ -static void rgba16ToPixel( - uint8_t *out, size_t i, const LodePNGColorMode *mode, unsigned short r, unsigned short g, unsigned short b, - unsigned short a) { - if (mode->colortype == LCT_GREY) { - unsigned short grey = r; /*((unsigned)r + g + b) / 3*/ - ; - out[i * 2 + 0] = (grey >> 8) & 255; - out[i * 2 + 1] = grey & 255; - } else if (mode->colortype == LCT_RGB) { - out[i * 6 + 0] = (r >> 8) & 255; - out[i * 6 + 1] = r & 255; - out[i * 6 + 2] = (g >> 8) & 255; - out[i * 6 + 3] = g & 255; - out[i * 6 + 4] = (b >> 8) & 255; - out[i * 6 + 5] = b & 255; - } else if (mode->colortype == LCT_GREY_ALPHA) { - unsigned short grey = r; /*((unsigned)r + g + b) / 3*/ - ; - out[i * 4 + 0] = (grey >> 8) & 255; - out[i * 4 + 1] = grey & 255; - out[i * 4 + 2] = (a >> 8) & 255; - out[i * 4 + 3] = a & 255; - } else if (mode->colortype == LCT_RGBA) { - out[i * 8 + 0] = (r >> 8) & 255; - out[i * 8 + 1] = r & 255; - out[i * 8 + 2] = (g >> 8) & 255; - out[i * 8 + 3] = g & 255; - out[i * 8 + 4] = (b >> 8) & 255; - out[i * 8 + 5] = b & 255; - out[i * 8 + 6] = (a >> 8) & 255; - out[i * 8 + 7] = a & 255; - } -} - -/*Get RGBA8 color of pixel with index i (y * width + x) from the raw image with given color type.*/ -static void getPixelColorRGBA8( - uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *a, const uint8_t *in, size_t i, - const LodePNGColorMode *mode) { - if (mode->colortype == LCT_GREY) { - if (mode->bitdepth == 8) { - *r = *g = *b = in[i]; - if (mode->key_defined && *r == mode->key_r) - *a = 0; - else - *a = 255; - } else if (mode->bitdepth == 16) { - *r = *g = *b = in[i * 2 + 0]; - if (mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) - *a = 0; - else - *a = 255; - } else { - unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ - size_t j = i * mode->bitdepth; - unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); - *r = *g = *b = (value * 255) / highest; - if (mode->key_defined && value == mode->key_r) - *a = 0; - else - *a = 255; - } - } else if (mode->colortype == LCT_RGB) { - if (mode->bitdepth == 8) { - *r = in[i * 3 + 0]; - *g = in[i * 3 + 1]; - *b = in[i * 3 + 2]; - if (mode->key_defined && *r == mode->key_r && *g == mode->key_g && *b == mode->key_b) - *a = 0; - else - *a = 255; - } else { - *r = in[i * 6 + 0]; - *g = in[i * 6 + 2]; - *b = in[i * 6 + 4]; - if (mode->key_defined && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r && - 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g && - 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) - *a = 0; - else - *a = 255; - } - } else if (mode->colortype == LCT_PALETTE) { - unsigned index; - if (mode->bitdepth == 8) - index = in[i]; - else { - size_t j = i * mode->bitdepth; - index = readBitsFromReversedStream(&j, in, mode->bitdepth); - } - - if (index >= mode->palettesize) { - /*This is an error according to the PNG spec, but common PNG decoders make it black instead. - Done here too, slightly faster due to no error handling needed.*/ - *r = *g = *b = 0; - *a = 255; - } else { - *r = mode->palette[index * 4 + 0]; - *g = mode->palette[index * 4 + 1]; - *b = mode->palette[index * 4 + 2]; - *a = mode->palette[index * 4 + 3]; - } - } else if (mode->colortype == LCT_GREY_ALPHA) { - if (mode->bitdepth == 8) { - *r = *g = *b = in[i * 2 + 0]; - *a = in[i * 2 + 1]; - } else { - *r = *g = *b = in[i * 4 + 0]; - *a = in[i * 4 + 2]; - } - } else if (mode->colortype == LCT_RGBA) { - if (mode->bitdepth == 8) { - *r = in[i * 4 + 0]; - *g = in[i * 4 + 1]; - *b = in[i * 4 + 2]; - *a = in[i * 4 + 3]; - } else { - *r = in[i * 8 + 0]; - *g = in[i * 8 + 2]; - *b = in[i * 8 + 4]; - *a = in[i * 8 + 6]; - } - } -} - -/*Similar to getPixelColorRGBA8, but with all the for loops inside of the color -mode test cases, optimized to convert the colors much faster, when converting -to RGBA or RGB with 8 bit per cannel. buffer must be RGBA or RGB output with -enough memory, if has_alpha is true the output is RGBA. mode has the color mode -of the input buffer.*/ -static void getPixelColorsRGBA8( - uint8_t *buffer, size_t numpixels, unsigned has_alpha, const uint8_t *in, - const LodePNGColorMode *mode) { - unsigned num_channels = has_alpha ? 4 : 3; - size_t i; - if (mode->colortype == LCT_GREY) { - if (mode->bitdepth == 8) { - for (i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i]; - if (has_alpha) - buffer[3] = mode->key_defined && in[i] == mode->key_r ? 0 : 255; - } - } else if (mode->bitdepth == 16) { - for (i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 2]; - if (has_alpha) - buffer[3] = mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r ? 0 : 255; - } - } else { - unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ - size_t j = 0; - for (i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); - buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; - if (has_alpha) - buffer[3] = mode->key_defined && value == mode->key_r ? 0 : 255; - } - } - } else if (mode->colortype == LCT_RGB) { - if (mode->bitdepth == 8) { - for (i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 3 + 0]; - buffer[1] = in[i * 3 + 1]; - buffer[2] = in[i * 3 + 2]; - if (has_alpha) - buffer[3] = mode->key_defined && buffer[0] == mode->key_r && buffer[1] == mode->key_g && - buffer[2] == mode->key_b - ? 0 - : 255; - } - } else { - for (i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 6 + 0]; - buffer[1] = in[i * 6 + 2]; - buffer[2] = in[i * 6 + 4]; - if (has_alpha) - buffer[3] = mode->key_defined && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r && - 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g && - 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b - ? 0 - : 255; - } - } - } else if (mode->colortype == LCT_PALETTE) { - unsigned index; - size_t j = 0; - for (i = 0; i != numpixels; ++i, buffer += num_channels) { - if (mode->bitdepth == 8) - index = in[i]; - else - index = readBitsFromReversedStream(&j, in, mode->bitdepth); - - if (index >= mode->palettesize) { - /*This is an error according to the PNG spec, but most PNG decoders make it black instead. - Done here too, slightly faster due to no error handling needed.*/ - buffer[0] = buffer[1] = buffer[2] = 0; - if (has_alpha) - buffer[3] = 255; - } else { - buffer[0] = mode->palette[index * 4 + 0]; - buffer[1] = mode->palette[index * 4 + 1]; - buffer[2] = mode->palette[index * 4 + 2]; - if (has_alpha) - buffer[3] = mode->palette[index * 4 + 3]; - } - } - } else if (mode->colortype == LCT_GREY_ALPHA) { - if (mode->bitdepth == 8) { - for (i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; - if (has_alpha) - buffer[3] = in[i * 2 + 1]; - } - } else { - for (i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; - if (has_alpha) - buffer[3] = in[i * 4 + 2]; - } - } - } else if (mode->colortype == LCT_RGBA) { - if (mode->bitdepth == 8) { - for (i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 4 + 0]; - buffer[1] = in[i * 4 + 1]; - buffer[2] = in[i * 4 + 2]; - if (has_alpha) - buffer[3] = in[i * 4 + 3]; - } - } else { - for (i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 8 + 0]; - buffer[1] = in[i * 8 + 2]; - buffer[2] = in[i * 8 + 4]; - if (has_alpha) - buffer[3] = in[i * 8 + 6]; - } - } - } -} - -/*Get RGBA16 color of pixel with index i (y * width + x) from the raw image with -given color type, but the given color type must be 16-bit itself.*/ -static void getPixelColorRGBA16( - unsigned short *r, unsigned short *g, unsigned short *b, unsigned short *a, const uint8_t *in, size_t i, - const LodePNGColorMode *mode) { - if (mode->colortype == LCT_GREY) { - *r = *g = *b = 256 * in[i * 2 + 0] + in[i * 2 + 1]; - if (mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) - *a = 0; - else - *a = 65535; - } else if (mode->colortype == LCT_RGB) { - *r = 256u * in[i * 6 + 0] + in[i * 6 + 1]; - *g = 256u * in[i * 6 + 2] + in[i * 6 + 3]; - *b = 256u * in[i * 6 + 4] + in[i * 6 + 5]; - if (mode->key_defined && 256u * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r && - 256u * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g && 256u * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) - *a = 0; - else - *a = 65535; - } else if (mode->colortype == LCT_GREY_ALPHA) { - *r = *g = *b = 256u * in[i * 4 + 0] + in[i * 4 + 1]; - *a = 256u * in[i * 4 + 2] + in[i * 4 + 3]; - } else if (mode->colortype == LCT_RGBA) { - *r = 256u * in[i * 8 + 0] + in[i * 8 + 1]; - *g = 256u * in[i * 8 + 2] + in[i * 8 + 3]; - *b = 256u * in[i * 8 + 4] + in[i * 8 + 5]; - *a = 256u * in[i * 8 + 6] + in[i * 8 + 7]; - } -} - -unsigned lodepng_convert( - uint8_t *out, const uint8_t *in, const LodePNGColorMode *mode_out, const LodePNGColorMode *mode_in, - unsigned w, unsigned h) { - size_t i; - ColorTree tree; - size_t numpixels = w * h; - - if (lodepng_color_mode_equal(mode_out, mode_in)) { - size_t numbytes = lodepng_get_raw_size(w, h, mode_in); - for (i = 0; i != numbytes; ++i) - out[i] = in[i]; - return 0; - } - - if (mode_out->colortype == LCT_PALETTE) { - size_t palettesize = mode_out->palettesize; - const uint8_t *palette = mode_out->palette; - size_t palsize = 1u << mode_out->bitdepth; - /*if the user specified output palette but did not give the values, assume - they want the values of the input color type (assuming that one is palette). - Note that we never create a new palette ourselves.*/ - if (palettesize == 0) { - palettesize = mode_in->palettesize; - palette = mode_in->palette; - } - if (palettesize < palsize) - palsize = palettesize; - color_tree_init(&tree); - for (i = 0; i != palsize; ++i) { - const uint8_t *p = &palette[i * 4]; - color_tree_add(&tree, p[0], p[1], p[2], p[3], i); - } - } - - if (mode_in->bitdepth == 16 && mode_out->bitdepth == 16) { - for (i = 0; i != numpixels; ++i) { - unsigned short r = 0, g = 0, b = 0, a = 0; - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - rgba16ToPixel(out, i, mode_out, r, g, b, a); - } - } else if (mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGBA) { - getPixelColorsRGBA8(out, numpixels, 1, in, mode_in); - } else if (mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGB) { - getPixelColorsRGBA8(out, numpixels, 0, in, mode_in); - } else { - uint8_t r = 0, g = 0, b = 0, a = 0; - for (i = 0; i != numpixels; ++i) { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); - CERROR_TRY_RETURN(rgba8ToPixel(out, i, mode_out, &tree, r, g, b, a)); - } - } - - if (mode_out->colortype == LCT_PALETTE) { - color_tree_cleanup(&tree); - } - - return 0; /*no error*/ -} - -#ifdef LODEPNG_COMPILE_ENCODER - -void lodepng_color_profile_init(LodePNGColorProfile *profile) { - profile->colored = 0; - profile->key = 0; - profile->alpha = 0; - profile->key_r = profile->key_g = profile->key_b = 0; - profile->numcolors = 0; - profile->bits = 1; -} - -/*function used for debug purposes with C++*/ -/*void printColorProfile(LodePNGColorProfile* p) -{ - std::cout << "colored: " << (int)p->colored << ", "; - std::cout << "key: " << (int)p->key << ", "; - std::cout << "key_r: " << (int)p->key_r << ", "; - std::cout << "key_g: " << (int)p->key_g << ", "; - std::cout << "key_b: " << (int)p->key_b << ", "; - std::cout << "alpha: " << (int)p->alpha << ", "; - std::cout << "numcolors: " << (int)p->numcolors << ", "; - std::cout << "bits: " << (int)p->bits << std::endl; -}*/ - -/*Returns how many bits needed to represent given value (max 8 bit)*/ -static unsigned getValueRequiredBits(uint8_t value) { - if (value == 0 || value == 255) - return 1; - /*The scaling of 2-bit and 4-bit values uses multiples of 85 and 17*/ - if (value % 17 == 0) - return value % 85 == 0 ? 2 : 4; - return 8; -} - -/*profile must already have been inited with mode. -It's ok to set some parameters of profile to done already.*/ -unsigned lodepng_get_color_profile( - LodePNGColorProfile *profile, const uint8_t *in, unsigned w, unsigned h, const LodePNGColorMode *mode) { - unsigned error = 0; - size_t i; - ColorTree tree; - size_t numpixels = w * h; - - unsigned colored_done = lodepng_is_greyscale_type(mode) ? 1 : 0; - unsigned alpha_done = lodepng_can_have_alpha(mode) ? 0 : 1; - unsigned numcolors_done = 0; - unsigned bpp = lodepng_get_bpp(mode); - unsigned bits_done = bpp == 1 ? 1 : 0; - unsigned maxnumcolors = 257; - unsigned sixteen = 0; - if (bpp <= 8) - maxnumcolors = bpp == 1 ? 2 : (bpp == 2 ? 4 : (bpp == 4 ? 16 : 256)); - - color_tree_init(&tree); - - /*Check if the 16-bit input is truly 16-bit*/ - if (mode->bitdepth == 16) { - unsigned short r, g, b, a; - for (i = 0; i != numpixels; ++i) { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode); - if ((r & 255) != ((r >> 8) & 255) || (g & 255) != ((g >> 8) & 255) || (b & 255) != ((b >> 8) & 255) || - (a & 255) != ((a >> 8) & 255)) /*first and second byte differ*/ - { - sixteen = 1; - break; - } - } - } - - if (sixteen) { - unsigned short r = 0, g = 0, b = 0, a = 0; - profile->bits = 16; - bits_done = numcolors_done = 1; /*counting colors no longer useful, palette doesn't support 16-bit*/ - - for (i = 0; i != numpixels; ++i) { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode); - - if (!colored_done && (r != g || r != b)) { - profile->colored = 1; - colored_done = 1; - } - - if (!alpha_done) { - unsigned matchkey = (r == profile->key_r && g == profile->key_g && b == profile->key_b); - if (a != 65535 && (a != 0 || (profile->key && !matchkey))) { - profile->alpha = 1; - alpha_done = 1; - if (profile->bits < 8) - profile->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } else if (a == 0 && !profile->alpha && !profile->key) { - profile->key = 1; - profile->key_r = r; - profile->key_g = g; - profile->key_b = b; - } else if (a == 65535 && profile->key && matchkey) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - profile->alpha = 1; - alpha_done = 1; - } - } - if (alpha_done && numcolors_done && colored_done && bits_done) - break; - } - - if (profile->key && !profile->alpha) { - for (i = 0; i != numpixels; ++i) { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode); - if (a != 0 && r == profile->key_r && g == profile->key_g && b == profile->key_b) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - profile->alpha = 1; - alpha_done = 1; - } - } - } - } else /* < 16-bit */ - { - uint8_t r = 0, g = 0, b = 0, a = 0; - for (i = 0; i != numpixels; ++i) { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode); - - if (!bits_done && profile->bits < 8) { - /*only r is checked, < 8 bits is only relevant for greyscale*/ - unsigned bits = getValueRequiredBits(r); - if (bits > profile->bits) - profile->bits = bits; - } - bits_done = (profile->bits >= bpp); - - if (!colored_done && (r != g || r != b)) { - profile->colored = 1; - colored_done = 1; - if (profile->bits < 8) - profile->bits = 8; /*PNG has no colored modes with less than 8-bit per channel*/ - } - - if (!alpha_done) { - unsigned matchkey = (r == profile->key_r && g == profile->key_g && b == profile->key_b); - if (a != 255 && (a != 0 || (profile->key && !matchkey))) { - profile->alpha = 1; - alpha_done = 1; - if (profile->bits < 8) - profile->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } else if (a == 0 && !profile->alpha && !profile->key) { - profile->key = 1; - profile->key_r = r; - profile->key_g = g; - profile->key_b = b; - } else if (a == 255 && profile->key && matchkey) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - profile->alpha = 1; - alpha_done = 1; - if (profile->bits < 8) - profile->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } - } - - if (!numcolors_done) { - if (!color_tree_has(&tree, r, g, b, a)) { - color_tree_add(&tree, r, g, b, a, profile->numcolors); - if (profile->numcolors < 256) { - uint8_t *p = profile->palette; - unsigned n = profile->numcolors; - p[n * 4 + 0] = r; - p[n * 4 + 1] = g; - p[n * 4 + 2] = b; - p[n * 4 + 3] = a; - } - ++profile->numcolors; - numcolors_done = profile->numcolors >= maxnumcolors; - } - } - - if (alpha_done && numcolors_done && colored_done && bits_done) - break; - } - - if (profile->key && !profile->alpha) { - for (i = 0; i != numpixels; ++i) { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode); - if (a != 0 && r == profile->key_r && g == profile->key_g && b == profile->key_b) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - profile->alpha = 1; - alpha_done = 1; - } - } - } - - /*make the profile's key always 16-bit for consistency - repeat each byte twice*/ - profile->key_r += (profile->key_r << 8); - profile->key_g += (profile->key_g << 8); - profile->key_b += (profile->key_b << 8); - } - - color_tree_cleanup(&tree); - return error; -} - -/*Automatically chooses color type that gives smallest amount of bits in the -output image, e.g. grey if there are only greyscale pixels, palette if there -are less than 256 colors, ... -Updates values of mode with a potentially smaller color model. mode_out should -contain the user chosen color model, but will be overwritten with the new chosen one.*/ -unsigned lodepng_auto_choose_color( - LodePNGColorMode *mode_out, const uint8_t *image, unsigned w, unsigned h, const LodePNGColorMode *mode_in) { - LodePNGColorProfile prof; - unsigned error = 0; - unsigned i, n, palettebits, grey_ok, palette_ok; - - lodepng_color_profile_init(&prof); - error = lodepng_get_color_profile(&prof, image, w, h, mode_in); - if (error) - return error; - mode_out->key_defined = 0; - - if (prof.key && w * h <= 16) { - prof.alpha = 1; /*too few pixels to justify tRNS chunk overhead*/ - if (prof.bits < 8) - prof.bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } - grey_ok = !prof.colored && !prof.alpha; /*grey without alpha, with potentially low bits*/ - n = prof.numcolors; - palettebits = n <= 2 ? 1 : (n <= 4 ? 2 : (n <= 16 ? 4 : 8)); - palette_ok = n <= 256 && (n * 2 < w * h) && prof.bits <= 8; - if (w * h < n * 2) - palette_ok = 0; /*don't add palette overhead if image has only a few pixels*/ - if (grey_ok && prof.bits <= palettebits) - palette_ok = 0; /*grey is less overhead*/ - - if (palette_ok) { - uint8_t *p = prof.palette; - lodepng_palette_clear(mode_out); /*remove potential earlier palette*/ - for (i = 0; i != prof.numcolors; ++i) { - error = lodepng_palette_add(mode_out, p[i * 4 + 0], p[i * 4 + 1], p[i * 4 + 2], p[i * 4 + 3]); - if (error) - break; - } - - mode_out->colortype = LCT_PALETTE; - mode_out->bitdepth = palettebits; - - if (mode_in->colortype == LCT_PALETTE && mode_in->palettesize >= mode_out->palettesize && - mode_in->bitdepth == mode_out->bitdepth) { - /*If input should have same palette colors, keep original to preserve its order and prevent conversion*/ - lodepng_color_mode_cleanup(mode_out); - lodepng_color_mode_copy(mode_out, mode_in); - } - } else /*8-bit or 16-bit per channel*/ - { - mode_out->bitdepth = prof.bits; - mode_out->colortype = - prof.alpha ? (prof.colored ? LCT_RGBA : LCT_GREY_ALPHA) : (prof.colored ? LCT_RGB : LCT_GREY); - - if (prof.key && !prof.alpha) { - unsigned mask = (1u << mode_out->bitdepth) - 1u; /*profile always uses 16-bit, mask converts it*/ - mode_out->key_r = prof.key_r & mask; - mode_out->key_g = prof.key_g & mask; - mode_out->key_b = prof.key_b & mask; - mode_out->key_defined = 1; - } - } - - return error; -} - -#endif /* #ifdef LODEPNG_COMPILE_ENCODER */ - -/* -Paeth predicter, used by PNG filter type 4 -The parameters are of type short, but should come from uint8_ts, the shorts -are only needed to make the paeth calculation correct. -*/ -static uint8_t paethPredictor(short a, short b, short c) { - short pa = abs(b - c); - short pb = abs(a - c); - short pc = abs(a + b - c - c); - - if (pc < pa && pc < pb) - return (uint8_t)c; - else if (pb < pa) - return (uint8_t)b; - else - return (uint8_t)a; -} - -/*shared values used by multiple Adam7 related functions*/ - -static const unsigned ADAM7_IX[7] = {0, 4, 0, 2, 0, 1, 0}; /*x start values*/ -static const unsigned ADAM7_IY[7] = {0, 0, 4, 0, 2, 0, 1}; /*y start values*/ -static const unsigned ADAM7_DX[7] = {8, 8, 4, 4, 2, 2, 1}; /*x delta values*/ -static const unsigned ADAM7_DY[7] = {8, 8, 8, 4, 4, 2, 2}; /*y delta values*/ - -/* -Outputs various dimensions and positions in the image related to the Adam7 reduced images. -passw: output containing the width of the 7 passes -passh: output containing the height of the 7 passes -filter_passstart: output containing the index of the start and end of each - reduced image with filter bytes -padded_passstart output containing the index of the start and end of each - reduced image when without filter bytes but with padded scanlines -passstart: output containing the index of the start and end of each reduced - image without padding between scanlines, but still padding between the images -w, h: width and height of non-interlaced image -bpp: bits per pixel -"padded" is only relevant if bpp is less than 8 and a scanline or image does not - end at a full byte -*/ -static void Adam7_getpassvalues( - unsigned passw[7], unsigned passh[7], size_t filter_passstart[8], size_t padded_passstart[8], size_t passstart[8], - unsigned w, unsigned h, unsigned bpp) { - /*the passstart values have 8 values: the 8th one indicates the byte after the end of the 7th (= last) pass*/ - unsigned i; - - /*calculate width and height in pixels of each pass*/ - for (i = 0; i != 7; ++i) { - passw[i] = (w + ADAM7_DX[i] - ADAM7_IX[i] - 1) / ADAM7_DX[i]; - passh[i] = (h + ADAM7_DY[i] - ADAM7_IY[i] - 1) / ADAM7_DY[i]; - if (passw[i] == 0) - passh[i] = 0; - if (passh[i] == 0) - passw[i] = 0; - } - - filter_passstart[0] = padded_passstart[0] = passstart[0] = 0; - for (i = 0; i != 7; ++i) { - /*if passw[i] is 0, it's 0 bytes, not 1 (no filtertype-byte)*/ - filter_passstart[i + 1] = - filter_passstart[i] + ((passw[i] && passh[i]) ? passh[i] * (1 + (passw[i] * bpp + 7) / 8) : 0); - /*bits padded if needed to fill full byte at end of each scanline*/ - padded_passstart[i + 1] = padded_passstart[i] + passh[i] * ((passw[i] * bpp + 7) / 8); - /*only padded at end of reduced image*/ - passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7) / 8; - } -} - -#ifdef LODEPNG_COMPILE_DECODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / PNG Decoder / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*read the information from the header and store it in the LodePNGInfo. return value is error*/ -unsigned lodepng_inspect(unsigned *w, unsigned *h, LodePNGState *state, const uint8_t *in, size_t insize) { - LodePNGInfo *info = &state->info_png; - if (insize == 0 || in == 0) { - CERROR_RETURN_ERROR(state->error, 48); /*error: the given data is empty*/ - } - if (insize < 33) { - CERROR_RETURN_ERROR(state->error, 27); /*error: the data length is smaller than the length of a PNG header*/ - } - - /*when decoding a new PNG image, make sure all parameters created after previous decoding are reset*/ - lodepng_info_cleanup(info); - lodepng_info_init(info); - - if (in[0] != 137 || in[1] != 80 || in[2] != 78 || in[3] != 71 || in[4] != 13 || in[5] != 10 || in[6] != 26 || - in[7] != 10) { - CERROR_RETURN_ERROR(state->error, 28); /*error: the first 8 bytes are not the correct PNG signature*/ - } - if (lodepng_chunk_length(in + 8) != 13) { - CERROR_RETURN_ERROR(state->error, 94); /*error: header size must be 13 bytes*/ - } - if (!lodepng_chunk_type_equals(in + 8, "IHDR")) { - CERROR_RETURN_ERROR(state->error, 29); /*error: it doesn't start with a IHDR chunk!*/ - } - - /*read the values given in the header*/ - *w = lodepng_read32bitInt(&in[16]); - *h = lodepng_read32bitInt(&in[20]); - info->color.bitdepth = in[24]; - info->color.colortype = (LodePNGColorType)in[25]; - info->compression_method = in[26]; - info->filter_method = in[27]; - info->interlace_method = in[28]; - - if (*w == 0 || *h == 0) { - CERROR_RETURN_ERROR(state->error, 93); - } - - if (!state->decoder.ignore_crc) { - unsigned CRC = lodepng_read32bitInt(&in[29]); - unsigned checksum = lodepng_crc32(&in[12], 17); - if (CRC != checksum) { - CERROR_RETURN_ERROR(state->error, 57); /*invalid CRC*/ - } - } - - /*error: only compression method 0 is allowed in the specification*/ - if (info->compression_method != 0) - CERROR_RETURN_ERROR(state->error, 32); - /*error: only filter method 0 is allowed in the specification*/ - if (info->filter_method != 0) - CERROR_RETURN_ERROR(state->error, 33); - /*error: only interlace methods 0 and 1 exist in the specification*/ - if (info->interlace_method > 1) - CERROR_RETURN_ERROR(state->error, 34); - - state->error = checkColorValidity(info->color.colortype, info->color.bitdepth); - return state->error; -} - -static unsigned unfilterScanline( - uint8_t *recon, const uint8_t *scanline, const uint8_t *precon, size_t bytewidth, - uint8_t filterType, size_t length) { - /* - For PNG filter method 0 - unfilter a PNG image scanline by scanline. when the pixels are smaller than 1 byte, - the filter works byte per byte (bytewidth = 1) - precon is the previous unfiltered scanline, recon the result, scanline the current one - the incoming scanlines do NOT include the filtertype byte, that one is given in the parameter filterType instead - recon and scanline MAY be the same memory address! precon must be disjoint. - */ - - size_t i; - switch (filterType) { - case 0: - for (i = 0; i != length; ++i) - recon[i] = scanline[i]; - break; - case 1: - for (i = 0; i != bytewidth; ++i) - recon[i] = scanline[i]; - for (i = bytewidth; i < length; ++i) - recon[i] = scanline[i] + recon[i - bytewidth]; - break; - case 2: - if (precon) { - for (i = 0; i != length; ++i) - recon[i] = scanline[i] + precon[i]; - } else { - for (i = 0; i != length; ++i) - recon[i] = scanline[i]; - } - break; - case 3: - if (precon) { - for (i = 0; i != bytewidth; ++i) - recon[i] = scanline[i] + (precon[i] >> 1); - for (i = bytewidth; i < length; ++i) - recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) >> 1); - } else { - for (i = 0; i != bytewidth; ++i) - recon[i] = scanline[i]; - for (i = bytewidth; i < length; ++i) - recon[i] = scanline[i] + (recon[i - bytewidth] >> 1); - } - break; - case 4: - if (precon) { - for (i = 0; i != bytewidth; ++i) { - recon[i] = (scanline[i] + precon[i]); /*paethPredictor(0, precon[i], 0) is always precon[i]*/ - } - for (i = bytewidth; i < length; ++i) { - recon[i] = (scanline[i] + paethPredictor(recon[i - bytewidth], precon[i], precon[i - bytewidth])); - } - } else { - for (i = 0; i != bytewidth; ++i) { - recon[i] = scanline[i]; - } - for (i = bytewidth; i < length; ++i) { - /*paethPredictor(recon[i - bytewidth], 0, 0) is always recon[i - bytewidth]*/ - recon[i] = (scanline[i] + recon[i - bytewidth]); - } - } - break; - default: - return 36; /*error: unexisting filter type given*/ - } - return 0; -} - -static unsigned unfilter(uint8_t *out, const uint8_t *in, unsigned w, unsigned h, unsigned bpp) { - /* - For PNG filter method 0 - this function unfilters a single image (e.g. without interlacing this is called once, with Adam7 seven times) - out must have enough bytes allocated already, in must have the scanlines + 1 filtertype byte per scanline - w and h are image dimensions or dimensions of reduced image, bpp is bits per pixel - in and out are allowed to be the same memory address (but aren't the same size since in has the extra filter bytes) - */ - - unsigned y; - uint8_t *prevline = 0; - - /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ - size_t bytewidth = (bpp + 7) / 8; - size_t linebytes = (w * bpp + 7) / 8; - - for (y = 0; y < h; ++y) { - size_t outindex = linebytes * y; - size_t inindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ - uint8_t filterType = in[inindex]; - - CERROR_TRY_RETURN( - unfilterScanline(&out[outindex], &in[inindex + 1], prevline, bytewidth, filterType, linebytes)); - - prevline = &out[outindex]; - } - - return 0; -} - -/* -in: Adam7 interlaced image, with no padding bits between scanlines, but between - reduced images so that each reduced image starts at a byte. -out: the same pixels, but re-ordered so that they're now a non-interlaced image with size w*h -bpp: bits per pixel -out has the following size in bits: w * h * bpp. -in is possibly bigger due to padding bits between reduced images. -out must be big enough AND must be 0 everywhere if bpp < 8 in the current implementation -(because that's likely a little bit faster) -NOTE: comments about padding bits are only relevant if bpp < 8 -*/ -static void Adam7_deinterlace(uint8_t *out, const uint8_t *in, unsigned w, unsigned h, unsigned bpp) { - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - if (bpp >= 8) { - for (i = 0; i != 7; ++i) { - unsigned x, y, b; - size_t bytewidth = bpp / 8; - for (y = 0; y < passh[i]; ++y) - for (x = 0; x < passw[i]; ++x) { - size_t pixelinstart = passstart[i] + (y * passw[i] + x) * bytewidth; - size_t pixeloutstart = - ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth; - for (b = 0; b < bytewidth; ++b) { - out[pixeloutstart + b] = in[pixelinstart + b]; - } - } - } - } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ - { - for (i = 0; i != 7; ++i) { - unsigned x, y, b; - unsigned ilinebits = bpp * passw[i]; - unsigned olinebits = bpp * w; - size_t obp, ibp; /*bit pointers (for out and in buffer)*/ - for (y = 0; y < passh[i]; ++y) - for (x = 0; x < passw[i]; ++x) { - ibp = (8 * passstart[i]) + (y * ilinebits + x * bpp); - obp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp; - for (b = 0; b < bpp; ++b) { - uint8_t bit = readBitFromReversedStream(&ibp, in); - /*note that this function assumes the out buffer is completely 0, use setBitOfReversedStream - * otherwise*/ - setBitOfReversedStream0(&obp, out, bit); - } - } - } - } -} - -static void -removePaddingBits(uint8_t *out, const uint8_t *in, size_t olinebits, size_t ilinebits, unsigned h) { - /* - After filtering there are still padding bits if scanlines have non multiple of 8 bit amounts. They need - to be removed (except at last scanline of (Adam7-reduced) image) before working with pure image buffers - for the Adam7 code, the color convert code and the output to the user. - in and out are allowed to be the same buffer, in may also be higher but still overlapping; in must - have >= ilinebits*h bits, out must have >= olinebits*h bits, olinebits must be <= ilinebits - also used to move bits after earlier such operations happened, e.g. in a sequence of reduced images from Adam7 - only useful if (ilinebits - olinebits) is a value in the range 1..7 - */ - unsigned y; - size_t diff = ilinebits - olinebits; - size_t ibp = 0, obp = 0; /*input and output bit pointers*/ - for (y = 0; y < h; ++y) { - size_t x; - for (x = 0; x < olinebits; ++x) { - uint8_t bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - ibp += diff; - } -} - -/*out must be buffer big enough to contain full image, and in must contain the full decompressed data from -the IDAT chunks (with filter index bytes and possible padding bits) -return value is error*/ -static unsigned -postProcessScanlines(uint8_t *out, uint8_t *in, unsigned w, unsigned h, const LodePNGInfo *info_png) { - /* - This function converts the filtered-padded-interlaced data into pure 2D image buffer with the PNG's colortype. - Steps: - *) if no Adam7: 1) unfilter 2) remove padding bits (= posible extra bits per scanline if bpp < 8) - *) if adam7: 1) 7x unfilter 2) 7x remove padding bits 3) Adam7_deinterlace - NOTE: the in buffer will be overwritten with intermediate data! - */ - unsigned bpp = lodepng_get_bpp(&info_png->color); - if (bpp == 0) - return 31; /*error: invalid colortype*/ - - if (info_png->interlace_method == 0) { - if (bpp < 8 && w * bpp != ((w * bpp + 7) / 8) * 8) { - CERROR_TRY_RETURN(unfilter(in, in, w, h, bpp)); - removePaddingBits(out, in, w * bpp, ((w * bpp + 7) / 8) * 8, h); - } - /*we can immediately filter into the out buffer, no other steps needed*/ - else - CERROR_TRY_RETURN(unfilter(out, in, w, h, bpp)); - } else /*interlace_method is 1 (Adam7)*/ - { - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - for (i = 0; i != 7; ++i) { - CERROR_TRY_RETURN(unfilter(&in[padded_passstart[i]], &in[filter_passstart[i]], passw[i], passh[i], bpp)); - /*TODO: possible efficiency improvement: if in this reduced image the bits fit nicely in 1 scanline, - move bytes instead of bits or move not at all*/ - if (bpp < 8) { - /*remove padding bits in scanlines; after this there still may be padding - bits between the different reduced images: each reduced image still starts nicely at a byte*/ - removePaddingBits( - &in[passstart[i]], - &in[padded_passstart[i]], - passw[i] * bpp, - ((passw[i] * bpp + 7) / 8) * 8, - passh[i]); - } - } - - Adam7_deinterlace(out, in, w, h, bpp); - } - - return 0; -} - -static unsigned readChunk_PLTE(LodePNGColorMode *color, const uint8_t *data, size_t chunkLength) { - unsigned pos = 0, i; - if (color->palette) - lodepng_free(color->palette); - color->palettesize = chunkLength / 3; - color->palette = (uint8_t *)lodepng_malloc(4 * color->palettesize); - if (!color->palette && color->palettesize) { - color->palettesize = 0; - return 83; /*alloc fail*/ - } - if (color->palettesize > 256) - return 38; /*error: palette too big*/ - - for (i = 0; i != color->palettesize; ++i) { - color->palette[4 * i + 0] = data[pos++]; /*R*/ - color->palette[4 * i + 1] = data[pos++]; /*G*/ - color->palette[4 * i + 2] = data[pos++]; /*B*/ - color->palette[4 * i + 3] = 255; /*alpha*/ - } - - return 0; /* OK */ -} - -static unsigned readChunk_tRNS(LodePNGColorMode *color, const uint8_t *data, size_t chunkLength) { - unsigned i; - if (color->colortype == LCT_PALETTE) { - /*error: more alpha values given than there are palette entries*/ - if (chunkLength > color->palettesize) - return 38; - - for (i = 0; i != chunkLength; ++i) - color->palette[4 * i + 3] = data[i]; - } else if (color->colortype == LCT_GREY) { - /*error: this chunk must be 2 bytes for greyscale image*/ - if (chunkLength != 2) - return 30; - - color->key_defined = 1; - color->key_r = color->key_g = color->key_b = 256u * data[0] + data[1]; - } else if (color->colortype == LCT_RGB) { - /*error: this chunk must be 6 bytes for RGB image*/ - if (chunkLength != 6) - return 41; - - color->key_defined = 1; - color->key_r = 256u * data[0] + data[1]; - color->key_g = 256u * data[2] + data[3]; - color->key_b = 256u * data[4] + data[5]; - } else - return 42; /*error: tRNS chunk not allowed for other color models*/ - - return 0; /* OK */ -} - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*background color chunk (bKGD)*/ -static unsigned readChunk_bKGD(LodePNGInfo *info, const uint8_t *data, size_t chunkLength) { - if (info->color.colortype == LCT_PALETTE) { - /*error: this chunk must be 1 byte for indexed color image*/ - if (chunkLength != 1) - return 43; - - info->background_defined = 1; - info->background_r = info->background_g = info->background_b = data[0]; - } else if (info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { - /*error: this chunk must be 2 bytes for greyscale image*/ - if (chunkLength != 2) - return 44; - - info->background_defined = 1; - info->background_r = info->background_g = info->background_b = 256u * data[0] + data[1]; - } else if (info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { - /*error: this chunk must be 6 bytes for greyscale image*/ - if (chunkLength != 6) - return 45; - - info->background_defined = 1; - info->background_r = 256u * data[0] + data[1]; - info->background_g = 256u * data[2] + data[3]; - info->background_b = 256u * data[4] + data[5]; - } - - return 0; /* OK */ -} - -/*text chunk (tEXt)*/ -static unsigned readChunk_tEXt(LodePNGInfo *info, const uint8_t *data, size_t chunkLength) { - unsigned error = 0; - char *key = 0, *str = 0; - unsigned i; - - while (!error) /*not really a while loop, only used to break on error*/ - { - unsigned length, string2_begin; - - length = 0; - while (length < chunkLength && data[length] != 0) - ++length; - /*even though it's not allowed by the standard, no error is thrown if - there's no null termination char, if the text is empty*/ - if (length < 1 || length > 79) - CERROR_BREAK(error, 89); /*keyword too short or long*/ - - key = (char *)lodepng_malloc(length + 1); - if (!key) - CERROR_BREAK(error, 83); /*alloc fail*/ - - key[length] = 0; - for (i = 0; i != length; ++i) - key[i] = (char)data[i]; - - string2_begin = length + 1; /*skip keyword null terminator*/ - - length = chunkLength < string2_begin ? 0 : chunkLength - string2_begin; - str = (char *)lodepng_malloc(length + 1); - if (!str) - CERROR_BREAK(error, 83); /*alloc fail*/ - - str[length] = 0; - for (i = 0; i != length; ++i) - str[i] = (char)data[string2_begin + i]; - - error = lodepng_add_text(info, key, str); - - break; - } - - lodepng_free(key); - lodepng_free(str); - - return error; -} - -/*compressed text chunk (zTXt)*/ -static unsigned readChunk_zTXt( - LodePNGInfo *info, const LodePNGDecompressSettings *zlibsettings, const uint8_t *data, size_t chunkLength) { - unsigned error = 0; - unsigned i; - - unsigned length, string2_begin; - char *key = 0; - ucvector decoded; - - ucvector_init(&decoded); - - while (!error) /*not really a while loop, only used to break on error*/ - { - for (length = 0; length < chunkLength && data[length] != 0; ++length) - ; - if (length + 2 >= chunkLength) - CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ - if (length < 1 || length > 79) - CERROR_BREAK(error, 89); /*keyword too short or long*/ - - key = (char *)lodepng_malloc(length + 1); - if (!key) - CERROR_BREAK(error, 83); /*alloc fail*/ - - key[length] = 0; - for (i = 0; i != length; ++i) - key[i] = (char)data[i]; - - if (data[length + 1] != 0) - CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ - - string2_begin = length + 2; - if (string2_begin > chunkLength) - CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ - - length = chunkLength - string2_begin; - /*will fail if zlib error, e.g. if length is too small*/ - error = zlib_decompress( - &decoded.data, &decoded.size, (uint8_t *)(&data[string2_begin]), length, zlibsettings); - if (error) - break; - ucvector_push_back(&decoded, 0); - - error = lodepng_add_text(info, key, (char *)decoded.data); - - break; - } - - lodepng_free(key); - ucvector_cleanup(&decoded); - - return error; -} - -/*international text chunk (iTXt)*/ -static unsigned readChunk_iTXt( - LodePNGInfo *info, const LodePNGDecompressSettings *zlibsettings, const uint8_t *data, size_t chunkLength) { - unsigned error = 0; - unsigned i; - - unsigned length, begin, compressed; - char *key = 0, *langtag = 0, *transkey = 0; - ucvector decoded; - ucvector_init(&decoded); - - while (!error) /*not really a while loop, only used to break on error*/ - { - /*Quick check if the chunk length isn't too small. Even without check - it'd still fail with other error checks below if it's too short. This just gives a different error code.*/ - if (chunkLength < 5) - CERROR_BREAK(error, 30); /*iTXt chunk too short*/ - - /*read the key*/ - for (length = 0; length < chunkLength && data[length] != 0; ++length) - ; - if (length + 3 >= chunkLength) - CERROR_BREAK(error, 75); /*no null termination char, corrupt?*/ - if (length < 1 || length > 79) - CERROR_BREAK(error, 89); /*keyword too short or long*/ - - key = (char *)lodepng_malloc(length + 1); - if (!key) - CERROR_BREAK(error, 83); /*alloc fail*/ - - key[length] = 0; - for (i = 0; i != length; ++i) - key[i] = (char)data[i]; - - /*read the compression method*/ - compressed = data[length + 1]; - if (data[length + 2] != 0) - CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ - - /*even though it's not allowed by the standard, no error is thrown if - there's no null termination char, if the text is empty for the next 3 texts*/ - - /*read the langtag*/ - begin = length + 3; - length = 0; - for (i = begin; i < chunkLength && data[i] != 0; ++i) - ++length; - - langtag = (char *)lodepng_malloc(length + 1); - if (!langtag) - CERROR_BREAK(error, 83); /*alloc fail*/ - - langtag[length] = 0; - for (i = 0; i != length; ++i) - langtag[i] = (char)data[begin + i]; - - /*read the transkey*/ - begin += length + 1; - length = 0; - for (i = begin; i < chunkLength && data[i] != 0; ++i) - ++length; - - transkey = (char *)lodepng_malloc(length + 1); - if (!transkey) - CERROR_BREAK(error, 83); /*alloc fail*/ - - transkey[length] = 0; - for (i = 0; i != length; ++i) - transkey[i] = (char)data[begin + i]; - - /*read the actual text*/ - begin += length + 1; - - length = chunkLength < begin ? 0 : chunkLength - begin; - - if (compressed) { - /*will fail if zlib error, e.g. if length is too small*/ - error = - zlib_decompress(&decoded.data, &decoded.size, (uint8_t *)(&data[begin]), length, zlibsettings); - if (error) - break; - if (decoded.allocsize < decoded.size) - decoded.allocsize = decoded.size; - ucvector_push_back(&decoded, 0); - } else { - if (!ucvector_resize(&decoded, length + 1)) - CERROR_BREAK(error, 83 /*alloc fail*/); - - decoded.data[length] = 0; - for (i = 0; i != length; ++i) - decoded.data[i] = data[begin + i]; - } - - error = lodepng_add_itext(info, key, langtag, transkey, (char *)decoded.data); - - break; - } - - lodepng_free(key); - lodepng_free(langtag); - lodepng_free(transkey); - ucvector_cleanup(&decoded); - - return error; -} - -static unsigned readChunk_tIME(LodePNGInfo *info, const uint8_t *data, size_t chunkLength) { - if (chunkLength != 7) - return 73; /*invalid tIME chunk size*/ - - info->time_defined = 1; - info->time.year = 256u * data[0] + data[1]; - info->time.month = data[2]; - info->time.day = data[3]; - info->time.hour = data[4]; - info->time.minute = data[5]; - info->time.second = data[6]; - - return 0; /* OK */ -} - -static unsigned readChunk_pHYs(LodePNGInfo *info, const uint8_t *data, size_t chunkLength) { - if (chunkLength != 9) - return 74; /*invalid pHYs chunk size*/ - - info->phys_defined = 1; - info->phys_x = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; - info->phys_y = 16777216u * data[4] + 65536u * data[5] + 256u * data[6] + data[7]; - info->phys_unit = data[8]; - - return 0; /* OK */ -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -/*read a PNG, the result will be in the same color type as the PNG (hence "generic")*/ -static void decodeGeneric( - uint8_t **out, unsigned *w, unsigned *h, LodePNGState *state, const uint8_t *in, size_t insize) { - uint8_t IEND = 0; - const uint8_t *chunk; - size_t i; - ucvector idat; /*the data from idat chunks*/ - ucvector scanlines; - size_t predict; - size_t numpixels; - size_t outsize = 0; - - /*for unknown chunk order*/ - unsigned unknown = 0; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - unsigned critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - - /*provide some proper output values if error will happen*/ - *out = 0; - - state->error = - lodepng_inspect(w, h, state, in, insize); /*reads header and resets other parameters in state->info_png*/ - if (state->error) - return; - - numpixels = *w * *h; - - /*multiplication overflow*/ - if (*h != 0 && numpixels / *h != *w) - CERROR_RETURN(state->error, 92); - /*multiplication overflow possible further below. Allows up to 2^31-1 pixel - bytes with 16-bit RGBA, the rest is room for filter bytes.*/ - if (numpixels > 268435455) - CERROR_RETURN(state->error, 92); - - ucvector_init(&idat); - chunk = &in[33]; /*first byte of the first chunk after the header*/ - - /*loop through the chunks, ignoring unknown chunks and stopping at IEND chunk. - IDAT data is put at the start of the in buffer*/ - while (!IEND && !state->error) { - unsigned chunkLength; - const uint8_t *data; /*the data in the chunk*/ - - /*error: size of the in buffer too small to contain next chunk*/ - if ((size_t)((chunk - in) + 12) > insize || chunk < in) - CERROR_BREAK(state->error, 30); - - /*length of the data of the chunk, excluding the length bytes, chunk type and CRC bytes*/ - chunkLength = lodepng_chunk_length(chunk); - /*error: chunk length larger than the max PNG chunk size*/ - if (chunkLength > 2147483647) - CERROR_BREAK(state->error, 63); - - if ((size_t)((chunk - in) + chunkLength + 12) > insize || (chunk + chunkLength + 12) < in) { - CERROR_BREAK(state->error, 64); /*error: size of the in buffer too small to contain next chunk*/ - } - - data = lodepng_chunk_data_const(chunk); - - /*IDAT chunk, containing compressed image data*/ - if (lodepng_chunk_type_equals(chunk, "IDAT")) { - size_t oldsize = idat.size; - if (!ucvector_resize(&idat, oldsize + chunkLength)) - CERROR_BREAK(state->error, 83 /*alloc fail*/); - for (i = 0; i != chunkLength; ++i) - idat.data[oldsize + i] = data[i]; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - critical_pos = 3; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } - /*IEND chunk*/ - else if (lodepng_chunk_type_equals(chunk, "IEND")) { - IEND = 1; - } - /*palette chunk (PLTE)*/ - else if (lodepng_chunk_type_equals(chunk, "PLTE")) { - state->error = readChunk_PLTE(&state->info_png.color, data, chunkLength); - if (state->error) - break; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - critical_pos = 2; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } - /*palette transparency chunk (tRNS)*/ - else if (lodepng_chunk_type_equals(chunk, "tRNS")) { - state->error = readChunk_tRNS(&state->info_png.color, data, chunkLength); - if (state->error) - break; - } -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*background color chunk (bKGD)*/ - else if (lodepng_chunk_type_equals(chunk, "bKGD")) { - state->error = readChunk_bKGD(&state->info_png, data, chunkLength); - if (state->error) - break; - } - /*text chunk (tEXt)*/ - else if (lodepng_chunk_type_equals(chunk, "tEXt")) { - if (state->decoder.read_text_chunks) { - state->error = readChunk_tEXt(&state->info_png, data, chunkLength); - if (state->error) - break; - } - } - /*compressed text chunk (zTXt)*/ - else if (lodepng_chunk_type_equals(chunk, "zTXt")) { - if (state->decoder.read_text_chunks) { - state->error = readChunk_zTXt(&state->info_png, &state->decoder.zlibsettings, data, chunkLength); - if (state->error) - break; - } - } - /*international text chunk (iTXt)*/ - else if (lodepng_chunk_type_equals(chunk, "iTXt")) { - if (state->decoder.read_text_chunks) { - state->error = readChunk_iTXt(&state->info_png, &state->decoder.zlibsettings, data, chunkLength); - if (state->error) - break; - } - } else if (lodepng_chunk_type_equals(chunk, "tIME")) { - state->error = readChunk_tIME(&state->info_png, data, chunkLength); - if (state->error) - break; - } else if (lodepng_chunk_type_equals(chunk, "pHYs")) { - state->error = readChunk_pHYs(&state->info_png, data, chunkLength); - if (state->error) - break; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - else /*it's not an implemented chunk type, so ignore it: skip over the data*/ - { - /*error: unknown critical chunk (5th bit of first byte of chunk type is 0)*/ - if (!lodepng_chunk_ancillary(chunk)) - CERROR_BREAK(state->error, 69); - - unknown = 1; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if (state->decoder.remember_unknown_chunks) { - state->error = lodepng_chunk_append( - &state->info_png.unknown_chunks_data[critical_pos - 1], - &state->info_png.unknown_chunks_size[critical_pos - 1], - chunk); - if (state->error) - break; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } - - if (!state->decoder.ignore_crc && !unknown) /*check CRC if wanted, only on known chunk types*/ - { - if (lodepng_chunk_check_crc(chunk)) - CERROR_BREAK(state->error, 57); /*invalid CRC*/ - } - - if (!IEND) - chunk = lodepng_chunk_next_const(chunk); - } - - ucvector_init(&scanlines); - /*predict output size, to allocate exact size for output buffer to avoid more dynamic allocation. - If the decompressed size does not match the prediction, the image must be corrupt.*/ - if (state->info_png.interlace_method == 0) { - /*The extra *h is added because this are the filter bytes every scanline starts with*/ - predict = lodepng_get_raw_size_idat(*w, *h, &state->info_png.color) + *h; - } else { - /*Adam-7 interlaced: predicted size is the sum of the 7 sub-images sizes*/ - const LodePNGColorMode *color = &state->info_png.color; - predict = 0; - predict += lodepng_get_raw_size_idat((*w + 7) >> 3, (*h + 7) >> 3, color) + ((*h + 7) >> 3); - if (*w > 4) - predict += lodepng_get_raw_size_idat((*w + 3) >> 3, (*h + 7) >> 3, color) + ((*h + 7) >> 3); - predict += lodepng_get_raw_size_idat((*w + 3) >> 2, (*h + 3) >> 3, color) + ((*h + 3) >> 3); - if (*w > 2) - predict += lodepng_get_raw_size_idat((*w + 1) >> 2, (*h + 3) >> 2, color) + ((*h + 3) >> 2); - predict += lodepng_get_raw_size_idat((*w + 1) >> 1, (*h + 1) >> 2, color) + ((*h + 1) >> 2); - if (*w > 1) - predict += lodepng_get_raw_size_idat((*w + 0) >> 1, (*h + 1) >> 1, color) + ((*h + 1) >> 1); - predict += lodepng_get_raw_size_idat((*w + 0), (*h + 0) >> 1, color) + ((*h + 0) >> 1); - } - if (!state->error && !ucvector_reserve(&scanlines, predict)) - state->error = 83; /*alloc fail*/ - if (!state->error) { - state->error = - zlib_decompress(&scanlines.data, &scanlines.size, idat.data, idat.size, &state->decoder.zlibsettings); - if (!state->error && scanlines.size != predict) - state->error = 91; /*decompressed size doesn't match prediction*/ - } - ucvector_cleanup(&idat); - - if (!state->error) { - outsize = lodepng_get_raw_size(*w, *h, &state->info_png.color); - *out = (uint8_t *)lodepng_malloc(outsize); - if (!*out) - state->error = 83; /*alloc fail*/ - } - if (!state->error) { - for (i = 0; i < outsize; i++) - (*out)[i] = 0; - state->error = postProcessScanlines(*out, scanlines.data, *w, *h, &state->info_png); - } - ucvector_cleanup(&scanlines); -} - -unsigned lodepng_decode( - uint8_t **out, unsigned *w, unsigned *h, LodePNGState *state, const uint8_t *in, size_t insize) { - *out = 0; - decodeGeneric(out, w, h, state, in, insize); - if (state->error) - return state->error; - if (!state->decoder.color_convert || lodepng_color_mode_equal(&state->info_raw, &state->info_png.color)) { - /*same color type, no copying or converting of data needed*/ - /*store the info_png color settings on the info_raw so that the info_raw still reflects what colortype - the raw image has to the end user*/ - if (!state->decoder.color_convert) { - state->error = lodepng_color_mode_copy(&state->info_raw, &state->info_png.color); - if (state->error) - return state->error; - } - } else { - /*color conversion needed; sort of copy of the data*/ - uint8_t *data = *out; - size_t outsize; - - /*TODO: check if this works according to the statement in the documentation: "The converter can convert - from greyscale input color type, to 8-bit greyscale or greyscale with alpha"*/ - if (!(state->info_raw.colortype == LCT_RGB || state->info_raw.colortype == LCT_RGBA) && - !(state->info_raw.bitdepth == 8)) { - return 56; /*unsupported color mode conversion*/ - } - - outsize = lodepng_get_raw_size(*w, *h, &state->info_raw); - *out = (uint8_t *)lodepng_malloc(outsize); - if (!(*out)) { - state->error = 83; /*alloc fail*/ - } else - state->error = lodepng_convert(*out, data, &state->info_raw, &state->info_png.color, *w, *h); - lodepng_free(data); - } - return state->error; -} - -unsigned lodepng_decode_memory( - uint8_t **out, unsigned *w, unsigned *h, const uint8_t *in, size_t insize, LodePNGColorType colortype, - unsigned bitdepth) { - unsigned error; - LodePNGState state; - lodepng_state_init(&state); - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; - error = lodepng_decode(out, w, h, &state, in, insize); - lodepng_state_cleanup(&state); - return error; -} - -unsigned lodepng_decode32(uint8_t **out, unsigned *w, unsigned *h, const uint8_t *in, size_t insize) { - return lodepng_decode_memory(out, w, h, in, insize, LCT_RGBA, 8); -} - -unsigned lodepng_decode24(uint8_t **out, unsigned *w, unsigned *h, const uint8_t *in, size_t insize) { - return lodepng_decode_memory(out, w, h, in, insize, LCT_RGB, 8); -} - -#ifdef LODEPNG_COMPILE_DISK -unsigned lodepng_decode_file( - uint8_t **out, unsigned *w, unsigned *h, const char *filename, LodePNGColorType colortype, - unsigned bitdepth) { - uint8_t *buffer = 0; - size_t buffersize; - unsigned error; - error = lodepng_load_file(&buffer, &buffersize, filename); - if (!error) - error = lodepng_decode_memory(out, w, h, buffer, buffersize, colortype, bitdepth); - lodepng_free(buffer); - return error; -} - -unsigned lodepng_decode32_file(uint8_t **out, unsigned *w, unsigned *h, const char *filename) { - return lodepng_decode_file(out, w, h, filename, LCT_RGBA, 8); -} - -unsigned lodepng_decode24_file(uint8_t **out, unsigned *w, unsigned *h, const char *filename) { - return lodepng_decode_file(out, w, h, filename, LCT_RGB, 8); -} -#endif /*LODEPNG_COMPILE_DISK*/ - -void lodepng_decoder_settings_init(LodePNGDecoderSettings *settings) { - settings->color_convert = 1; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - settings->read_text_chunks = 1; - settings->remember_unknown_chunks = 0; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - settings->ignore_crc = 0; - lodepng_decompress_settings_init(&settings->zlibsettings); -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) - -void lodepng_state_init(LodePNGState *state) { -#ifdef LODEPNG_COMPILE_DECODER - lodepng_decoder_settings_init(&state->decoder); -#endif /*LODEPNG_COMPILE_DECODER*/ -#ifdef LODEPNG_COMPILE_ENCODER - lodepng_encoder_settings_init(&state->encoder); -#endif /*LODEPNG_COMPILE_ENCODER*/ - lodepng_color_mode_init(&state->info_raw); - lodepng_info_init(&state->info_png); - state->error = 1; -} - -void lodepng_state_cleanup(LodePNGState *state) { - lodepng_color_mode_cleanup(&state->info_raw); - lodepng_info_cleanup(&state->info_png); -} - -void lodepng_state_copy(LodePNGState *dest, const LodePNGState *source) { - lodepng_state_cleanup(dest); - *dest = *source; - lodepng_color_mode_init(&dest->info_raw); - lodepng_info_init(&dest->info_png); - dest->error = lodepng_color_mode_copy(&dest->info_raw, &source->info_raw); - if (dest->error) - return; - dest->error = lodepng_info_copy(&dest->info_png, &source->info_png); - if (dest->error) - return; -} - -#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */ - -#ifdef LODEPNG_COMPILE_ENCODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / PNG Encoder / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*chunkName must be string of 4 characters*/ -static unsigned addChunk(ucvector *out, const char *chunkName, const uint8_t *data, size_t length) { - CERROR_TRY_RETURN(lodepng_chunk_create(&out->data, &out->size, (unsigned)length, chunkName, data)); - out->allocsize = out->size; /*fix the allocsize again*/ - return 0; -} - -static void writeSignature(ucvector *out) { - /*8 bytes PNG signature, aka the magic bytes*/ - ucvector_push_back(out, 137); - ucvector_push_back(out, 80); - ucvector_push_back(out, 78); - ucvector_push_back(out, 71); - ucvector_push_back(out, 13); - ucvector_push_back(out, 10); - ucvector_push_back(out, 26); - ucvector_push_back(out, 10); -} - -static unsigned addChunk_IHDR( - ucvector *out, unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth, unsigned interlace_method) { - unsigned error = 0; - ucvector header; - ucvector_init(&header); - - lodepng_add32bitInt(&header, w); /*width*/ - lodepng_add32bitInt(&header, h); /*height*/ - ucvector_push_back(&header, (uint8_t)bitdepth); /*bit depth*/ - ucvector_push_back(&header, (uint8_t)colortype); /*color type*/ - ucvector_push_back(&header, 0); /*compression method*/ - ucvector_push_back(&header, 0); /*filter method*/ - ucvector_push_back(&header, interlace_method); /*interlace method*/ - - error = addChunk(out, "IHDR", header.data, header.size); - ucvector_cleanup(&header); - - return error; -} - -static unsigned addChunk_PLTE(ucvector *out, const LodePNGColorMode *info) { - unsigned error = 0; - size_t i; - ucvector PLTE; - ucvector_init(&PLTE); - for (i = 0; i != info->palettesize * 4; ++i) { - /*add all channels except alpha channel*/ - if (i % 4 != 3) - ucvector_push_back(&PLTE, info->palette[i]); - } - error = addChunk(out, "PLTE", PLTE.data, PLTE.size); - ucvector_cleanup(&PLTE); - - return error; -} - -static unsigned addChunk_tRNS(ucvector *out, const LodePNGColorMode *info) { - unsigned error = 0; - size_t i; - ucvector tRNS; - ucvector_init(&tRNS); - if (info->colortype == LCT_PALETTE) { - size_t amount = info->palettesize; - /*the tail of palette values that all have 255 as alpha, does not have to be encoded*/ - for (i = info->palettesize; i != 0; --i) { - if (info->palette[4 * (i - 1) + 3] == 255) - --amount; - else - break; - } - /*add only alpha channel*/ - for (i = 0; i != amount; ++i) - ucvector_push_back(&tRNS, info->palette[4 * i + 3]); - } else if (info->colortype == LCT_GREY) { - if (info->key_defined) { - ucvector_push_back(&tRNS, (uint8_t)(info->key_r >> 8)); - ucvector_push_back(&tRNS, (uint8_t)(info->key_r & 255)); - } - } else if (info->colortype == LCT_RGB) { - if (info->key_defined) { - ucvector_push_back(&tRNS, (uint8_t)(info->key_r >> 8)); - ucvector_push_back(&tRNS, (uint8_t)(info->key_r & 255)); - ucvector_push_back(&tRNS, (uint8_t)(info->key_g >> 8)); - ucvector_push_back(&tRNS, (uint8_t)(info->key_g & 255)); - ucvector_push_back(&tRNS, (uint8_t)(info->key_b >> 8)); - ucvector_push_back(&tRNS, (uint8_t)(info->key_b & 255)); - } - } - - error = addChunk(out, "tRNS", tRNS.data, tRNS.size); - ucvector_cleanup(&tRNS); - - return error; -} - -static unsigned -addChunk_IDAT(ucvector *out, const uint8_t *data, size_t datasize, LodePNGCompressSettings *zlibsettings) { - ucvector zlibdata; - unsigned error = 0; - - /*compress with the Zlib compressor*/ - ucvector_init(&zlibdata); - error = zlib_compress(&zlibdata.data, &zlibdata.size, data, datasize, zlibsettings); - if (!error) - error = addChunk(out, "IDAT", zlibdata.data, zlibdata.size); - ucvector_cleanup(&zlibdata); - - return error; -} - -static unsigned addChunk_IEND(ucvector *out) { - unsigned error = 0; - error = addChunk(out, "IEND", 0, 0); - return error; -} - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - -static unsigned addChunk_tEXt(ucvector *out, const char *keyword, const char *textstring) { - unsigned error = 0; - size_t i; - ucvector text; - ucvector_init(&text); - for (i = 0; keyword[i] != 0; ++i) - ucvector_push_back(&text, (uint8_t)keyword[i]); - if (i < 1 || i > 79) - return 89; /*error: invalid keyword size*/ - ucvector_push_back(&text, 0); /*0 termination char*/ - for (i = 0; textstring[i] != 0; ++i) - ucvector_push_back(&text, (uint8_t)textstring[i]); - error = addChunk(out, "tEXt", text.data, text.size); - ucvector_cleanup(&text); - - return error; -} - -static unsigned -addChunk_zTXt(ucvector *out, const char *keyword, const char *textstring, LodePNGCompressSettings *zlibsettings) { - unsigned error = 0; - ucvector data, compressed; - size_t i, textsize = strlen(textstring); - - ucvector_init(&data); - ucvector_init(&compressed); - for (i = 0; keyword[i] != 0; ++i) - ucvector_push_back(&data, (uint8_t)keyword[i]); - if (i < 1 || i > 79) - return 89; /*error: invalid keyword size*/ - ucvector_push_back(&data, 0); /*0 termination char*/ - ucvector_push_back(&data, 0); /*compression method: 0*/ - - error = zlib_compress(&compressed.data, &compressed.size, (uint8_t *)textstring, textsize, zlibsettings); - if (!error) { - for (i = 0; i != compressed.size; ++i) - ucvector_push_back(&data, compressed.data[i]); - error = addChunk(out, "zTXt", data.data, data.size); - } - - ucvector_cleanup(&compressed); - ucvector_cleanup(&data); - return error; -} - -static unsigned addChunk_iTXt( - ucvector *out, unsigned compressed, const char *keyword, const char *langtag, const char *transkey, - const char *textstring, LodePNGCompressSettings *zlibsettings) { - unsigned error = 0; - ucvector data; - size_t i, textsize = strlen(textstring); - - ucvector_init(&data); - - for (i = 0; keyword[i] != 0; ++i) - ucvector_push_back(&data, (uint8_t)keyword[i]); - if (i < 1 || i > 79) - return 89; /*error: invalid keyword size*/ - ucvector_push_back(&data, 0); /*null termination char*/ - ucvector_push_back(&data, compressed ? 1 : 0); /*compression flag*/ - ucvector_push_back(&data, 0); /*compression method*/ - for (i = 0; langtag[i] != 0; ++i) - ucvector_push_back(&data, (uint8_t)langtag[i]); - ucvector_push_back(&data, 0); /*null termination char*/ - for (i = 0; transkey[i] != 0; ++i) - ucvector_push_back(&data, (uint8_t)transkey[i]); - ucvector_push_back(&data, 0); /*null termination char*/ - - if (compressed) { - ucvector compressed_data; - ucvector_init(&compressed_data); - error = zlib_compress( - &compressed_data.data, &compressed_data.size, (uint8_t *)textstring, textsize, zlibsettings); - if (!error) { - for (i = 0; i != compressed_data.size; ++i) - ucvector_push_back(&data, compressed_data.data[i]); - } - ucvector_cleanup(&compressed_data); - } else /*not compressed*/ - { - for (i = 0; textstring[i] != 0; ++i) - ucvector_push_back(&data, (uint8_t)textstring[i]); - } - - if (!error) - error = addChunk(out, "iTXt", data.data, data.size); - ucvector_cleanup(&data); - return error; -} - -static unsigned addChunk_bKGD(ucvector *out, const LodePNGInfo *info) { - unsigned error = 0; - ucvector bKGD; - ucvector_init(&bKGD); - if (info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { - ucvector_push_back(&bKGD, (uint8_t)(info->background_r >> 8)); - ucvector_push_back(&bKGD, (uint8_t)(info->background_r & 255)); - } else if (info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { - ucvector_push_back(&bKGD, (uint8_t)(info->background_r >> 8)); - ucvector_push_back(&bKGD, (uint8_t)(info->background_r & 255)); - ucvector_push_back(&bKGD, (uint8_t)(info->background_g >> 8)); - ucvector_push_back(&bKGD, (uint8_t)(info->background_g & 255)); - ucvector_push_back(&bKGD, (uint8_t)(info->background_b >> 8)); - ucvector_push_back(&bKGD, (uint8_t)(info->background_b & 255)); - } else if (info->color.colortype == LCT_PALETTE) { - ucvector_push_back(&bKGD, (uint8_t)(info->background_r & 255)); /*palette index*/ - } - - error = addChunk(out, "bKGD", bKGD.data, bKGD.size); - ucvector_cleanup(&bKGD); - - return error; -} - -static unsigned addChunk_tIME(ucvector *out, const LodePNGTime *time) { - unsigned error = 0; - uint8_t *data = (uint8_t *)lodepng_malloc(7); - if (!data) - return 83; /*alloc fail*/ - data[0] = (uint8_t)(time->year >> 8); - data[1] = (uint8_t)(time->year & 255); - data[2] = (uint8_t)time->month; - data[3] = (uint8_t)time->day; - data[4] = (uint8_t)time->hour; - data[5] = (uint8_t)time->minute; - data[6] = (uint8_t)time->second; - error = addChunk(out, "tIME", data, 7); - lodepng_free(data); - return error; -} - -static unsigned addChunk_pHYs(ucvector *out, const LodePNGInfo *info) { - unsigned error = 0; - ucvector data; - ucvector_init(&data); - - lodepng_add32bitInt(&data, info->phys_x); - lodepng_add32bitInt(&data, info->phys_y); - ucvector_push_back(&data, info->phys_unit); - - error = addChunk(out, "pHYs", data.data, data.size); - ucvector_cleanup(&data); - - return error; -} - -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -static void filterScanline( - uint8_t *out, const uint8_t *scanline, const uint8_t *prevline, size_t length, size_t bytewidth, - uint8_t filterType) { - size_t i; - switch (filterType) { - case 0: /*None*/ - for (i = 0; i != length; ++i) - out[i] = scanline[i]; - break; - case 1: /*Sub*/ - for (i = 0; i != bytewidth; ++i) - out[i] = scanline[i]; - for (i = bytewidth; i < length; ++i) - out[i] = scanline[i] - scanline[i - bytewidth]; - break; - case 2: /*Up*/ - if (prevline) { - for (i = 0; i != length; ++i) - out[i] = scanline[i] - prevline[i]; - } else { - for (i = 0; i != length; ++i) - out[i] = scanline[i]; - } - break; - case 3: /*Average*/ - if (prevline) { - for (i = 0; i != bytewidth; ++i) - out[i] = scanline[i] - (prevline[i] >> 1); - for (i = bytewidth; i < length; ++i) - out[i] = scanline[i] - ((scanline[i - bytewidth] + prevline[i]) >> 1); - } else { - for (i = 0; i != bytewidth; ++i) - out[i] = scanline[i]; - for (i = bytewidth; i < length; ++i) - out[i] = scanline[i] - (scanline[i - bytewidth] >> 1); - } - break; - case 4: /*Paeth*/ - if (prevline) { - /*paethPredictor(0, prevline[i], 0) is always prevline[i]*/ - for (i = 0; i != bytewidth; ++i) - out[i] = (scanline[i] - prevline[i]); - for (i = bytewidth; i < length; ++i) { - out[i] = (scanline[i] - paethPredictor(scanline[i - bytewidth], prevline[i], prevline[i - bytewidth])); - } - } else { - for (i = 0; i != bytewidth; ++i) - out[i] = scanline[i]; - /*paethPredictor(scanline[i - bytewidth], 0, 0) is always scanline[i - bytewidth]*/ - for (i = bytewidth; i < length; ++i) - out[i] = (scanline[i] - scanline[i - bytewidth]); - } - break; - default: - return; /*unexisting filter type given*/ - } -} - -/* log2 approximation. A slight bit faster than std::log. */ -static float flog2(float f) { - float result = 0; - while (f > 32) { - result += 4; - f /= 16; - } - while (f > 2) { - ++result; - f /= 2; - } - return result + 1.442695f * (f * f * f / 3 - 3 * f * f / 2 + 3 * f - 1.83333f); -} - -static unsigned filter( - uint8_t *out, const uint8_t *in, unsigned w, unsigned h, const LodePNGColorMode *info, - const LodePNGEncoderSettings *settings) { - /* - For PNG filter method 0 - out must be a buffer with as size: h + (w * h * bpp + 7) / 8, because there are - the scanlines with 1 extra byte per scanline - */ - - unsigned bpp = lodepng_get_bpp(info); - /*the width of a scanline in bytes, not including the filter type*/ - size_t linebytes = (w * bpp + 7) / 8; - /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ - size_t bytewidth = (bpp + 7) / 8; - const uint8_t *prevline = 0; - unsigned x, y; - unsigned error = 0; - LodePNGFilterStrategy strategy = settings->filter_strategy; - - /* - There is a heuristic called the minimum sum of absolute differences heuristic, suggested by the PNG standard: - * If the image type is Palette, or the bit depth is smaller than 8, then do not filter the image (i.e. - use fixed filtering, with the filter None). - * (The other case) If the image type is Grayscale or RGB (with or without Alpha), and the bit depth is - not smaller than 8, then use adaptive filtering heuristic as follows: independently for each row, apply - all five filters and select the filter that produces the smallest sum of absolute values per row. - This heuristic is used if filter strategy is LFS_MINSUM and filter_palette_zero is true. - - If filter_palette_zero is true and filter_strategy is not LFS_MINSUM, the above heuristic is followed, - but for "the other case", whatever strategy filter_strategy is set to instead of the minimum sum - heuristic is used. - */ - if (settings->filter_palette_zero && (info->colortype == LCT_PALETTE || info->bitdepth < 8)) - strategy = LFS_ZERO; - - if (bpp == 0) - return 31; /*error: invalid color type*/ - - if (strategy == LFS_ZERO) { - for (y = 0; y != h; ++y) { - size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ - size_t inindex = linebytes * y; - out[outindex] = 0; /*filter type byte*/ - filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, 0); - prevline = &in[inindex]; - } - } else if (strategy == LFS_MINSUM) { - /*adaptive filtering*/ - size_t sum[5]; - uint8_t *attempt[5]; /*five filtering attempts, one for each filter type*/ - size_t smallest = 0; - uint8_t type, bestType = 0; - - for (type = 0; type != 5; ++type) { - attempt[type] = (uint8_t *)lodepng_malloc(linebytes); - if (!attempt[type]) - return 83; /*alloc fail*/ - } - - if (!error) { - for (y = 0; y != h; ++y) { - /*try the 5 filter types*/ - for (type = 0; type != 5; ++type) { - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - - /*calculate the sum of the result*/ - sum[type] = 0; - if (type == 0) { - for (x = 0; x != linebytes; ++x) - sum[type] += (uint8_t)(attempt[type][x]); - } else { - for (x = 0; x != linebytes; ++x) { - /*For differences, each byte should be treated as signed, values above 127 are negative - (converted to signed char). Filtertype 0 isn't a difference though, so use unsigned there. - This means filtertype 0 is almost never chosen, but that is justified.*/ - uint8_t s = attempt[type][x]; - sum[type] += s < 128 ? s : (255U - s); - } - } - - /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ - if (type == 0 || sum[type] < smallest) { - bestType = type; - smallest = sum[type]; - } - } - - prevline = &in[y * linebytes]; - - /*now fill the out values*/ - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for (x = 0; x != linebytes; ++x) - out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; - } - } - - for (type = 0; type != 5; ++type) - lodepng_free(attempt[type]); - } else if (strategy == LFS_ENTROPY) { - float sum[5]; - uint8_t *attempt[5]; /*five filtering attempts, one for each filter type*/ - float smallest = 0; - unsigned type, bestType = 0; - unsigned count[256]; - - for (type = 0; type != 5; ++type) { - attempt[type] = (uint8_t *)lodepng_malloc(linebytes); - if (!attempt[type]) - return 83; /*alloc fail*/ - } - - for (y = 0; y != h; ++y) { - /*try the 5 filter types*/ - for (type = 0; type != 5; ++type) { - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - for (x = 0; x != 256; ++x) - count[x] = 0; - for (x = 0; x != linebytes; ++x) - ++count[attempt[type][x]]; - ++count[type]; /*the filter type itself is part of the scanline*/ - sum[type] = 0; - for (x = 0; x != 256; ++x) { - float p = count[x] / (float)(linebytes + 1); - sum[type] += count[x] == 0 ? 0 : flog2(1 / p) * p; - } - /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ - if (type == 0 || sum[type] < smallest) { - bestType = type; - smallest = sum[type]; - } - } - - prevline = &in[y * linebytes]; - - /*now fill the out values*/ - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for (x = 0; x != linebytes; ++x) - out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; - } - - for (type = 0; type != 5; ++type) - lodepng_free(attempt[type]); - } else if (strategy == LFS_PREDEFINED) { - for (y = 0; y != h; ++y) { - size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ - size_t inindex = linebytes * y; - uint8_t type = settings->predefined_filters[y]; - out[outindex] = type; /*filter type byte*/ - filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); - prevline = &in[inindex]; - } - } else if (strategy == LFS_BRUTE_FORCE) { - /*brute force filter chooser. - deflate the scanline after every filter attempt to see which one deflates best. - This is very slow and gives only slightly smaller, sometimes even larger, result*/ - size_t size[5]; - uint8_t *attempt[5]; /*five filtering attempts, one for each filter type*/ - size_t smallest = 0; - unsigned type = 0, bestType = 0; - uint8_t *dummy; - LodePNGCompressSettings zlibsettings = settings->zlibsettings; - /*use fixed tree on the attempts so that the tree is not adapted to the filtertype on purpose, - to simulate the true case where the tree is the same for the whole image. Sometimes it gives - better result with dynamic tree anyway. Using the fixed tree sometimes gives worse, but in rare - cases better compression. It does make this a bit less slow, so it's worth doing this.*/ - zlibsettings.btype = 1; - /*a custom encoder likely doesn't read the btype setting and is optimized for complete PNG - images only, so disable it*/ - zlibsettings.custom_zlib = 0; - zlibsettings.custom_deflate = 0; - for (type = 0; type != 5; ++type) { - attempt[type] = (uint8_t *)lodepng_malloc(linebytes); - if (!attempt[type]) - return 83; /*alloc fail*/ - } - for (y = 0; y != h; ++y) /*try the 5 filter types*/ - { - for (type = 0; type != 5; ++type) { - unsigned testsize = linebytes; - /*if(testsize > 8) testsize /= 8;*/ /*it already works good enough by testing a part of the row*/ - - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - size[type] = 0; - dummy = 0; - zlib_compress(&dummy, &size[type], attempt[type], testsize, &zlibsettings); - lodepng_free(dummy); - /*check if this is smallest size (or if type == 0 it's the first case so always store the values)*/ - if (type == 0 || size[type] < smallest) { - bestType = type; - smallest = size[type]; - } - } - prevline = &in[y * linebytes]; - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for (x = 0; x != linebytes; ++x) - out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; - } - for (type = 0; type != 5; ++type) - lodepng_free(attempt[type]); - } else - return 88; /* unknown filter strategy */ - - return error; -} - -static void -addPaddingBits(uint8_t *out, const uint8_t *in, size_t olinebits, size_t ilinebits, unsigned h) { - /*The opposite of the removePaddingBits function - olinebits must be >= ilinebits*/ - unsigned y; - size_t diff = olinebits - ilinebits; - size_t obp = 0, ibp = 0; /*bit pointers*/ - for (y = 0; y != h; ++y) { - size_t x; - for (x = 0; x < ilinebits; ++x) { - uint8_t bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - /*obp += diff; --> no, fill in some value in the padding bits too, to avoid - "Use of uninitialised value of size ###" warning from valgrind*/ - for (x = 0; x != diff; ++x) - setBitOfReversedStream(&obp, out, 0); - } -} - -/* -in: non-interlaced image with size w*h -out: the same pixels, but re-ordered according to PNG's Adam7 interlacing, with - no padding bits between scanlines, but between reduced images so that each - reduced image starts at a byte. -bpp: bits per pixel -there are no padding bits, not between scanlines, not between reduced images -in has the following size in bits: w * h * bpp. -out is possibly bigger due to padding bits between reduced images -NOTE: comments about padding bits are only relevant if bpp < 8 -*/ -static void Adam7_interlace(uint8_t *out, const uint8_t *in, unsigned w, unsigned h, unsigned bpp) { - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - if (bpp >= 8) { - for (i = 0; i != 7; ++i) { - unsigned x, y, b; - size_t bytewidth = bpp / 8; - for (y = 0; y < passh[i]; ++y) - for (x = 0; x < passw[i]; ++x) { - size_t pixelinstart = - ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth; - size_t pixeloutstart = passstart[i] + (y * passw[i] + x) * bytewidth; - for (b = 0; b < bytewidth; ++b) { - out[pixeloutstart + b] = in[pixelinstart + b]; - } - } - } - } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ - { - for (i = 0; i != 7; ++i) { - unsigned x, y, b; - unsigned ilinebits = bpp * passw[i]; - unsigned olinebits = bpp * w; - size_t obp, ibp; /*bit pointers (for out and in buffer)*/ - for (y = 0; y < passh[i]; ++y) - for (x = 0; x < passw[i]; ++x) { - ibp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp; - obp = (8 * passstart[i]) + (y * ilinebits + x * bpp); - for (b = 0; b < bpp; ++b) { - uint8_t bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - } - } - } -} - -/*out must be buffer big enough to contain uncompressed IDAT chunk data, and in must contain the full image. -return value is error**/ -static unsigned preProcessScanlines( - uint8_t **out, size_t *outsize, const uint8_t *in, unsigned w, unsigned h, const LodePNGInfo *info_png, - const LodePNGEncoderSettings *settings) { - /* - This function converts the pure 2D image with the PNG's colortype, into filtered-padded-interlaced data. Steps: - *) if no Adam7: 1) add padding bits (= posible extra bits per scanline if bpp < 8) 2) filter - *) if adam7: 1) Adam7_interlace 2) 7x add padding bits 3) 7x filter - */ - unsigned bpp = lodepng_get_bpp(&info_png->color); - unsigned error = 0; - - if (info_png->interlace_method == 0) { - *outsize = h + (h * ((w * bpp + 7) / 8)); /*image size plus an extra byte per scanline + possible padding bits*/ - *out = (uint8_t *)lodepng_malloc(*outsize); - if (!(*out) && (*outsize)) - error = 83; /*alloc fail*/ - - if (!error) { - /*non multiple of 8 bits per scanline, padding bits needed per scanline*/ - if (bpp < 8 && w * bpp != ((w * bpp + 7) / 8) * 8) { - uint8_t *padded = (uint8_t *)lodepng_malloc(h * ((w * bpp + 7) / 8)); - if (!padded) - error = 83; /*alloc fail*/ - if (!error) { - addPaddingBits(padded, in, ((w * bpp + 7) / 8) * 8, w * bpp, h); - error = filter(*out, padded, w, h, &info_png->color, settings); - } - lodepng_free(padded); - } else { - /*we can immediately filter into the out buffer, no other steps needed*/ - error = filter(*out, in, w, h, &info_png->color, settings); - } - } - } else /*interlace_method is 1 (Adam7)*/ - { - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - uint8_t *adam7; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - *outsize = filter_passstart[7]; /*image size plus an extra byte per scanline + possible padding bits*/ - *out = (uint8_t *)lodepng_malloc(*outsize); - if (!(*out)) - error = 83; /*alloc fail*/ - - adam7 = (uint8_t *)lodepng_malloc(passstart[7]); - if (!adam7 && passstart[7]) - error = 83; /*alloc fail*/ - - if (!error) { - unsigned i; - - Adam7_interlace(adam7, in, w, h, bpp); - for (i = 0; i != 7; ++i) { - if (bpp < 8) { - uint8_t *padded = - (uint8_t *)lodepng_malloc(padded_passstart[i + 1] - padded_passstart[i]); - if (!padded) - ERROR_BREAK(83); /*alloc fail*/ - addPaddingBits( - padded, &adam7[passstart[i]], ((passw[i] * bpp + 7) / 8) * 8, passw[i] * bpp, passh[i]); - error = - filter(&(*out)[filter_passstart[i]], padded, passw[i], passh[i], &info_png->color, settings); - lodepng_free(padded); - } else { - error = filter( - &(*out)[filter_passstart[i]], - &adam7[padded_passstart[i]], - passw[i], - passh[i], - &info_png->color, - settings); - } - - if (error) - break; - } - } - - lodepng_free(adam7); - } - - return error; -} - -/* -palette must have 4 * palettesize bytes allocated, and given in format RGBARGBARGBARGBA... -returns 0 if the palette is opaque, -returns 1 if the palette has a single color with alpha 0 ==> color key -returns 2 if the palette is semi-translucent. -*/ -static unsigned getPaletteTranslucency(const uint8_t *palette, size_t palettesize) { - size_t i; - unsigned key = 0; - unsigned r = 0, g = 0, b = 0; /*the value of the color with alpha 0, so long as color keying is possible*/ - for (i = 0; i != palettesize; ++i) { - if (!key && palette[4 * i + 3] == 0) { - r = palette[4 * i + 0]; - g = palette[4 * i + 1]; - b = palette[4 * i + 2]; - key = 1; - i = (size_t)(-1); /*restart from beginning, to detect earlier opaque colors with key's value*/ - } else if (palette[4 * i + 3] != 255) - return 2; - /*when key, no opaque RGB may have key's RGB*/ - else if (key && r == palette[i * 4 + 0] && g == palette[i * 4 + 1] && b == palette[i * 4 + 2]) - return 2; - } - return key; -} - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -static unsigned addUnknownChunks(ucvector *out, uint8_t *data, size_t datasize) { - uint8_t *inchunk = data; - while ((size_t)(inchunk - data) < datasize) { - CERROR_TRY_RETURN(lodepng_chunk_append(&out->data, &out->size, inchunk)); - out->allocsize = out->size; /*fix the allocsize again*/ - inchunk = lodepng_chunk_next(inchunk); - } - return 0; -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -unsigned lodepng_encode( - uint8_t **out, size_t *outsize, const uint8_t *image, unsigned w, unsigned h, LodePNGState *state) { - LodePNGInfo info; - ucvector outv; - uint8_t *data = 0; /*uncompressed version of the IDAT chunk data*/ - size_t datasize = 0; - - /*provide some proper output values if error will happen*/ - *out = 0; - *outsize = 0; - state->error = 0; - - lodepng_info_init(&info); - lodepng_info_copy(&info, &state->info_png); - - if ((info.color.colortype == LCT_PALETTE || state->encoder.force_palette) && - (info.color.palettesize == 0 || info.color.palettesize > 256)) { - state->error = 68; /*invalid palette size, it is only allowed to be 1-256*/ - return state->error; - } - - if (state->encoder.auto_convert) { - state->error = lodepng_auto_choose_color(&info.color, image, w, h, &state->info_raw); - } - if (state->error) - return state->error; - - if (state->encoder.zlibsettings.btype > 2) { - CERROR_RETURN_ERROR(state->error, 61); /*error: unexisting btype*/ - } - if (state->info_png.interlace_method > 1) { - CERROR_RETURN_ERROR(state->error, 71); /*error: unexisting interlace mode*/ - } - - state->error = checkColorValidity(info.color.colortype, info.color.bitdepth); - if (state->error) - return state->error; /*error: unexisting color type given*/ - state->error = checkColorValidity(state->info_raw.colortype, state->info_raw.bitdepth); - if (state->error) - return state->error; /*error: unexisting color type given*/ - - if (!lodepng_color_mode_equal(&state->info_raw, &info.color)) { - uint8_t *converted; - size_t size = (w * h * (size_t)lodepng_get_bpp(&info.color) + 7) / 8; - - converted = (uint8_t *)lodepng_malloc(size); - if (!converted && size) - state->error = 83; /*alloc fail*/ - if (!state->error) { - state->error = lodepng_convert(converted, image, &info.color, &state->info_raw, w, h); - } - if (!state->error) - preProcessScanlines(&data, &datasize, converted, w, h, &info, &state->encoder); - lodepng_free(converted); - } else - preProcessScanlines(&data, &datasize, image, w, h, &info, &state->encoder); - - ucvector_init(&outv); - while (!state->error) /*while only executed once, to break on error*/ - { -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - size_t i; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - /*write signature and chunks*/ - writeSignature(&outv); - /*IHDR*/ - addChunk_IHDR(&outv, w, h, info.color.colortype, info.color.bitdepth, info.interlace_method); -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*unknown chunks between IHDR and PLTE*/ - if (info.unknown_chunks_data[0]) { - state->error = addUnknownChunks(&outv, info.unknown_chunks_data[0], info.unknown_chunks_size[0]); - if (state->error) - break; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - /*PLTE*/ - if (info.color.colortype == LCT_PALETTE) { - addChunk_PLTE(&outv, &info.color); - } - if (state->encoder.force_palette && (info.color.colortype == LCT_RGB || info.color.colortype == LCT_RGBA)) { - addChunk_PLTE(&outv, &info.color); - } - /*tRNS*/ - if (info.color.colortype == LCT_PALETTE && - getPaletteTranslucency(info.color.palette, info.color.palettesize) != 0) { - addChunk_tRNS(&outv, &info.color); - } - if ((info.color.colortype == LCT_GREY || info.color.colortype == LCT_RGB) && info.color.key_defined) { - addChunk_tRNS(&outv, &info.color); - } -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*bKGD (must come between PLTE and the IDAt chunks*/ - if (info.background_defined) - addChunk_bKGD(&outv, &info); - /*pHYs (must come before the IDAT chunks)*/ - if (info.phys_defined) - addChunk_pHYs(&outv, &info); - - /*unknown chunks between PLTE and IDAT*/ - if (info.unknown_chunks_data[1]) { - state->error = addUnknownChunks(&outv, info.unknown_chunks_data[1], info.unknown_chunks_size[1]); - if (state->error) - break; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - /*IDAT (multiple IDAT chunks must be consecutive)*/ - state->error = addChunk_IDAT(&outv, data, datasize, &state->encoder.zlibsettings); - if (state->error) - break; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*tIME*/ - if (info.time_defined) - addChunk_tIME(&outv, &info.time); - /*tEXt and/or zTXt*/ - for (i = 0; i != info.text_num; ++i) { - if (strlen(info.text_keys[i]) > 79) { - state->error = 66; /*text chunk too large*/ - break; - } - if (strlen(info.text_keys[i]) < 1) { - state->error = 67; /*text chunk too small*/ - break; - } - if (state->encoder.text_compression) { - addChunk_zTXt(&outv, info.text_keys[i], info.text_strings[i], &state->encoder.zlibsettings); - } else { - addChunk_tEXt(&outv, info.text_keys[i], info.text_strings[i]); - } - } - /*LodePNG version id in text chunk*/ - if (state->encoder.add_id) { - unsigned alread_added_id_text = 0; - for (i = 0; i != info.text_num; ++i) { - if (!strcmp(info.text_keys[i], "LodePNG")) { - alread_added_id_text = 1; - break; - } - } - if (alread_added_id_text == 0) { - addChunk_tEXt(&outv, "LodePNG", LODEPNG_VERSION_STRING); /*it's shorter as tEXt than as zTXt chunk*/ - } - } - /*iTXt*/ - for (i = 0; i != info.itext_num; ++i) { - if (strlen(info.itext_keys[i]) > 79) { - state->error = 66; /*text chunk too large*/ - break; - } - if (strlen(info.itext_keys[i]) < 1) { - state->error = 67; /*text chunk too small*/ - break; - } - addChunk_iTXt( - &outv, - state->encoder.text_compression, - info.itext_keys[i], - info.itext_langtags[i], - info.itext_transkeys[i], - info.itext_strings[i], - &state->encoder.zlibsettings); - } - - /*unknown chunks between IDAT and IEND*/ - if (info.unknown_chunks_data[2]) { - state->error = addUnknownChunks(&outv, info.unknown_chunks_data[2], info.unknown_chunks_size[2]); - if (state->error) - break; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - addChunk_IEND(&outv); - - break; /*this isn't really a while loop; no error happened so break out now!*/ - } - - lodepng_info_cleanup(&info); - lodepng_free(data); - /*instead of cleaning the vector up, give it to the output*/ - *out = outv.data; - *outsize = outv.size; - - return state->error; -} - -unsigned lodepng_encode_memory( - uint8_t **out, size_t *outsize, const uint8_t *image, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - unsigned error; - LodePNGState state; - lodepng_state_init(&state); - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; - state.info_png.color.colortype = colortype; - state.info_png.color.bitdepth = bitdepth; - lodepng_encode(out, outsize, image, w, h, &state); - error = state.error; - lodepng_state_cleanup(&state); - return error; -} - -unsigned lodepng_encode32(uint8_t **out, size_t *outsize, const uint8_t *image, unsigned w, unsigned h) { - return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGBA, 8); -} - -unsigned lodepng_encode24(uint8_t **out, size_t *outsize, const uint8_t *image, unsigned w, unsigned h) { - return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGB, 8); -} - -#ifdef LODEPNG_COMPILE_DISK -unsigned lodepng_encode_file( - const char *filename, const uint8_t *image, unsigned w, unsigned h, LodePNGColorType colortype, - unsigned bitdepth) { - uint8_t *buffer; - size_t buffersize; - unsigned error = lodepng_encode_memory(&buffer, &buffersize, image, w, h, colortype, bitdepth); - if (!error) - error = lodepng_save_file(buffer, buffersize, filename); - lodepng_free(buffer); - return error; -} - -unsigned lodepng_encode32_file(const char *filename, const uint8_t *image, unsigned w, unsigned h) { - return lodepng_encode_file(filename, image, w, h, LCT_RGBA, 8); -} - -unsigned lodepng_encode24_file(const char *filename, const uint8_t *image, unsigned w, unsigned h) { - return lodepng_encode_file(filename, image, w, h, LCT_RGB, 8); -} -#endif /*LODEPNG_COMPILE_DISK*/ - -void lodepng_encoder_settings_init(LodePNGEncoderSettings *settings) { - lodepng_compress_settings_init(&settings->zlibsettings); - settings->filter_palette_zero = 1; - settings->filter_strategy = LFS_MINSUM; - settings->auto_convert = 1; - settings->force_palette = 0; - settings->predefined_filters = 0; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - settings->add_id = 0; - settings->text_compression = 1; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} - -#endif /*LODEPNG_COMPILE_ENCODER*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ERROR_TEXT -/* -This returns the description of a numerical error code in English. This is also -the documentation of all the error codes. -*/ -const char *lodepng_error_text(unsigned code) { - switch (code) { - case 0: - return "no error, everything went ok"; - case 1: - return "nothing done yet"; /*the Encoder/Decoder has done nothing yet, error checking makes no sense yet*/ - case 10: - return "end of input memory reached without huffman end code"; /*while huffman decoding*/ - case 11: - return "error in code tree made it jump outside of huffman tree"; /*while huffman decoding*/ - case 13: - return "problem while processing dynamic deflate block"; - case 14: - return "problem while processing dynamic deflate block"; - case 15: - return "problem while processing dynamic deflate block"; - case 16: - return "unexisting code while processing dynamic deflate block"; - case 17: - return "end of out buffer memory reached while inflating"; - case 18: - return "invalid distance code while inflating"; - case 19: - return "end of out buffer memory reached while inflating"; - case 20: - return "invalid deflate block BTYPE encountered while decoding"; - case 21: - return "NLEN is not ones complement of LEN in a deflate block"; - /*end of out buffer memory reached while inflating: - This can happen if the inflated deflate data is longer than the amount of bytes required to fill up - all the pixels of the image, given the color depth and image dimensions. Something that doesn't - happen in a normal, well encoded, PNG image.*/ - case 22: - return "end of out buffer memory reached while inflating"; - case 23: - return "end of in buffer memory reached while inflating"; - case 24: - return "invalid FCHECK in zlib header"; - case 25: - return "invalid compression method in zlib header"; - case 26: - return "FDICT encountered in zlib header while it's not used for PNG"; - case 27: - return "PNG file is smaller than a PNG header"; - /*Checks the magic file header, the first 8 bytes of the PNG file*/ - case 28: - return "incorrect PNG signature, it's no PNG or corrupted"; - case 29: - return "first chunk is not the header chunk"; - case 30: - return "chunk length too large, chunk broken off at end of file"; - case 31: - return "illegal PNG color type or bpp"; - case 32: - return "illegal PNG compression method"; - case 33: - return "illegal PNG filter method"; - case 34: - return "illegal PNG interlace method"; - case 35: - return "chunk length of a chunk is too large or the chunk too small"; - case 36: - return "illegal PNG filter type encountered"; - case 37: - return "illegal bit depth for this color type given"; - case 38: - return "the palette is too big"; /*more than 256 colors*/ - case 39: - return "more palette alpha values given in tRNS chunk than there are colors in the palette"; - case 40: - return "tRNS chunk has wrong size for greyscale image"; - case 41: - return "tRNS chunk has wrong size for RGB image"; - case 42: - return "tRNS chunk appeared while it was not allowed for this color type"; - case 43: - return "bKGD chunk has wrong size for palette image"; - case 44: - return "bKGD chunk has wrong size for greyscale image"; - case 45: - return "bKGD chunk has wrong size for RGB image"; - case 48: - return "empty input buffer given to decoder. Maybe caused by non-existing file?"; - case 49: - return "jumped past memory while generating dynamic huffman tree"; - case 50: - return "jumped past memory while generating dynamic huffman tree"; - case 51: - return "jumped past memory while inflating huffman block"; - case 52: - return "jumped past memory while inflating"; - case 53: - return "size of zlib data too small"; - case 54: - return "repeat symbol in tree while there was no value symbol yet"; - /*jumped past tree while generating huffman tree, this could be when the - tree will have more leaves than symbols after generating it out of the - given lenghts. They call this an oversubscribed dynamic bit lengths tree in zlib.*/ - case 55: - return "jumped past tree while generating huffman tree"; - case 56: - return "given output image colortype or bitdepth not supported for color conversion"; - case 57: - return "invalid CRC encountered (checking CRC can be disabled)"; - case 58: - return "invalid ADLER32 encountered (checking ADLER32 can be disabled)"; - case 59: - return "requested color conversion not supported"; - case 60: - return "invalid window size given in the settings of the encoder (must be 0-32768)"; - case 61: - return "invalid BTYPE given in the settings of the encoder (only 0, 1 and 2 are allowed)"; - /*LodePNG leaves the choice of RGB to greyscale conversion formula to the user.*/ - case 62: - return "conversion from color to greyscale not supported"; - case 63: - return "length of a chunk too long, max allowed for PNG is 2147483647 bytes per chunk"; /*(2^31-1)*/ - /*this would result in the inability of a deflated block to ever contain an end code. It must be at least 1.*/ - case 64: - return "the length of the END symbol 256 in the Huffman tree is 0"; - case 66: - return "the length of a text chunk keyword given to the encoder is longer than the maximum of 79 bytes"; - case 67: - return "the length of a text chunk keyword given to the encoder is smaller than the minimum of 1 byte"; - case 68: - return "tried to encode a PLTE chunk with a palette that has less than 1 or more than 256 colors"; - case 69: - return "unknown chunk type with 'critical' flag encountered by the decoder"; - case 71: - return "unexisting interlace mode given to encoder (must be 0 or 1)"; - case 72: - return "while decoding, unexisting compression method encountering in zTXt or iTXt chunk (it must be 0)"; - case 73: - return "invalid tIME chunk size"; - case 74: - return "invalid pHYs chunk size"; - /*length could be wrong, or data chopped off*/ - case 75: - return "no null termination char found while decoding text chunk"; - case 76: - return "iTXt chunk too short to contain required bytes"; - case 77: - return "integer overflow in buffer size"; - case 78: - return "failed to open file for reading"; /*file doesn't exist or couldn't be opened for reading*/ - case 79: - return "failed to open file for writing"; - case 80: - return "tried creating a tree of 0 symbols"; - case 81: - return "lazy matching at pos 0 is impossible"; - case 82: - return "color conversion to palette requested while a color isn't in palette"; - case 83: - return "memory allocation failed"; - case 84: - return "given image too small to contain all pixels to be encoded"; - case 86: - return "impossible offset in lz77 encoding (internal bug)"; - case 87: - return "must provide custom zlib function pointer if LODEPNG_COMPILE_ZLIB is not defined"; - case 88: - return "invalid filter strategy given for LodePNGEncoderSettings.filter_strategy"; - case 89: - return "text chunk keyword too short or long: must have size 1-79"; - /*the windowsize in the LodePNGCompressSettings. Requiring POT(==> & instead of %) makes encoding 12% faster.*/ - case 90: - return "windowsize must be a power of two"; - case 91: - return "invalid decompressed idat size"; - case 92: - return "too many pixels, not supported"; - case 93: - return "zero width or height is invalid"; - case 94: - return "header chunk must have a size of 13 bytes"; - } - return "unknown error code"; -} -#endif /*LODEPNG_COMPILE_ERROR_TEXT*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // C++ Wrapper // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_CPP -namespace lodepng { - -#ifdef LODEPNG_COMPILE_DISK -unsigned load_file(std::vector &buffer, const std::string &filename) { - long size = lodepng_filesize(filename.c_str()); - if (size < 0) - return 78; - buffer.resize((size_t)size); - return size == 0 ? 0 : lodepng_buffer_file(&buffer[0], (size_t)size, filename.c_str()); -} - -/*write given buffer to the file, overwriting the file, it doesn't append to it.*/ -unsigned save_file(const std::vector &buffer, const std::string &filename) { - return lodepng_save_file(buffer.empty() ? 0 : &buffer[0], buffer.size(), filename.c_str()); -} -#endif /* LODEPNG_COMPILE_DISK */ - -#ifdef LODEPNG_COMPILE_ZLIB -#ifdef LODEPNG_COMPILE_DECODER -unsigned decompress( - std::vector &out, const uint8_t *in, size_t insize, - const LodePNGDecompressSettings &settings) { - uint8_t *buffer = 0; - size_t buffersize = 0; - unsigned error = zlib_decompress(&buffer, &buffersize, in, insize, &settings); - if (buffer) { - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned decompress( - std::vector &out, const std::vector &in, const LodePNGDecompressSettings &settings) { - return decompress(out, in.empty() ? 0 : &in[0], in.size(), settings); -} -#endif /* LODEPNG_COMPILE_DECODER */ - -#ifdef LODEPNG_COMPILE_ENCODER -unsigned compress( - std::vector &out, const uint8_t *in, size_t insize, const LodePNGCompressSettings &settings) { - uint8_t *buffer = 0; - size_t buffersize = 0; - unsigned error = zlib_compress(&buffer, &buffersize, in, insize, &settings); - if (buffer) { - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned compress( - std::vector &out, const std::vector &in, const LodePNGCompressSettings &settings) { - return compress(out, in.empty() ? 0 : &in[0], in.size(), settings); -} -#endif /* LODEPNG_COMPILE_ENCODER */ -#endif /* LODEPNG_COMPILE_ZLIB */ - -#ifdef LODEPNG_COMPILE_PNG - -State::State() { lodepng_state_init(this); } - -State::State(const State &other) { - lodepng_state_init(this); - lodepng_state_copy(this, &other); -} - -State::~State() { lodepng_state_cleanup(this); } - -State &State::operator=(const State &other) { - lodepng_state_copy(this, &other); - return *this; -} - -#ifdef LODEPNG_COMPILE_DECODER - -unsigned decode( - std::vector &out, unsigned &w, unsigned &h, const uint8_t *in, size_t insize, - LodePNGColorType colortype, unsigned bitdepth) { - uint8_t *buffer; - unsigned error = lodepng_decode_memory(&buffer, &w, &h, in, insize, colortype, bitdepth); - if (buffer && !error) { - State state; - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; - size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned decode( - std::vector &out, unsigned &w, unsigned &h, const std::vector &in, - LodePNGColorType colortype, unsigned bitdepth) { - return decode(out, w, h, in.empty() ? 0 : &in[0], (unsigned)in.size(), colortype, bitdepth); -} - -unsigned decode( - std::vector &out, unsigned &w, unsigned &h, State &state, const uint8_t *in, size_t insize) { - uint8_t *buffer = NULL; - unsigned error = lodepng_decode(&buffer, &w, &h, &state, in, insize); - if (buffer && !error) { - size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - } - lodepng_free(buffer); - return error; -} - -unsigned -decode(std::vector &out, unsigned &w, unsigned &h, State &state, const std::vector &in) { - return decode(out, w, h, state, in.empty() ? 0 : &in[0], in.size()); -} - -#ifdef LODEPNG_COMPILE_DISK -unsigned decode( - std::vector &out, unsigned &w, unsigned &h, const std::string &filename, LodePNGColorType colortype, - unsigned bitdepth) { - std::vector buffer; - unsigned error = load_file(buffer, filename); - if (error) - return error; - return decode(out, w, h, buffer, colortype, bitdepth); -} -#endif /* LODEPNG_COMPILE_DECODER */ -#endif /* LODEPNG_COMPILE_DISK */ - -#ifdef LODEPNG_COMPILE_ENCODER -unsigned encode( - std::vector &out, const uint8_t *in, unsigned w, unsigned h, LodePNGColorType colortype, - unsigned bitdepth) { - uint8_t *buffer; - size_t buffersize; - unsigned error = lodepng_encode_memory(&buffer, &buffersize, in, w, h, colortype, bitdepth); - if (buffer) { - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned encode( - std::vector &out, const std::vector &in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - if (lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) - return 84; - return encode(out, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); -} - -unsigned encode(std::vector &out, const uint8_t *in, unsigned w, unsigned h, State &state) { - uint8_t *buffer; - size_t buffersize; - unsigned error = lodepng_encode(&buffer, &buffersize, in, w, h, &state); - if (buffer) { - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned -encode(std::vector &out, const std::vector &in, unsigned w, unsigned h, State &state) { - if (lodepng_get_raw_size(w, h, &state.info_raw) > in.size()) - return 84; - return encode(out, in.empty() ? 0 : &in[0], w, h, state); -} - -#ifdef LODEPNG_COMPILE_DISK -unsigned encode( - const std::string &filename, const uint8_t *in, unsigned w, unsigned h, LodePNGColorType colortype, - unsigned bitdepth) { - std::vector buffer; - unsigned error = encode(buffer, in, w, h, colortype, bitdepth); - if (!error) - error = save_file(buffer, filename); - return error; -} - -unsigned encode( - const std::string &filename, const std::vector &in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - if (lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) - return 84; - return encode(filename, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); -} -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_ENCODER */ -#endif /* LODEPNG_COMPILE_PNG */ -} /* namespace lodepng */ -#endif /*LODEPNG_COMPILE_CPP*/ diff --git a/src/lodepng.h b/src/lodepng.h deleted file mode 100644 index d611fbf..0000000 --- a/src/lodepng.h +++ /dev/null @@ -1,1722 +0,0 @@ -/* -LodePNG version 20160501 - -Copyright (c) 2005-2016 Lode Vandevenne - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*/ - -#ifndef LODEPNG_H -#define LODEPNG_H - -#include /*for size_t*/ - -extern const char *LODEPNG_VERSION_STRING; - -/* -The following #defines are used to create code sections. They can be disabled -to disable code sections, which can give faster compile time and smaller binary. -The "NO_COMPILE" defines are designed to be used to pass as defines to the -compiler command to disable them without modifying this header, e.g. --DLODEPNG_NO_COMPILE_ZLIB for gcc. -In addition to those below, you can also define LODEPNG_NO_COMPILE_CRC to -allow implementing a custom lodepng_crc32. -*/ -/*deflate & zlib. If disabled, you must specify alternative zlib functions in -the custom_zlib field of the compress and decompress settings*/ -#ifndef LODEPNG_NO_COMPILE_ZLIB -#define LODEPNG_COMPILE_ZLIB -#endif -/*png encoder and png decoder*/ -#ifndef LODEPNG_NO_COMPILE_PNG -#define LODEPNG_COMPILE_PNG -#endif -/*deflate&zlib decoder and png decoder*/ -#ifndef LODEPNG_NO_COMPILE_DECODER -#define LODEPNG_COMPILE_DECODER -#endif -/*deflate&zlib encoder and png encoder*/ -#ifndef LODEPNG_NO_COMPILE_ENCODER -#define LODEPNG_COMPILE_ENCODER -#endif -/*the optional built in harddisk file loading and saving functions*/ -#ifndef LODEPNG_NO_COMPILE_DISK -#define LODEPNG_COMPILE_DISK -#endif -/*support for chunks other than IHDR, IDAT, PLTE, tRNS, IEND: ancillary and unknown chunks*/ -#ifndef LODEPNG_NO_COMPILE_ANCILLARY_CHUNKS -#define LODEPNG_COMPILE_ANCILLARY_CHUNKS -#endif -/*ability to convert error numerical codes to English text string*/ -#ifndef LODEPNG_NO_COMPILE_ERROR_TEXT -#define LODEPNG_COMPILE_ERROR_TEXT -#endif -/*Compile the default allocators (C's free, malloc and realloc). If you disable this, -you can define the functions lodepng_free, lodepng_malloc and lodepng_realloc in your -source files with custom allocators.*/ -#ifndef LODEPNG_NO_COMPILE_ALLOCATORS -#define LODEPNG_COMPILE_ALLOCATORS -#endif -/*compile the C++ version (you can disable the C++ wrapper here even when compiling for C++)*/ -#ifdef __cplusplus -#ifndef LODEPNG_NO_COMPILE_CPP -#define LODEPNG_COMPILE_CPP -#endif -#endif - -#ifdef LODEPNG_COMPILE_CPP -#include -#include -#endif /*LODEPNG_COMPILE_CPP*/ - -#ifdef LODEPNG_COMPILE_PNG -/*The PNG color types (also used for raw).*/ -typedef enum LodePNGColorType { - LCT_GREY = 0, /*greyscale: 1,2,4,8,16 bit*/ - LCT_RGB = 2, /*RGB: 8,16 bit*/ - LCT_PALETTE = 3, /*palette: 1,2,4,8 bit*/ - LCT_GREY_ALPHA = 4, /*greyscale with alpha: 8,16 bit*/ - LCT_RGBA = 6 /*RGB with alpha: 8,16 bit*/ -} LodePNGColorType; - -#ifdef LODEPNG_COMPILE_DECODER -/* -Converts PNG data in memory to raw pixel data. -out: Output parameter. Pointer to buffer that will contain the raw pixel data. - After decoding, its size is w * h * (bytes per pixel) bytes larger than - initially. Bytes per pixel depends on colortype and bitdepth. - Must be freed after usage with free(*out). - Note: for 16-bit per channel colors, uses big endian format like PNG does. -w: Output parameter. Pointer to width of pixel data. -h: Output parameter. Pointer to height of pixel data. -in: Memory buffer with the PNG file. -insize: size of the in buffer. -colortype: the desired color type for the raw output image. See explanation on PNG color types. -bitdepth: the desired bit depth for the raw output image. See explanation on PNG color types. -Return value: LodePNG error code (0 means no error). -*/ -unsigned lodepng_decode_memory( - uint8_t **out, unsigned *w, unsigned *h, const uint8_t *in, size_t insize, LodePNGColorType colortype, - unsigned bitdepth); - -/*Same as lodepng_decode_memory, but always decodes to 32-bit RGBA raw image*/ -unsigned lodepng_decode32(uint8_t **out, unsigned *w, unsigned *h, const uint8_t *in, size_t insize); - -/*Same as lodepng_decode_memory, but always decodes to 24-bit RGB raw image*/ -unsigned lodepng_decode24(uint8_t **out, unsigned *w, unsigned *h, const uint8_t *in, size_t insize); - -#ifdef LODEPNG_COMPILE_DISK -/* -Load PNG from disk, from file with given name. -Same as the other decode functions, but instead takes a filename as input. -*/ -unsigned lodepng_decode_file( - uint8_t **out, unsigned *w, unsigned *h, const char *filename, LodePNGColorType colortype, unsigned bitdepth); - -/*Same as lodepng_decode_file, but always decodes to 32-bit RGBA raw image.*/ -unsigned lodepng_decode32_file(uint8_t **out, unsigned *w, unsigned *h, const char *filename); - -/*Same as lodepng_decode_file, but always decodes to 24-bit RGB raw image.*/ -unsigned lodepng_decode24_file(uint8_t **out, unsigned *w, unsigned *h, const char *filename); -#endif /*LODEPNG_COMPILE_DISK*/ -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/* -Converts raw pixel data into a PNG image in memory. The colortype and bitdepth - of the output PNG image cannot be chosen, they are automatically determined - by the colortype, bitdepth and content of the input pixel data. - Note: for 16-bit per channel colors, needs big endian format like PNG does. -out: Output parameter. Pointer to buffer that will contain the PNG image data. - Must be freed after usage with free(*out). -outsize: Output parameter. Pointer to the size in bytes of the out buffer. -image: The raw pixel data to encode. The size of this buffer should be - w * h * (bytes per pixel), bytes per pixel depends on colortype and bitdepth. -w: width of the raw pixel data in pixels. -h: height of the raw pixel data in pixels. -colortype: the color type of the raw input image. See explanation on PNG color types. -bitdepth: the bit depth of the raw input image. See explanation on PNG color types. -Return value: LodePNG error code (0 means no error). -*/ -unsigned lodepng_encode_memory( - uint8_t **out, size_t *outsize, const uint8_t *image, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth); - -/*Same as lodepng_encode_memory, but always encodes from 32-bit RGBA raw image.*/ -unsigned lodepng_encode32(uint8_t **out, size_t *outsize, const uint8_t *image, unsigned w, unsigned h); - -/*Same as lodepng_encode_memory, but always encodes from 24-bit RGB raw image.*/ -unsigned lodepng_encode24(uint8_t **out, size_t *outsize, const uint8_t *image, unsigned w, unsigned h); - -#ifdef LODEPNG_COMPILE_DISK -/* -Converts raw pixel data into a PNG file on disk. -Same as the other encode functions, but instead takes a filename as output. -NOTE: This overwrites existing files without warning! -*/ -unsigned lodepng_encode_file( - const char *filename, const uint8_t *image, unsigned w, unsigned h, LodePNGColorType colortype, - unsigned bitdepth); - -/*Same as lodepng_encode_file, but always encodes from 32-bit RGBA raw image.*/ -unsigned lodepng_encode32_file(const char *filename, const uint8_t *image, unsigned w, unsigned h); - -/*Same as lodepng_encode_file, but always encodes from 24-bit RGB raw image.*/ -unsigned lodepng_encode24_file(const char *filename, const uint8_t *image, unsigned w, unsigned h); -#endif /*LODEPNG_COMPILE_DISK*/ -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_CPP -namespace lodepng { -#ifdef LODEPNG_COMPILE_DECODER -/*Same as lodepng_decode_memory, but decodes to an std::vector. The colortype -is the format to output the pixels to. Default is RGBA 8-bit per channel.*/ -unsigned decode( - std::vector &out, unsigned &w, unsigned &h, const uint8_t *in, size_t insize, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -unsigned decode( - std::vector &out, unsigned &w, unsigned &h, const std::vector &in, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#ifdef LODEPNG_COMPILE_DISK -/* -Converts PNG file from disk to raw pixel data in memory. -Same as the other decode functions, but instead takes a filename as input. -*/ -unsigned decode( - std::vector &out, unsigned &w, unsigned &h, const std::string &filename, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_DECODER */ - -#ifdef LODEPNG_COMPILE_ENCODER -/*Same as lodepng_encode_memory, but encodes to an std::vector. colortype -is that of the raw input data. The output PNG color type will be auto chosen.*/ -unsigned encode( - std::vector &out, const uint8_t *in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -unsigned encode( - std::vector &out, const std::vector &in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#ifdef LODEPNG_COMPILE_DISK -/* -Converts 32-bit RGBA raw pixel data into a PNG file on disk. -Same as the other encode functions, but instead takes a filename as output. -NOTE: This overwrites existing files without warning! -*/ -unsigned encode( - const std::string &filename, const uint8_t *in, unsigned w, unsigned h, LodePNGColorType colortype = LCT_RGBA, - unsigned bitdepth = 8); -unsigned encode( - const std::string &filename, const std::vector &in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_ENCODER */ -} /* namespace lodepng */ -#endif /*LODEPNG_COMPILE_CPP*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ERROR_TEXT -/*Returns an English description of the numerical error code.*/ -const char *lodepng_error_text(unsigned code); -#endif /*LODEPNG_COMPILE_ERROR_TEXT*/ - -#ifdef LODEPNG_COMPILE_DECODER -/*Settings for zlib decompression*/ -typedef struct LodePNGDecompressSettings LodePNGDecompressSettings; -struct LodePNGDecompressSettings { - unsigned ignore_adler32; /*if 1, continue and don't give an error message if the Adler32 checksum is corrupted*/ - - /*use custom zlib decoder instead of built in one (default: null)*/ - unsigned (*custom_zlib)( - uint8_t **, size_t *, const uint8_t *, size_t, const LodePNGDecompressSettings *); - /*use custom deflate decoder instead of built in one (default: null) - if custom_zlib is used, custom_deflate is ignored since only the built in - zlib function will call custom_deflate*/ - unsigned (*custom_inflate)( - uint8_t **, size_t *, const uint8_t *, size_t, const LodePNGDecompressSettings *); - - const void *custom_context; /*optional custom settings for custom functions*/ -}; - -extern const LodePNGDecompressSettings lodepng_default_decompress_settings; -void lodepng_decompress_settings_init(LodePNGDecompressSettings *settings); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/* -Settings for zlib compression. Tweaking these settings tweaks the balance -between speed and compression ratio. -*/ -typedef struct LodePNGCompressSettings LodePNGCompressSettings; -struct LodePNGCompressSettings /*deflate = compress*/ -{ - /*LZ77 related settings*/ - unsigned btype; /*the block type for LZ (0, 1, 2 or 3, see zlib standard). Should be 2 for proper compression.*/ - unsigned use_lz77; /*whether or not to use LZ77. Should be 1 for proper compression.*/ - unsigned windowsize; /*must be a power of two <= 32768. higher compresses more but is slower. Default value: 2048.*/ - unsigned minmatch; /*mininum lz77 length. 3 is normally best, 6 can be better for some PNGs. Default: 0*/ - unsigned nicematch; /*stop searching if >= this length found. Set to 258 for best compression. Default: 128*/ - unsigned lazymatching; /*use lazy matching: better compression but a bit slower. Default: true*/ - - /*use custom zlib encoder instead of built in one (default: null)*/ - unsigned (*custom_zlib)(uint8_t **, size_t *, const uint8_t *, size_t, const LodePNGCompressSettings *); - /*use custom deflate encoder instead of built in one (default: null) - if custom_zlib is used, custom_deflate is ignored since only the built in - zlib function will call custom_deflate*/ - unsigned (*custom_deflate)( - uint8_t **, size_t *, const uint8_t *, size_t, const LodePNGCompressSettings *); - - const void *custom_context; /*optional custom settings for custom functions*/ -}; - -extern const LodePNGCompressSettings lodepng_default_compress_settings; -void lodepng_compress_settings_init(LodePNGCompressSettings *settings); -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_PNG -/* -Color mode of an image. Contains all information required to decode the pixel -bits to RGBA colors. This information is the same as used in the PNG file -format, and is used both for PNG and raw image data in LodePNG. -*/ -typedef struct LodePNGColorMode { - /*header (IHDR)*/ - LodePNGColorType colortype; /*color type, see PNG standard or documentation further in this header file*/ - unsigned bitdepth; /*bits per sample, see PNG standard or documentation further in this header file*/ - - /* - palette (PLTE and tRNS) - - Dynamically allocated with the colors of the palette, including alpha. - When encoding a PNG, to store your colors in the palette of the LodePNGColorMode, first use - lodepng_palette_clear, then for each color use lodepng_palette_add. - If you encode an image without alpha with palette, don't forget to put value 255 in each A byte of the palette. - - When decoding, by default you can ignore this palette, since LodePNG already - fills the palette colors in the pixels of the raw RGBA output. - - The palette is only supported for color type 3. - */ - uint8_t *palette; /*palette in RGBARGBA... order. When allocated, must be either 0, or have size 1024*/ - size_t palettesize; /*palette size in number of colors (amount of bytes is 4 * palettesize)*/ - - /* - transparent color key (tRNS) - - This color uses the same bit depth as the bitdepth value in this struct, which can be 1-bit to 16-bit. - For greyscale PNGs, r, g and b will all 3 be set to the same. - - When decoding, by default you can ignore this information, since LodePNG sets - pixels with this key to transparent already in the raw RGBA output. - - The color key is only supported for color types 0 and 2. - */ - unsigned key_defined; /*is a transparent color key given? 0 = false, 1 = true*/ - unsigned key_r; /*red/greyscale component of color key*/ - unsigned key_g; /*green component of color key*/ - unsigned key_b; /*blue component of color key*/ -} LodePNGColorMode; - -/*init, cleanup and copy functions to use with this struct*/ -void lodepng_color_mode_init(LodePNGColorMode *info); -void lodepng_color_mode_cleanup(LodePNGColorMode *info); -/*return value is error code (0 means no error)*/ -unsigned lodepng_color_mode_copy(LodePNGColorMode *dest, const LodePNGColorMode *source); - -void lodepng_palette_clear(LodePNGColorMode *info); -/*add 1 color to the palette*/ -unsigned -lodepng_palette_add(LodePNGColorMode *info, uint8_t r, uint8_t g, uint8_t b, uint8_t a); - -/*get the total amount of bits per pixel, based on colortype and bitdepth in the struct*/ -unsigned lodepng_get_bpp(const LodePNGColorMode *info); -/*get the amount of color channels used, based on colortype in the struct. -If a palette is used, it counts as 1 channel.*/ -unsigned lodepng_get_channels(const LodePNGColorMode *info); -/*is it a greyscale type? (only colortype 0 or 4)*/ -unsigned lodepng_is_greyscale_type(const LodePNGColorMode *info); -/*has it got an alpha channel? (only colortype 2 or 6)*/ -unsigned lodepng_is_alpha_type(const LodePNGColorMode *info); -/*has it got a palette? (only colortype 3)*/ -unsigned lodepng_is_palette_type(const LodePNGColorMode *info); -/*only returns true if there is a palette and there is a value in the palette with alpha < 255. -Loops through the palette to check this.*/ -unsigned lodepng_has_palette_alpha(const LodePNGColorMode *info); -/* -Check if the given color info indicates the possibility of having non-opaque pixels in the PNG image. -Returns true if the image can have translucent or invisible pixels (it still be opaque if it doesn't use such pixels). -Returns false if the image can only have opaque pixels. -In detail, it returns true only if it's a color type with alpha, or has a palette with non-opaque values, -or if "key_defined" is true. -*/ -unsigned lodepng_can_have_alpha(const LodePNGColorMode *info); -/*Returns the byte size of a raw image buffer with given width, height and color mode*/ -size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode *color); - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*The information of a Time chunk in PNG.*/ -typedef struct LodePNGTime { - unsigned year; /*2 bytes used (0-65535)*/ - unsigned month; /*1-12*/ - unsigned day; /*1-31*/ - unsigned hour; /*0-23*/ - unsigned minute; /*0-59*/ - unsigned second; /*0-60 (to allow for leap seconds)*/ -} LodePNGTime; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -/*Information about the PNG image, except pixels, width and height.*/ -typedef struct LodePNGInfo { - /*header (IHDR), palette (PLTE) and transparency (tRNS) chunks*/ - unsigned compression_method; /*compression method of the original file. Always 0.*/ - unsigned filter_method; /*filter method of the original file*/ - unsigned interlace_method; /*interlace method of the original file*/ - LodePNGColorMode color; /*color type and bits, palette and transparency of the PNG file*/ - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /* - suggested background color chunk (bKGD) - This color uses the same color mode as the PNG (except alpha channel), which can be 1-bit to 16-bit. - - For greyscale PNGs, r, g and b will all 3 be set to the same. When encoding - the encoder writes the red one. For palette PNGs: When decoding, the RGB value - will be stored, not a palette index. But when encoding, specify the index of - the palette in background_r, the other two are then ignored. - - The decoder does not use this background color to edit the color of pixels. - */ - unsigned background_defined; /*is a suggested background color given?*/ - unsigned background_r; /*red component of suggested background color*/ - unsigned background_g; /*green component of suggested background color*/ - unsigned background_b; /*blue component of suggested background color*/ - - /* - non-international text chunks (tEXt and zTXt) - - The char** arrays each contain num strings. The actual messages are in - text_strings, while text_keys are keywords that give a short description what - the actual text represents, e.g. Title, Author, Description, or anything else. - - A keyword is minimum 1 character and maximum 79 characters long. It's - discouraged to use a single line length longer than 79 characters for texts. - - Don't allocate these text buffers yourself. Use the init/cleanup functions - correctly and use lodepng_add_text and lodepng_clear_text. - */ - size_t text_num; /*the amount of texts in these char** buffers (there may be more texts in itext)*/ - char **text_keys; /*the keyword of a text chunk (e.g. "Comment")*/ - char **text_strings; /*the actual text*/ - - /* - international text chunks (iTXt) - Similar to the non-international text chunks, but with additional strings - "langtags" and "transkeys". - */ - size_t itext_num; /*the amount of international texts in this PNG*/ - char **itext_keys; /*the English keyword of the text chunk (e.g. "Comment")*/ - char **itext_langtags; /*language tag for this text's language, ISO/IEC 646 string, e.g. ISO 639 language tag*/ - char **itext_transkeys; /*keyword translated to the international language - UTF-8 string*/ - char **itext_strings; /*the actual international text - UTF-8 string*/ - - /*time chunk (tIME)*/ - unsigned time_defined; /*set to 1 to make the encoder generate a tIME chunk*/ - LodePNGTime time; - - /*phys chunk (pHYs)*/ - unsigned phys_defined; /*if 0, there is no pHYs chunk and the values below are undefined, if 1 else there is one*/ - unsigned phys_x; /*pixels per unit in x direction*/ - unsigned phys_y; /*pixels per unit in y direction*/ - unsigned phys_unit; /*may be 0 (unknown unit) or 1 (metre)*/ - - /* - unknown chunks - There are 3 buffers, one for each position in the PNG where unknown chunks can appear - each buffer contains all unknown chunks for that position consecutively - The 3 buffers are the unknown chunks between certain critical chunks: - 0: IHDR-PLTE, 1: PLTE-IDAT, 2: IDAT-IEND - Do not allocate or traverse this data yourself. Use the chunk traversing functions declared - later, such as lodepng_chunk_next and lodepng_chunk_append, to read/write this struct. - */ - uint8_t *unknown_chunks_data[3]; - size_t unknown_chunks_size[3]; /*size in bytes of the unknown chunks, given for protection*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} LodePNGInfo; - -/*init, cleanup and copy functions to use with this struct*/ -void lodepng_info_init(LodePNGInfo *info); -void lodepng_info_cleanup(LodePNGInfo *info); -/*return value is error code (0 means no error)*/ -unsigned lodepng_info_copy(LodePNGInfo *dest, const LodePNGInfo *source); - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -void lodepng_clear_text(LodePNGInfo *info); /*use this to clear the texts again after you filled them in*/ -unsigned lodepng_add_text(LodePNGInfo *info, const char *key, const char *str); /*push back both texts at once*/ - -void lodepng_clear_itext(LodePNGInfo *info); /*use this to clear the itexts again after you filled them in*/ -unsigned lodepng_add_itext( - LodePNGInfo *info, const char *key, const char *langtag, const char *transkey, - const char *str); /*push back the 4 texts of 1 chunk at once*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -/* -Converts raw buffer from one color type to another color type, based on -LodePNGColorMode structs to describe the input and output color type. -See the reference manual at the end of this header file to see which color conversions are supported. -return value = LodePNG error code (0 if all went ok, an error if the conversion isn't supported) -The out buffer must have size (w * h * bpp + 7) / 8, where bpp is the bits per pixel -of the output color type (lodepng_get_bpp). -For < 8 bpp images, there should not be padding bits at the end of scanlines. -For 16-bit per channel colors, uses big endian format like PNG does. -Return value is LodePNG error code -*/ -unsigned lodepng_convert( - uint8_t *out, const uint8_t *in, const LodePNGColorMode *mode_out, const LodePNGColorMode *mode_in, - unsigned w, unsigned h); - -#ifdef LODEPNG_COMPILE_DECODER -/* -Settings for the decoder. This contains settings for the PNG and the Zlib -decoder, but not the Info settings from the Info structs. -*/ -typedef struct LodePNGDecoderSettings { - LodePNGDecompressSettings zlibsettings; /*in here is the setting to ignore Adler32 checksums*/ - - unsigned ignore_crc; /*ignore CRC checksums*/ - - unsigned color_convert; /*whether to convert the PNG to the color type you want. Default: yes*/ - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - unsigned read_text_chunks; /*if false but remember_unknown_chunks is true, they're stored in the unknown chunks*/ - /*store all bytes from unknown chunks in the LodePNGInfo (off by default, useful for a png editor)*/ - unsigned remember_unknown_chunks; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} LodePNGDecoderSettings; - -void lodepng_decoder_settings_init(LodePNGDecoderSettings *settings); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/*automatically use color type with less bits per pixel if losslessly possible. Default: AUTO*/ -typedef enum LodePNGFilterStrategy { - /*every filter at zero*/ - LFS_ZERO, - /*Use filter that gives minimum sum, as described in the official PNG filter heuristic.*/ - LFS_MINSUM, - /*Use the filter type that gives smallest Shannon entropy for this scanline. Depending - on the image, this is better or worse than minsum.*/ - LFS_ENTROPY, - /* - Brute-force-search PNG filters by compressing each filter for each scanline. - Experimental, very slow, and only rarely gives better compression than MINSUM. - */ - LFS_BRUTE_FORCE, - /*use predefined_filters buffer: you specify the filter type for each scanline*/ - LFS_PREDEFINED -} LodePNGFilterStrategy; - -/*Gives characteristics about the colors of the image, which helps decide which color model to use for encoding. -Used internally by default if "auto_convert" is enabled. Public because it's useful for custom algorithms.*/ -typedef struct LodePNGColorProfile { - unsigned colored; /*not greyscale*/ - unsigned key; /*if true, image is not opaque. Only if true and alpha is false, color key is possible.*/ - unsigned short key_r; /*these values are always in 16-bit bitdepth in the profile*/ - unsigned short key_g; - unsigned short key_b; - unsigned alpha; /*alpha channel or alpha palette required*/ - unsigned numcolors; /*amount of colors, up to 257. Not valid if bits == 16.*/ - uint8_t palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order*/ - unsigned - bits; /*bits per channel (not for palette). 1,2 or 4 for greyscale only. 16 if 16-bit per channel required.*/ -} LodePNGColorProfile; - -void lodepng_color_profile_init(LodePNGColorProfile *profile); - -/*Get a LodePNGColorProfile of the image.*/ -unsigned lodepng_get_color_profile( - LodePNGColorProfile *profile, const uint8_t *image, unsigned w, unsigned h, const LodePNGColorMode *mode_in); -/*The function LodePNG uses internally to decide the PNG color with auto_convert. -Chooses an optimal color model, e.g. grey if only grey pixels, palette if < 256 colors, ...*/ -unsigned lodepng_auto_choose_color( - LodePNGColorMode *mode_out, const uint8_t *image, unsigned w, unsigned h, const LodePNGColorMode *mode_in); - -/*Settings for the encoder.*/ -typedef struct LodePNGEncoderSettings { - LodePNGCompressSettings zlibsettings; /*settings for the zlib encoder, such as window size, ...*/ - - unsigned auto_convert; /*automatically choose output PNG color type. Default: true*/ - - /*If true, follows the official PNG heuristic: if the PNG uses a palette or lower than - 8 bit depth, set all filters to zero. Otherwise use the filter_strategy. Note that to - completely follow the official PNG heuristic, filter_palette_zero must be true and - filter_strategy must be LFS_MINSUM*/ - unsigned filter_palette_zero; - /*Which filter strategy to use when not using zeroes due to filter_palette_zero. - Set filter_palette_zero to 0 to ensure always using your chosen strategy. Default: LFS_MINSUM*/ - LodePNGFilterStrategy filter_strategy; - /*used if filter_strategy is LFS_PREDEFINED. In that case, this must point to a buffer with - the same length as the amount of scanlines in the image, and each value must <= 5. You - have to cleanup this buffer, LodePNG will never free it. Don't forget that filter_palette_zero - must be set to 0 to ensure this is also used on palette or low bitdepth images.*/ - const uint8_t *predefined_filters; - - /*force creating a PLTE chunk if colortype is 2 or 6 (= a suggested palette). - If colortype is 3, PLTE is _always_ created.*/ - unsigned force_palette; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*add LodePNG identifier and version as a text chunk, for debugging*/ - unsigned add_id; - /*encode text chunks as zTXt chunks instead of tEXt chunks, and use compression in iTXt chunks*/ - unsigned text_compression; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} LodePNGEncoderSettings; - -void lodepng_encoder_settings_init(LodePNGEncoderSettings *settings); -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) -/*The settings, state and information for extended encoding and decoding.*/ -typedef struct LodePNGState { -#ifdef LODEPNG_COMPILE_DECODER - LodePNGDecoderSettings decoder; /*the decoding settings*/ -#endif /*LODEPNG_COMPILE_DECODER*/ -#ifdef LODEPNG_COMPILE_ENCODER - LodePNGEncoderSettings encoder; /*the encoding settings*/ -#endif /*LODEPNG_COMPILE_ENCODER*/ - LodePNGColorMode info_raw; /*specifies the format in which you would like to get the raw pixel buffer*/ - LodePNGInfo info_png; /*info of the PNG image obtained after decoding*/ - unsigned error; -#ifdef LODEPNG_COMPILE_CPP - /* For the lodepng::State subclass. */ - virtual ~LodePNGState() {} -#endif -} LodePNGState; - -/*init, cleanup and copy functions to use with this struct*/ -void lodepng_state_init(LodePNGState *state); -void lodepng_state_cleanup(LodePNGState *state); -void lodepng_state_copy(LodePNGState *dest, const LodePNGState *source); -#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */ - -#ifdef LODEPNG_COMPILE_DECODER -/* -Same as lodepng_decode_memory, but uses a LodePNGState to allow custom settings and -getting much more information about the PNG image and color mode. -*/ -unsigned lodepng_decode( - uint8_t **out, unsigned *w, unsigned *h, LodePNGState *state, const uint8_t *in, size_t insize); - -/* -Read the PNG header, but not the actual data. This returns only the information -that is in the header chunk of the PNG, such as width, height and color type. The -information is placed in the info_png field of the LodePNGState. -*/ -unsigned lodepng_inspect(unsigned *w, unsigned *h, LodePNGState *state, const uint8_t *in, size_t insize); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/*This function allocates the out buffer with standard malloc and stores the size in *outsize.*/ -unsigned lodepng_encode( - uint8_t **out, size_t *outsize, const uint8_t *image, unsigned w, unsigned h, LodePNGState *state); -#endif /*LODEPNG_COMPILE_ENCODER*/ - -/* -The lodepng_chunk functions are normally not needed, except to traverse the -unknown chunks stored in the LodePNGInfo struct, or add new ones to it. -It also allows traversing the chunks of an encoded PNG file yourself. - -PNG standard chunk naming conventions: -First byte: uppercase = critical, lowercase = ancillary -Second byte: uppercase = public, lowercase = private -Third byte: must be uppercase -Fourth byte: uppercase = unsafe to copy, lowercase = safe to copy -*/ - -/* -Gets the length of the data of the chunk. Total chunk length has 12 bytes more. -There must be at least 4 bytes to read from. If the result value is too large, -it may be corrupt data. -*/ -unsigned lodepng_chunk_length(const uint8_t *chunk); - -/*puts the 4-byte type in null terminated string*/ -void lodepng_chunk_type(char type[5], const uint8_t *chunk); - -/*check if the type is the given type*/ -uint8_t lodepng_chunk_type_equals(const uint8_t *chunk, const char *type); - -/*0: it's one of the critical chunk types, 1: it's an ancillary chunk (see PNG standard)*/ -uint8_t lodepng_chunk_ancillary(const uint8_t *chunk); - -/*0: public, 1: private (see PNG standard)*/ -uint8_t lodepng_chunk_private(const uint8_t *chunk); - -/*0: the chunk is unsafe to copy, 1: the chunk is safe to copy (see PNG standard)*/ -uint8_t lodepng_chunk_safetocopy(const uint8_t *chunk); - -/*get pointer to the data of the chunk, where the input points to the header of the chunk*/ -uint8_t *lodepng_chunk_data(uint8_t *chunk); -const uint8_t *lodepng_chunk_data_const(const uint8_t *chunk); - -/*returns 0 if the crc is correct, 1 if it's incorrect (0 for OK as usual!)*/ -unsigned lodepng_chunk_check_crc(const uint8_t *chunk); - -/*generates the correct CRC from the data and puts it in the last 4 bytes of the chunk*/ -void lodepng_chunk_generate_crc(uint8_t *chunk); - -/*iterate to next chunks. don't use on IEND chunk, as there is no next chunk then*/ -uint8_t *lodepng_chunk_next(uint8_t *chunk); -const uint8_t *lodepng_chunk_next_const(const uint8_t *chunk); - -/* -Appends chunk to the data in out. The given chunk should already have its chunk header. -The out variable and outlength are updated to reflect the new reallocated buffer. -Returns error code (0 if it went ok) -*/ -unsigned lodepng_chunk_append(uint8_t **out, size_t *outlength, const uint8_t *chunk); - -/* -Appends new chunk to out. The chunk to append is given by giving its length, type -and data separately. The type is a 4-letter string. -The out variable and outlength are updated to reflect the new reallocated buffer. -Returne error code (0 if it went ok) -*/ -unsigned lodepng_chunk_create( - uint8_t **out, size_t *outlength, unsigned length, const char *type, const uint8_t *data); - -/*Calculate CRC32 of buffer*/ -unsigned lodepng_crc32(const uint8_t *buf, size_t len); -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ZLIB -/* -This zlib part can be used independently to zlib compress and decompress a -buffer. It cannot be used to create gzip files however, and it only supports the -part of zlib that is required for PNG, it does not support dictionaries. -*/ - -#ifdef LODEPNG_COMPILE_DECODER -/*Inflate a buffer. Inflate is the decompression step of deflate. Out buffer must be freed after use.*/ -unsigned lodepng_inflate( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGDecompressSettings *settings); - -/* -Decompresses Zlib data. Reallocates the out buffer and appends the data. The -data must be according to the zlib specification. -Either, *out must be NULL and *outsize must be 0, or, *out must be a valid -buffer and *outsize its size in bytes. out must be freed by user after usage. -*/ -unsigned lodepng_zlib_decompress( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGDecompressSettings *settings); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/* -Compresses data with Zlib. Reallocates the out buffer and appends the data. -Zlib adds a small header and trailer around the deflate data. -The data is output in the format of the zlib specification. -Either, *out must be NULL and *outsize must be 0, or, *out must be a valid -buffer and *outsize its size in bytes. out must be freed by user after usage. -*/ -unsigned lodepng_zlib_compress( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGCompressSettings *settings); - -/* -Find length-limited Huffman code for given frequencies. This function is in the -public interface only for tests, it's used internally by lodepng_deflate. -*/ -unsigned -lodepng_huffman_code_lengths(unsigned *lengths, const unsigned *frequencies, size_t numcodes, unsigned maxbitlen); - -/*Compress a buffer with deflate. See RFC 1951. Out buffer must be freed after use.*/ -unsigned lodepng_deflate( - uint8_t **out, size_t *outsize, const uint8_t *in, size_t insize, - const LodePNGCompressSettings *settings); - -#endif /*LODEPNG_COMPILE_ENCODER*/ -#endif /*LODEPNG_COMPILE_ZLIB*/ - -#ifdef LODEPNG_COMPILE_DISK -/* -Load a file from disk into buffer. The function allocates the out buffer, and -after usage you should free it. -out: output parameter, contains pointer to loaded buffer. -outsize: output parameter, size of the allocated out buffer -filename: the path to the file to load -return value: error code (0 means ok) -*/ -unsigned lodepng_load_file(uint8_t **out, size_t *outsize, const char *filename); - -/* -Save a file from buffer to disk. Warning, if it exists, this function overwrites -the file without warning! -buffer: the buffer to write -buffersize: size of the buffer to write -filename: the path to the file to save to -return value: error code (0 means ok) -*/ -unsigned lodepng_save_file(const uint8_t *buffer, size_t buffersize, const char *filename); -#endif /*LODEPNG_COMPILE_DISK*/ - -#ifdef LODEPNG_COMPILE_CPP -/* The LodePNG C++ wrapper uses std::vectors instead of manually allocated memory buffers. */ -namespace lodepng { -#ifdef LODEPNG_COMPILE_PNG -class State : public LodePNGState { - public: - State(); - State(const State &other); - virtual ~State(); - State &operator=(const State &other); -}; - -#ifdef LODEPNG_COMPILE_DECODER -/* Same as other lodepng::decode, but using a State for more settings and information. */ -unsigned -decode(std::vector &out, unsigned &w, unsigned &h, State &state, const uint8_t *in, size_t insize); -unsigned -decode(std::vector &out, unsigned &w, unsigned &h, State &state, const std::vector &in); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/* Same as other lodepng::encode, but using a State for more settings and information. */ -unsigned encode(std::vector &out, const uint8_t *in, unsigned w, unsigned h, State &state); -unsigned -encode(std::vector &out, const std::vector &in, unsigned w, unsigned h, State &state); -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_DISK -/* -Load a file from disk into an std::vector. -return value: error code (0 means ok) -*/ -unsigned load_file(std::vector &buffer, const std::string &filename); - -/* -Save the binary data in an std::vector to a file on disk. The file is overwritten -without warning. -*/ -unsigned save_file(const std::vector &buffer, const std::string &filename); -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_PNG */ - -#ifdef LODEPNG_COMPILE_ZLIB -#ifdef LODEPNG_COMPILE_DECODER -/* Zlib-decompress an uint8_t buffer */ -unsigned decompress( - std::vector &out, const uint8_t *in, size_t insize, - const LodePNGDecompressSettings &settings = lodepng_default_decompress_settings); - -/* Zlib-decompress an std::vector */ -unsigned decompress( - std::vector &out, const std::vector &in, - const LodePNGDecompressSettings &settings = lodepng_default_decompress_settings); -#endif /* LODEPNG_COMPILE_DECODER */ - -#ifdef LODEPNG_COMPILE_ENCODER -/* Zlib-compress an uint8_t buffer */ -unsigned compress( - std::vector &out, const uint8_t *in, size_t insize, - const LodePNGCompressSettings &settings = lodepng_default_compress_settings); - -/* Zlib-compress an std::vector */ -unsigned compress( - std::vector &out, const std::vector &in, - const LodePNGCompressSettings &settings = lodepng_default_compress_settings); -#endif /* LODEPNG_COMPILE_ENCODER */ -#endif /* LODEPNG_COMPILE_ZLIB */ -} /* namespace lodepng */ -#endif /*LODEPNG_COMPILE_CPP*/ - -/* -TODO: -[.] test if there are no memory leaks or security exploits - done a lot but needs to be checked often -[.] check compatibility with various compilers - done but needs to be redone for every newer version -[X] converting color to 16-bit per channel types -[ ] read all public PNG chunk types (but never let the color profile and gamma ones touch RGB values) -[ ] make sure encoder generates no chunks with size > (2^31)-1 -[ ] partial decoding (stream processing) -[X] let the "isFullyOpaque" function check color keys and transparent palettes too -[X] better name for the variables "codes", "codesD", "codelengthcodes", "clcl" and "lldl" -[ ] don't stop decoding on errors like 69, 57, 58 (make warnings) -[ ] make warnings like: oob palette, checksum fail, data after iend, wrong/unknown crit chunk, no null terminator in -text, ... [ ] let the C++ wrapper catch exceptions coming from the standard library and return LodePNG error codes [ ] -allow user to provide custom color conversion functions, e.g. for premultiplied alpha, padding bits or not, ... [ ] -allow user to give data (void*) to custom allocator -*/ - -#endif /*LODEPNG_H inclusion guard*/ - -/* -LodePNG Documentation ---------------------- - -0. table of contents --------------------- - - 1. about - 1.1. supported features - 1.2. features not supported - 2. C and C++ version - 3. security - 4. decoding - 5. encoding - 6. color conversions - 6.1. PNG color types - 6.2. color conversions - 6.3. padding bits - 6.4. A note about 16-bits per channel and endianness - 7. error values - 8. chunks and PNG editing - 9. compiler support - 10. examples - 10.1. decoder C++ example - 10.2. decoder C example - 11. state settings reference - 12. changes - 13. contact information - - -1. about --------- - -PNG is a file format to store raster images losslessly with good compression, -supporting different color types and alpha channel. - -LodePNG is a PNG codec according to the Portable Network Graphics (PNG) -Specification (Second Edition) - W3C Recommendation 10 November 2003. - -The specifications used are: - -*) Portable Network Graphics (PNG) Specification (Second Edition): - http://www.w3.org/TR/2003/REC-PNG-20031110 -*) RFC 1950 ZLIB Compressed Data Format version 3.3: - http://www.gzip.org/zlib/rfc-zlib.html -*) RFC 1951 DEFLATE Compressed Data Format Specification ver 1.3: - http://www.gzip.org/zlib/rfc-deflate.html - -The most recent version of LodePNG can currently be found at -http://lodev.org/lodepng/ - -LodePNG works both in C (ISO C90) and C++, with a C++ wrapper that adds -extra functionality. - -LodePNG exists out of two files: --lodepng.h: the header file for both C and C++ --lodepng.c(pp): give it the name lodepng.c or lodepng.cpp (or .cc) depending on your usage - -If you want to start using LodePNG right away without reading this doc, get the -examples from the LodePNG website to see how to use it in code, or check the -smaller examples in chapter 13 here. - -LodePNG is simple but only supports the basic requirements. To achieve -simplicity, the following design choices were made: There are no dependencies -on any external library. There are functions to decode and encode a PNG with -a single function call, and extended versions of these functions taking a -LodePNGState struct allowing to specify or get more information. By default -the colors of the raw image are always RGB or RGBA, no matter what color type -the PNG file uses. To read and write files, there are simple functions to -convert the files to/from buffers in memory. - -This all makes LodePNG suitable for loading textures in games, demos and small -programs, ... It's less suitable for full fledged image editors, loading PNGs -over network (it requires all the image data to be available before decoding can -begin), life-critical systems, ... - -1.1. supported features ------------------------ - -The following features are supported by the decoder: - -*) decoding of PNGs with any color type, bit depth and interlace mode, to a 24- or 32-bit color raw image, - or the same color type as the PNG -*) encoding of PNGs, from any raw image to 24- or 32-bit color, or the same color type as the raw image -*) Adam7 interlace and deinterlace for any color type -*) loading the image from harddisk or decoding it from a buffer from other sources than harddisk -*) support for alpha channels, including RGBA color model, translucent palettes and color keying -*) zlib decompression (inflate) -*) zlib compression (deflate) -*) CRC32 and ADLER32 checksums -*) handling of unknown chunks, allowing making a PNG editor that stores custom and unknown chunks. -*) the following chunks are supported (generated/interpreted) by both encoder and decoder: - IHDR: header information - PLTE: color palette - IDAT: pixel data - IEND: the final chunk - tRNS: transparency for palettized images - tEXt: textual information - zTXt: compressed textual information - iTXt: international textual information - bKGD: suggested background color - pHYs: physical dimensions - tIME: modification time - -1.2. features not supported ---------------------------- - -The following features are _not_ supported: - -*) some features needed to make a conformant PNG-Editor might be still missing. -*) partial loading/stream processing. All data must be available and is processed in one call. -*) The following public chunks are not supported but treated as unknown chunks by LodePNG - cHRM, gAMA, iCCP, sRGB, sBIT, hIST, sPLT - Some of these are not supported on purpose: LodePNG wants to provide the RGB values - stored in the pixels, not values modified by system dependent gamma or color models. - - -2. C and C++ version --------------------- - -The C version uses buffers allocated with alloc that you need to free() -yourself. You need to use init and cleanup functions for each struct whenever -using a struct from the C version to avoid exploits and memory leaks. - -The C++ version has extra functions with std::vectors in the interface and the -lodepng::State class which is a LodePNGState with constructor and destructor. - -These files work without modification for both C and C++ compilers because all -the additional C++ code is in "#ifdef __cplusplus" blocks that make C-compilers -ignore it, and the C code is made to compile both with strict ISO C90 and C++. - -To use the C++ version, you need to rename the source file to lodepng.cpp -(instead of lodepng.c), and compile it with a C++ compiler. - -To use the C version, you need to rename the source file to lodepng.c (instead -of lodepng.cpp), and compile it with a C compiler. - - -3. Security ------------ - -Even if carefully designed, it's always possible that LodePNG contains possible -exploits. If you discover one, please let me know, and it will be fixed. - -When using LodePNG, care has to be taken with the C version of LodePNG, as well -as the C-style structs when working with C++. The following conventions are used -for all C-style structs: - --if a struct has a corresponding init function, always call the init function when making a new one --if a struct has a corresponding cleanup function, call it before the struct disappears to avoid memory leaks --if a struct has a corresponding copy function, use the copy function instead of "=". - The destination must also be inited already. - - -4. Decoding ------------ - -Decoding converts a PNG compressed image to a raw pixel buffer. - -Most documentation on using the decoder is at its declarations in the header -above. For C, simple decoding can be done with functions such as -lodepng_decode32, and more advanced decoding can be done with the struct -LodePNGState and lodepng_decode. For C++, all decoding can be done with the -various lodepng::decode functions, and lodepng::State can be used for advanced -features. - -When using the LodePNGState, it uses the following fields for decoding: -*) LodePNGInfo info_png: it stores extra information about the PNG (the input) in here -*) LodePNGColorMode info_raw: here you can say what color mode of the raw image (the output) you want to get -*) LodePNGDecoderSettings decoder: you can specify a few extra settings for the decoder to use - -LodePNGInfo info_png --------------------- - -After decoding, this contains extra information of the PNG image, except the actual -pixels, width and height because these are already gotten directly from the decoder -functions. - -It contains for example the original color type of the PNG image, text comments, -suggested background color, etc... More details about the LodePNGInfo struct are -at its declaration documentation. - -LodePNGColorMode info_raw -------------------------- - -When decoding, here you can specify which color type you want -the resulting raw image to be. If this is different from the colortype of the -PNG, then the decoder will automatically convert the result. This conversion -always works, except if you want it to convert a color PNG to greyscale or to -a palette with missing colors. - -By default, 32-bit color is used for the result. - -LodePNGDecoderSettings decoder ------------------------------- - -The settings can be used to ignore the errors created by invalid CRC and Adler32 -chunks, and to disable the decoding of tEXt chunks. - -There's also a setting color_convert, true by default. If false, no conversion -is done, the resulting data will be as it was in the PNG (after decompression) -and you'll have to puzzle the colors of the pixels together yourself using the -color type information in the LodePNGInfo. - - -5. Encoding ------------ - -Encoding converts a raw pixel buffer to a PNG compressed image. - -Most documentation on using the encoder is at its declarations in the header -above. For C, simple encoding can be done with functions such as -lodepng_encode32, and more advanced decoding can be done with the struct -LodePNGState and lodepng_encode. For C++, all encoding can be done with the -various lodepng::encode functions, and lodepng::State can be used for advanced -features. - -Like the decoder, the encoder can also give errors. However it gives less errors -since the encoder input is trusted, the decoder input (a PNG image that could -be forged by anyone) is not trusted. - -When using the LodePNGState, it uses the following fields for encoding: -*) LodePNGInfo info_png: here you specify how you want the PNG (the output) to be. -*) LodePNGColorMode info_raw: here you say what color type of the raw image (the input) has -*) LodePNGEncoderSettings encoder: you can specify a few settings for the encoder to use - -LodePNGInfo info_png --------------------- - -When encoding, you use this the opposite way as when decoding: for encoding, -you fill in the values you want the PNG to have before encoding. By default it's -not needed to specify a color type for the PNG since it's automatically chosen, -but it's possible to choose it yourself given the right settings. - -The encoder will not always exactly match the LodePNGInfo struct you give, -it tries as close as possible. Some things are ignored by the encoder. The -encoder uses, for example, the following settings from it when applicable: -colortype and bitdepth, text chunks, time chunk, the color key, the palette, the -background color, the interlace method, unknown chunks, ... - -When encoding to a PNG with colortype 3, the encoder will generate a PLTE chunk. -If the palette contains any colors for which the alpha channel is not 255 (so -there are translucent colors in the palette), it'll add a tRNS chunk. - -LodePNGColorMode info_raw -------------------------- - -You specify the color type of the raw image that you give to the input here, -including a possible transparent color key and palette you happen to be using in -your raw image data. - -By default, 32-bit color is assumed, meaning your input has to be in RGBA -format with 4 bytes (uint8_ts) per pixel. - -LodePNGEncoderSettings encoder ------------------------------- - -The following settings are supported (some are in sub-structs): -*) auto_convert: when this option is enabled, the encoder will -automatically choose the smallest possible color mode (including color key) that -can encode the colors of all pixels without information loss. -*) btype: the block type for LZ77. 0 = uncompressed, 1 = fixed huffman tree, - 2 = dynamic huffman tree (best compression). Should be 2 for proper - compression. -*) use_lz77: whether or not to use LZ77 for compressed block types. Should be - true for proper compression. -*) windowsize: the window size used by the LZ77 encoder (1 - 32768). Has value - 2048 by default, but can be set to 32768 for better, but slow, compression. -*) force_palette: if colortype is 2 or 6, you can make the encoder write a PLTE - chunk if force_palette is true. This can used as suggested palette to convert - to by viewers that don't support more than 256 colors (if those still exist) -*) add_id: add text chunk "Encoder: LodePNG " to the image. -*) text_compression: default 1. If 1, it'll store texts as zTXt instead of tEXt chunks. - zTXt chunks use zlib compression on the text. This gives a smaller result on - large texts but a larger result on small texts (such as a single program name). - It's all tEXt or all zTXt though, there's no separate setting per text yet. - - -6. color conversions --------------------- - -An important thing to note about LodePNG, is that the color type of the PNG, and -the color type of the raw image, are completely independent. By default, when -you decode a PNG, you get the result as a raw image in the color type you want, -no matter whether the PNG was encoded with a palette, greyscale or RGBA color. -And if you encode an image, by default LodePNG will automatically choose the PNG -color type that gives good compression based on the values of colors and amount -of colors in the image. It can be configured to let you control it instead as -well, though. - -To be able to do this, LodePNG does conversions from one color mode to another. -It can convert from almost any color type to any other color type, except the -following conversions: RGB to greyscale is not supported, and converting to a -palette when the palette doesn't have a required color is not supported. This is -not supported on purpose: this is information loss which requires a color -reduction algorithm that is beyong the scope of a PNG encoder (yes, RGB to grey -is easy, but there are multiple ways if you want to give some channels more -weight). - -By default, when decoding, you get the raw image in 32-bit RGBA or 24-bit RGB -color, no matter what color type the PNG has. And by default when encoding, -LodePNG automatically picks the best color model for the output PNG, and expects -the input image to be 32-bit RGBA or 24-bit RGB. So, unless you want to control -the color format of the images yourself, you can skip this chapter. - -6.1. PNG color types --------------------- - -A PNG image can have many color types, ranging from 1-bit color to 64-bit color, -as well as palettized color modes. After the zlib decompression and unfiltering -in the PNG image is done, the raw pixel data will have that color type and thus -a certain amount of bits per pixel. If you want the output raw image after -decoding to have another color type, a conversion is done by LodePNG. - -The PNG specification gives the following color types: - -0: greyscale, bit depths 1, 2, 4, 8, 16 -2: RGB, bit depths 8 and 16 -3: palette, bit depths 1, 2, 4 and 8 -4: greyscale with alpha, bit depths 8 and 16 -6: RGBA, bit depths 8 and 16 - -Bit depth is the amount of bits per pixel per color channel. So the total amount -of bits per pixel is: amount of channels * bitdepth. - -6.2. color conversions ----------------------- - -As explained in the sections about the encoder and decoder, you can specify -color types and bit depths in info_png and info_raw to change the default -behaviour. - -If, when decoding, you want the raw image to be something else than the default, -you need to set the color type and bit depth you want in the LodePNGColorMode, -or the parameters colortype and bitdepth of the simple decoding function. - -If, when encoding, you use another color type than the default in the raw input -image, you need to specify its color type and bit depth in the LodePNGColorMode -of the raw image, or use the parameters colortype and bitdepth of the simple -encoding function. - -If, when encoding, you don't want LodePNG to choose the output PNG color type -but control it yourself, you need to set auto_convert in the encoder settings -to false, and specify the color type you want in the LodePNGInfo of the -encoder (including palette: it can generate a palette if auto_convert is true, -otherwise not). - -If the input and output color type differ (whether user chosen or auto chosen), -LodePNG will do a color conversion, which follows the rules below, and may -sometimes result in an error. - -To avoid some confusion: --the decoder converts from PNG to raw image --the encoder converts from raw image to PNG --the colortype and bitdepth in LodePNGColorMode info_raw, are those of the raw image --the colortype and bitdepth in the color field of LodePNGInfo info_png, are those of the PNG --when encoding, the color type in LodePNGInfo is ignored if auto_convert - is enabled, it is automatically generated instead --when decoding, the color type in LodePNGInfo is set by the decoder to that of the original - PNG image, but it can be ignored since the raw image has the color type you requested instead --if the color type of the LodePNGColorMode and PNG image aren't the same, a conversion - between the color types is done if the color types are supported. If it is not - supported, an error is returned. If the types are the same, no conversion is done. --even though some conversions aren't supported, LodePNG supports loading PNGs from any - colortype and saving PNGs to any colortype, sometimes it just requires preparing - the raw image correctly before encoding. --both encoder and decoder use the same color converter. - -Non supported color conversions: --color to greyscale: no error is thrown, but the result will look ugly because -only the red channel is taken --anything to palette when that palette does not have that color in it: in this -case an error is thrown - -Supported color conversions: --anything to 8-bit RGB, 8-bit RGBA, 16-bit RGB, 16-bit RGBA --any grey or grey+alpha, to grey or grey+alpha --anything to a palette, as long as the palette has the requested colors in it --removing alpha channel --higher to smaller bitdepth, and vice versa - -If you want no color conversion to be done (e.g. for speed or control): --In the encoder, you can make it save a PNG with any color type by giving the -raw color mode and LodePNGInfo the same color mode, and setting auto_convert to -false. --In the decoder, you can make it store the pixel data in the same color type -as the PNG has, by setting the color_convert setting to false. Settings in -info_raw are then ignored. - -The function lodepng_convert does the color conversion. It is available in the -interface but normally isn't needed since the encoder and decoder already call -it. - -6.3. padding bits ------------------ - -In the PNG file format, if a less than 8-bit per pixel color type is used and the scanlines -have a bit amount that isn't a multiple of 8, then padding bits are used so that each -scanline starts at a fresh byte. But that is NOT true for the LodePNG raw input and output. -The raw input image you give to the encoder, and the raw output image you get from the decoder -will NOT have these padding bits, e.g. in the case of a 1-bit image with a width -of 7 pixels, the first pixel of the second scanline will the the 8th bit of the first byte, -not the first bit of a new byte. - -6.4. A note about 16-bits per channel and endianness ----------------------------------------------------- - -LodePNG uses uint8_t arrays for 16-bit per channel colors too, just like -for any other color format. The 16-bit values are stored in big endian (most -significant byte first) in these arrays. This is the opposite order of the -little endian used by x86 CPU's. - -LodePNG always uses big endian because the PNG file format does so internally. -Conversions to other formats than PNG uses internally are not supported by -LodePNG on purpose, there are myriads of formats, including endianness of 16-bit -colors, the order in which you store R, G, B and A, and so on. Supporting and -converting to/from all that is outside the scope of LodePNG. - -This may mean that, depending on your use case, you may want to convert the big -endian output of LodePNG to little endian with a for loop. This is certainly not -always needed, many applications and libraries support big endian 16-bit colors -anyway, but it means you cannot simply cast the uint8_t* buffer to an -unsigned short* buffer on x86 CPUs. - - -7. error values ---------------- - -All functions in LodePNG that return an error code, return 0 if everything went -OK, or a non-zero code if there was an error. - -The meaning of the LodePNG error values can be retrieved with the function -lodepng_error_text: given the numerical error code, it returns a description -of the error in English as a string. - -Check the implementation of lodepng_error_text to see the meaning of each code. - - -8. chunks and PNG editing -------------------------- - -If you want to add extra chunks to a PNG you encode, or use LodePNG for a PNG -editor that should follow the rules about handling of unknown chunks, or if your -program is able to read other types of chunks than the ones handled by LodePNG, -then that's possible with the chunk functions of LodePNG. - -A PNG chunk has the following layout: - -4 bytes length -4 bytes type name -length bytes data -4 bytes CRC - -8.1. iterating through chunks ------------------------------ - -If you have a buffer containing the PNG image data, then the first chunk (the -IHDR chunk) starts at byte number 8 of that buffer. The first 8 bytes are the -signature of the PNG and are not part of a chunk. But if you start at byte 8 -then you have a chunk, and can check the following things of it. - -NOTE: none of these functions check for memory buffer boundaries. To avoid -exploits, always make sure the buffer contains all the data of the chunks. -When using lodepng_chunk_next, make sure the returned value is within the -allocated memory. - -unsigned lodepng_chunk_length(const uint8_t* chunk): - -Get the length of the chunk's data. The total chunk length is this length + 12. - -void lodepng_chunk_type(char type[5], const uint8_t* chunk): -uint8_t lodepng_chunk_type_equals(const uint8_t* chunk, const char* type): - -Get the type of the chunk or compare if it's a certain type - -uint8_t lodepng_chunk_critical(const uint8_t* chunk): -uint8_t lodepng_chunk_private(const uint8_t* chunk): -uint8_t lodepng_chunk_safetocopy(const uint8_t* chunk): - -Check if the chunk is critical in the PNG standard (only IHDR, PLTE, IDAT and IEND are). -Check if the chunk is private (public chunks are part of the standard, private ones not). -Check if the chunk is safe to copy. If it's not, then, when modifying data in a critical -chunk, unsafe to copy chunks of the old image may NOT be saved in the new one if your -program doesn't handle that type of unknown chunk. - -uint8_t* lodepng_chunk_data(uint8_t* chunk): -const uint8_t* lodepng_chunk_data_const(const uint8_t* chunk): - -Get a pointer to the start of the data of the chunk. - -unsigned lodepng_chunk_check_crc(const uint8_t* chunk): -void lodepng_chunk_generate_crc(uint8_t* chunk): - -Check if the crc is correct or generate a correct one. - -uint8_t* lodepng_chunk_next(uint8_t* chunk): -const uint8_t* lodepng_chunk_next_const(const uint8_t* chunk): - -Iterate to the next chunk. This works if you have a buffer with consecutive chunks. Note that these -functions do no boundary checking of the allocated data whatsoever, so make sure there is enough -data available in the buffer to be able to go to the next chunk. - -unsigned lodepng_chunk_append(uint8_t** out, size_t* outlength, const uint8_t* chunk): -unsigned lodepng_chunk_create(uint8_t** out, size_t* outlength, unsigned length, - const char* type, const uint8_t* data): - -These functions are used to create new chunks that are appended to the data in *out that has -length *outlength. The append function appends an existing chunk to the new data. The create -function creates a new chunk with the given parameters and appends it. Type is the 4-letter -name of the chunk. - -8.2. chunks in info_png ------------------------ - -The LodePNGInfo struct contains fields with the unknown chunk in it. It has 3 -buffers (each with size) to contain 3 types of unknown chunks: -the ones that come before the PLTE chunk, the ones that come between the PLTE -and the IDAT chunks, and the ones that come after the IDAT chunks. -It's necessary to make the distionction between these 3 cases because the PNG -standard forces to keep the ordering of unknown chunks compared to the critical -chunks, but does not force any other ordering rules. - -info_png.unknown_chunks_data[0] is the chunks before PLTE -info_png.unknown_chunks_data[1] is the chunks after PLTE, before IDAT -info_png.unknown_chunks_data[2] is the chunks after IDAT - -The chunks in these 3 buffers can be iterated through and read by using the same -way described in the previous subchapter. - -When using the decoder to decode a PNG, you can make it store all unknown chunks -if you set the option settings.remember_unknown_chunks to 1. By default, this -option is off (0). - -The encoder will always encode unknown chunks that are stored in the info_png. -If you need it to add a particular chunk that isn't known by LodePNG, you can -use lodepng_chunk_append or lodepng_chunk_create to the chunk data in -info_png.unknown_chunks_data[x]. - -Chunks that are known by LodePNG should not be added in that way. E.g. to make -LodePNG add a bKGD chunk, set background_defined to true and add the correct -parameters there instead. - - -9. compiler support -------------------- - -No libraries other than the current standard C library are needed to compile -LodePNG. For the C++ version, only the standard C++ library is needed on top. -Add the files lodepng.c(pp) and lodepng.h to your project, include -lodepng.h where needed, and your program can read/write PNG files. - -It is compatible with C90 and up, and C++03 and up. - -If performance is important, use optimization when compiling! For both the -encoder and decoder, this makes a large difference. - -Make sure that LodePNG is compiled with the same compiler of the same version -and with the same settings as the rest of the program, or the interfaces with -std::vectors and std::strings in C++ can be incompatible. - -CHAR_BITS must be 8 or higher, because LodePNG uses uint8_ts for octets. - -*) gcc and g++ - -LodePNG is developed in gcc so this compiler is natively supported. It gives no -warnings with compiler options "-Wall -Wextra -pedantic -ansi", with gcc and g++ -version 4.7.1 on Linux, 32-bit and 64-bit. - -*) Clang - -Fully supported and warning-free. - -*) Mingw - -The Mingw compiler (a port of gcc for Windows) should be fully supported by -LodePNG. - -*) Visual Studio and Visual C++ Express Edition - -LodePNG should be warning-free with warning level W4. Two warnings were disabled -with pragmas though: warning 4244 about implicit conversions, and warning 4996 -where it wants to use a non-standard function fopen_s instead of the standard C -fopen. - -Visual Studio may want "stdafx.h" files to be included in each source file and -give an error "unexpected end of file while looking for precompiled header". -This is not standard C++ and will not be added to the stock LodePNG. You can -disable it for lodepng.cpp only by right clicking it, Properties, C/C++, -Precompiled Headers, and set it to Not Using Precompiled Headers there. - -NOTE: Modern versions of VS should be fully supported, but old versions, e.g. -VS6, are not guaranteed to work. - -*) Compilers on Macintosh - -LodePNG has been reported to work both with gcc and LLVM for Macintosh, both for -C and C++. - -*) Other Compilers - -If you encounter problems on any compilers, feel free to let me know and I may -try to fix it if the compiler is modern and standards complient. - - -10. examples ------------- - -This decoder example shows the most basic usage of LodePNG. More complex -examples can be found on the LodePNG website. - -10.1. decoder C++ example -------------------------- - -#include "lodepng.h" -#include - -int main(int argc, char *argv[]) -{ - const char* filename = argc > 1 ? argv[1] : "test.png"; - - //load and decode - std::vector image; - unsigned width, height; - unsigned error = lodepng::decode(image, width, height, filename); - - //if there's an error, display it - if(error) std::cout << "decoder error " << error << ": " << lodepng_error_text(error) << std::endl; - - //the pixels are now in the vector "image", 4 bytes per pixel, ordered RGBARGBA..., use it as texture, draw it, ... -} - -10.2. decoder C example ------------------------ - -#include "lodepng.h" - -int main(int argc, char *argv[]) -{ - unsigned error; - uint8_t* image; - size_t width, height; - const char* filename = argc > 1 ? argv[1] : "test.png"; - - error = lodepng_decode32_file(&image, &width, &height, filename); - - if(error) printf("decoder error %u: %s\n", error, lodepng_error_text(error)); - - / * use image here * / - - free(image); - return 0; -} - -11. state settings reference ----------------------------- - -A quick reference of some settings to set on the LodePNGState - -For decoding: - -state.decoder.zlibsettings.ignore_adler32: ignore ADLER32 checksums -state.decoder.zlibsettings.custom_...: use custom inflate function -state.decoder.ignore_crc: ignore CRC checksums -state.decoder.color_convert: convert internal PNG color to chosen one -state.decoder.read_text_chunks: whether to read in text metadata chunks -state.decoder.remember_unknown_chunks: whether to read in unknown chunks -state.info_raw.colortype: desired color type for decoded image -state.info_raw.bitdepth: desired bit depth for decoded image -state.info_raw....: more color settings, see struct LodePNGColorMode -state.info_png....: no settings for decoder but ouput, see struct LodePNGInfo - -For encoding: - -state.encoder.zlibsettings.btype: disable compression by setting it to 0 -state.encoder.zlibsettings.use_lz77: use LZ77 in compression -state.encoder.zlibsettings.windowsize: tweak LZ77 windowsize -state.encoder.zlibsettings.minmatch: tweak min LZ77 length to match -state.encoder.zlibsettings.nicematch: tweak LZ77 match where to stop searching -state.encoder.zlibsettings.lazymatching: try one more LZ77 matching -state.encoder.zlibsettings.custom_...: use custom deflate function -state.encoder.auto_convert: choose optimal PNG color type, if 0 uses info_png -state.encoder.filter_palette_zero: PNG filter strategy for palette -state.encoder.filter_strategy: PNG filter strategy to encode with -state.encoder.force_palette: add palette even if not encoding to one -state.encoder.add_id: add LodePNG identifier and version as a text chunk -state.encoder.text_compression: use compressed text chunks for metadata -state.info_raw.colortype: color type of raw input image you provide -state.info_raw.bitdepth: bit depth of raw input image you provide -state.info_raw: more color settings, see struct LodePNGColorMode -state.info_png.color.colortype: desired color type if auto_convert is false -state.info_png.color.bitdepth: desired bit depth if auto_convert is false -state.info_png.color....: more color settings, see struct LodePNGColorMode -state.info_png....: more PNG related settings, see struct LodePNGInfo - - -12. changes ------------ - -The version number of LodePNG is the date of the change given in the format -yyyymmdd. - -Some changes aren't backwards compatible. Those are indicated with a (!) -symbol. - -*) 18 apr 2016: Changed qsort to custom stable sort (for platforms w/o qsort). -*) 09 apr 2016: Fixed colorkey usage detection, and better file loading (within - the limits of pure C90). -*) 08 dec 2015: Made load_file function return error if file can't be opened. -*) 24 okt 2015: Bugfix with decoding to palette output. -*) 18 apr 2015: Boundary PM instead of just package-merge for faster encoding. -*) 23 aug 2014: Reduced needless memory usage of decoder. -*) 28 jun 2014: Removed fix_png setting, always support palette OOB for - simplicity. Made ColorProfile public. -*) 09 jun 2014: Faster encoder by fixing hash bug and more zeros optimization. -*) 22 dec 2013: Power of two windowsize required for optimization. -*) 15 apr 2013: Fixed bug with LAC_ALPHA and color key. -*) 25 mar 2013: Added an optional feature to ignore some PNG errors (fix_png). -*) 11 mar 2013 (!): Bugfix with custom free. Changed from "my" to "lodepng_" - prefix for the custom allocators and made it possible with a new #define to - use custom ones in your project without needing to change lodepng's code. -*) 28 jan 2013: Bugfix with color key. -*) 27 okt 2012: Tweaks in text chunk keyword length error handling. -*) 8 okt 2012 (!): Added new filter strategy (entropy) and new auto color mode. - (no palette). Better deflate tree encoding. New compression tweak settings. - Faster color conversions while decoding. Some internal cleanups. -*) 23 sep 2012: Reduced warnings in Visual Studio a little bit. -*) 1 sep 2012 (!): Removed #define's for giving custom (de)compression functions - and made it work with function pointers instead. -*) 23 jun 2012: Added more filter strategies. Made it easier to use custom alloc - and free functions and toggle #defines from compiler flags. Small fixes. -*) 6 may 2012 (!): Made plugging in custom zlib/deflate functions more flexible. -*) 22 apr 2012 (!): Made interface more consistent, renaming a lot. Removed - redundant C++ codec classes. Reduced amount of structs. Everything changed, - but it is cleaner now imho and functionality remains the same. Also fixed - several bugs and shrunk the implementation code. Made new samples. -*) 6 nov 2011 (!): By default, the encoder now automatically chooses the best - PNG color model and bit depth, based on the amount and type of colors of the - raw image. For this, autoLeaveOutAlphaChannel replaced by auto_choose_color. -*) 9 okt 2011: simpler hash chain implementation for the encoder. -*) 8 sep 2011: lz77 encoder lazy matching instead of greedy matching. -*) 23 aug 2011: tweaked the zlib compression parameters after benchmarking. - A bug with the PNG filtertype heuristic was fixed, so that it chooses much - better ones (it's quite significant). A setting to do an experimental, slow, - brute force search for PNG filter types is added. -*) 17 aug 2011 (!): changed some C zlib related function names. -*) 16 aug 2011: made the code less wide (max 120 characters per line). -*) 17 apr 2011: code cleanup. Bugfixes. Convert low to 16-bit per sample colors. -*) 21 feb 2011: fixed compiling for C90. Fixed compiling with sections disabled. -*) 11 dec 2010: encoding is made faster, based on suggestion by Peter Eastman - to optimize long sequences of zeros. -*) 13 nov 2010: added LodePNG_InfoColor_hasPaletteAlpha and - LodePNG_InfoColor_canHaveAlpha functions for convenience. -*) 7 nov 2010: added LodePNG_error_text function to get error code description. -*) 30 okt 2010: made decoding slightly faster -*) 26 okt 2010: (!) changed some C function and struct names (more consistent). - Reorganized the documentation and the declaration order in the header. -*) 08 aug 2010: only changed some comments and external samples. -*) 05 jul 2010: fixed bug thanks to warnings in the new gcc version. -*) 14 mar 2010: fixed bug where too much memory was allocated for char buffers. -*) 02 sep 2008: fixed bug where it could create empty tree that linux apps could - read by ignoring the problem but windows apps couldn't. -*) 06 jun 2008: added more error checks for out of memory cases. -*) 26 apr 2008: added a few more checks here and there to ensure more safety. -*) 06 mar 2008: crash with encoding of strings fixed -*) 02 feb 2008: support for international text chunks added (iTXt) -*) 23 jan 2008: small cleanups, and #defines to divide code in sections -*) 20 jan 2008: support for unknown chunks allowing using LodePNG for an editor. -*) 18 jan 2008: support for tIME and pHYs chunks added to encoder and decoder. -*) 17 jan 2008: ability to encode and decode compressed zTXt chunks added - Also various fixes, such as in the deflate and the padding bits code. -*) 13 jan 2008: Added ability to encode Adam7-interlaced images. Improved - filtering code of encoder. -*) 07 jan 2008: (!) changed LodePNG to use ISO C90 instead of C++. A - C++ wrapper around this provides an interface almost identical to before. - Having LodePNG be pure ISO C90 makes it more portable. The C and C++ code - are together in these files but it works both for C and C++ compilers. -*) 29 dec 2007: (!) changed most integer types to unsigned int + other tweaks -*) 30 aug 2007: bug fixed which makes this Borland C++ compatible -*) 09 aug 2007: some VS2005 warnings removed again -*) 21 jul 2007: deflate code placed in new namespace separate from zlib code -*) 08 jun 2007: fixed bug with 2- and 4-bit color, and small interlaced images -*) 04 jun 2007: improved support for Visual Studio 2005: crash with accessing - invalid std::vector element [0] fixed, and level 3 and 4 warnings removed -*) 02 jun 2007: made the encoder add a tag with version by default -*) 27 may 2007: zlib and png code separated (but still in the same file), - simple encoder/decoder functions added for more simple usage cases -*) 19 may 2007: minor fixes, some code cleaning, new error added (error 69), - moved some examples from here to lodepng_examples.cpp -*) 12 may 2007: palette decoding bug fixed -*) 24 apr 2007: changed the license from BSD to the zlib license -*) 11 mar 2007: very simple addition: ability to encode bKGD chunks. -*) 04 mar 2007: (!) tEXt chunk related fixes, and support for encoding - palettized PNG images. Plus little interface change with palette and texts. -*) 03 mar 2007: Made it encode dynamic Huffman shorter with repeat codes. - Fixed a bug where the end code of a block had length 0 in the Huffman tree. -*) 26 feb 2007: Huffman compression with dynamic trees (BTYPE 2) now implemented - and supported by the encoder, resulting in smaller PNGs at the output. -*) 27 jan 2007: Made the Adler-32 test faster so that a timewaste is gone. -*) 24 jan 2007: gave encoder an error interface. Added color conversion from any - greyscale type to 8-bit greyscale with or without alpha. -*) 21 jan 2007: (!) Totally changed the interface. It allows more color types - to convert to and is more uniform. See the manual for how it works now. -*) 07 jan 2007: Some cleanup & fixes, and a few changes over the last days: - encode/decode custom tEXt chunks, separate classes for zlib & deflate, and - at last made the decoder give errors for incorrect Adler32 or Crc. -*) 01 jan 2007: Fixed bug with encoding PNGs with less than 8 bits per channel. -*) 29 dec 2006: Added support for encoding images without alpha channel, and - cleaned out code as well as making certain parts faster. -*) 28 dec 2006: Added "Settings" to the encoder. -*) 26 dec 2006: The encoder now does LZ77 encoding and produces much smaller files now. - Removed some code duplication in the decoder. Fixed little bug in an example. -*) 09 dec 2006: (!) Placed output parameters of public functions as first parameter. - Fixed a bug of the decoder with 16-bit per color. -*) 15 okt 2006: Changed documentation structure -*) 09 okt 2006: Encoder class added. It encodes a valid PNG image from the - given image buffer, however for now it's not compressed. -*) 08 sep 2006: (!) Changed to interface with a Decoder class -*) 30 jul 2006: (!) LodePNG_InfoPng , width and height are now retrieved in different - way. Renamed decodePNG to decodePNGGeneric. -*) 29 jul 2006: (!) Changed the interface: image info is now returned as a - struct of type LodePNG::LodePNG_Info, instead of a vector, which was a bit clumsy. -*) 28 jul 2006: Cleaned the code and added new error checks. - Corrected terminology "deflate" into "inflate". -*) 23 jun 2006: Added SDL example in the documentation in the header, this - example allows easy debugging by displaying the PNG and its transparency. -*) 22 jun 2006: (!) Changed way to obtain error value. Added - loadFile function for convenience. Made decodePNG32 faster. -*) 21 jun 2006: (!) Changed type of info vector to unsigned. - Changed position of palette in info vector. Fixed an important bug that - happened on PNGs with an uncompressed block. -*) 16 jun 2006: Internally changed unsigned into unsigned where - needed, and performed some optimizations. -*) 07 jun 2006: (!) Renamed functions to decodePNG and placed them - in LodePNG namespace. Changed the order of the parameters. Rewrote the - documentation in the header. Renamed files to lodepng.cpp and lodepng.h -*) 22 apr 2006: Optimized and improved some code -*) 07 sep 2005: (!) Changed to std::vector interface -*) 12 aug 2005: Initial release (C++, decoder only) - - -13. contact information ------------------------ - -Feel free to contact me with suggestions, problems, comments, ... concerning -LodePNG. If you encounter a PNG image that doesn't work properly with this -decoder, feel free to send it and I'll use it to find and fix the problem. - -My email address is (puzzle the account and domain together with an @ symbol): -Domain: gmail dot com. -Account: lode dot vandevenne. - - -Copyright (c) 2005-2016 Lode Vandevenne -*/