diff --git a/CMakeLists.txt b/CMakeLists.txt index d655c41a..182e3a6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,7 @@ set(SOURCE_FILES src/mdl/mdl_studio.h src/mdl/mdl_studio.cpp # OPENFILEDIALOG - src/filedialog/stb_image.h + src/filedialog/stb_image.h src/filedialog/stb_image_write.h src/filedialog/ImFileDialog.h src/filedialog/ImFileDialog.cpp src/res/Wad.h src/res/Wad.cpp diff --git a/src/bsp/Bsp.cpp b/src/bsp/Bsp.cpp index 8976241e..da4a6bf5 100644 --- a/src/bsp/Bsp.cpp +++ b/src/bsp/Bsp.cpp @@ -279,7 +279,7 @@ Bsp::Bsp(std::string fpath) lastModel.iHeadnodes[2] == 0 && lastModel.iHeadnodes[3] == 0 && lastModel.iFirstFace == 0 && - std::abs(lastModel.vOrigin.z - 9999.0) < 0.01 && + std::fabs(lastModel.vOrigin.z - 9999.0) < 0.01 && lastModel.nFaces == 0) { print_log(get_localized_string(LANG_0040), modelCount - 1); @@ -422,16 +422,55 @@ void Bsp::get_bounding_box(vec3& mins, vec3& maxs) } } -void Bsp::get_model_vertex_bounds(int modelIdx, vec3& mins, vec3& maxs) +void Bsp::get_model_vertex_bounds(int modelIdx, vec3& mins, vec3& maxs, bool skipSpecial) { mins = vec3(FLT_MAX, FLT_MAX, FLT_MAX); maxs = vec3(-FLT_MAX, -FLT_MAX, -FLT_MAX); BSPMODEL& model = models[modelIdx]; - for (int i = 0; i < model.nFaces; i++) { + for (int i = 0; i < model.nFaces; i++) + { BSPFACE32& face = faces[model.iFirstFace + i]; + if (skipSpecial) + { + if (!face.iTextureInfo || (face.nStyles[0] == 0xFF && face.nStyles[1] == 0xFF && face.nStyles[2] == 0xFF && face.nStyles[3] == 0xFF)) + continue; + + BSPTEXTUREINFO& texinfo = texinfos[face.iTextureInfo]; + + if (texinfo.nFlags & TEX_SPECIAL) + { + continue; + } + + int texOffset = ((int*)textures)[texinfo.iMiptex + 1]; + if (texOffset < 0) + { + continue; + } + else + { + BSPMIPTEX* tex = ((BSPMIPTEX*)(textures + texOffset)); + if (toLowerCase(tex->szName) == "aaatrigger" || + toLowerCase(tex->szName) == "null" || + starts_with(toLowerCase(tex->szName), "sky") || + toLowerCase(tex->szName) == "noclip" || + toLowerCase(tex->szName) == "clip" || + toLowerCase(tex->szName) == "origin" || + toLowerCase(tex->szName) == "bevel" || + toLowerCase(tex->szName) == "hint" || + toLowerCase(tex->szName) == "skip" + ) + { + continue; + } + + + } + } + for (int e = 0; e < face.nEdges; e++) { int edgeIdx = surfedges[face.iFirstEdge + e]; BSPEDGE32& edge = edges[abs(edgeIdx)]; @@ -441,7 +480,7 @@ void Bsp::get_model_vertex_bounds(int modelIdx, vec3& mins, vec3& maxs) } } - if (!model.nFaces) { + if (!model.nFaces && !skipSpecial) { // use the clipping hull "faces" instead Clipper clipper; std::vector solidNodes = get_model_leaf_volume_cuts(modelIdx, 0, CONTENTS_SOLID); @@ -582,7 +621,7 @@ bool Bsp::getModelPlaneIntersectVerts(int modelIdx, const std::vector& node if (i == k) continue; - if (nodePlanes[i].vNormal.equal(nodePlanes[k].vNormal, EPSILON) && std::abs(nodePlanes[i].fDist - nodePlanes[k].fDist) < ON_EPSILON) + if (nodePlanes[i].vNormal.equal(nodePlanes[k].vNormal, EPSILON) && std::fabs(nodePlanes[i].fDist - nodePlanes[k].fDist) < ON_EPSILON) { return false; } @@ -610,7 +649,7 @@ bool Bsp::getModelPlaneIntersectVerts(int modelIdx, const std::vector& node for (size_t i = 0; i < nodePlanes.size(); i++) { BSPPLANE& p = nodePlanes[i]; - if (std::abs(dotProduct(v, p.vNormal) - p.fDist) < ON_EPSILON) + if (std::fabs(dotProduct(v, p.vNormal) - p.fDist) < ON_EPSILON) { hullVert.iPlanes.push_back(nodePlaneIndexes[i]); } @@ -1008,7 +1047,7 @@ bool Bsp::move(vec3 offset, int modelIdx, bool onlyModel, bool forceMove, bool l vec3 spawnori = parseVector(ents[i]->keyvalues["spawnorigin"]); // entity not moved if destination is 0,0,0 - if (std::abs(spawnori.x) >= EPSILON || std::abs(spawnori.y) >= EPSILON || std::abs(spawnori.z) >= EPSILON) + if (std::fabs(spawnori.x) >= EPSILON || std::fabs(spawnori.y) >= EPSILON || std::fabs(spawnori.z) >= EPSILON) { ents[i]->setOrAddKeyvalue("spawnorigin", (spawnori + offset).toKeyvalueString()); } @@ -1022,12 +1061,12 @@ bool Bsp::move(vec3 offset, int modelIdx, bool onlyModel, bool forceMove, bool l target.nMins += offset; target.nMaxs += offset; - if (std::abs(target.nMins.x) > FLT_MAX_COORD || - std::abs(target.nMins.y) > FLT_MAX_COORD || - std::abs(target.nMins.z) > FLT_MAX_COORD || - std::abs(target.nMaxs.x) > FLT_MAX_COORD || - std::abs(target.nMaxs.y) > FLT_MAX_COORD || - std::abs(target.nMaxs.z) > FLT_MAX_COORD) + if (std::fabs(target.nMins.x) > FLT_MAX_COORD || + std::fabs(target.nMins.y) > FLT_MAX_COORD || + std::fabs(target.nMins.z) > FLT_MAX_COORD || + std::fabs(target.nMaxs.x) > FLT_MAX_COORD || + std::fabs(target.nMaxs.y) > FLT_MAX_COORD || + std::fabs(target.nMaxs.z) > FLT_MAX_COORD) { print_log(get_localized_string(LANG_0049)); } @@ -1044,12 +1083,12 @@ bool Bsp::move(vec3 offset, int modelIdx, bool onlyModel, bool forceMove, bool l BSPNODE32& node = nodes[i]; - if (std::abs((float)node.nMins[0] + offset.x) > FLT_MAX_COORD || - std::abs((float)node.nMaxs[0] + offset.x) > FLT_MAX_COORD || - std::abs((float)node.nMins[1] + offset.y) > FLT_MAX_COORD || - std::abs((float)node.nMaxs[1] + offset.y) > FLT_MAX_COORD || - std::abs((float)node.nMins[2] + offset.z) > FLT_MAX_COORD || - std::abs((float)node.nMaxs[2] + offset.z) > FLT_MAX_COORD) + if (std::fabs((float)node.nMins[0] + offset.x) > FLT_MAX_COORD || + std::fabs((float)node.nMaxs[0] + offset.x) > FLT_MAX_COORD || + std::fabs((float)node.nMins[1] + offset.y) > FLT_MAX_COORD || + std::fabs((float)node.nMaxs[1] + offset.y) > FLT_MAX_COORD || + std::fabs((float)node.nMins[2] + offset.z) > FLT_MAX_COORD || + std::fabs((float)node.nMaxs[2] + offset.z) > FLT_MAX_COORD) { print_log(get_localized_string(LANG_0050)); } @@ -1070,12 +1109,12 @@ bool Bsp::move(vec3 offset, int modelIdx, bool onlyModel, bool forceMove, bool l BSPLEAF32& leaf = leaves[i]; - if (std::abs((float)leaf.nMins[0] + offset.x) > FLT_MAX_COORD || - std::abs((float)leaf.nMaxs[0] + offset.x) > FLT_MAX_COORD || - std::abs((float)leaf.nMins[1] + offset.y) > FLT_MAX_COORD || - std::abs((float)leaf.nMaxs[1] + offset.y) > FLT_MAX_COORD || - std::abs((float)leaf.nMins[2] + offset.z) > FLT_MAX_COORD || - std::abs((float)leaf.nMaxs[2] + offset.z) > FLT_MAX_COORD) + if (std::fabs((float)leaf.nMins[0] + offset.x) > FLT_MAX_COORD || + std::fabs((float)leaf.nMaxs[0] + offset.x) > FLT_MAX_COORD || + std::fabs((float)leaf.nMins[1] + offset.y) > FLT_MAX_COORD || + std::fabs((float)leaf.nMaxs[1] + offset.y) > FLT_MAX_COORD || + std::fabs((float)leaf.nMins[2] + offset.z) > FLT_MAX_COORD || + std::fabs((float)leaf.nMaxs[2] + offset.z) > FLT_MAX_COORD) { print_log(get_localized_string(LANG_0051)); } @@ -1098,9 +1137,9 @@ bool Bsp::move(vec3 offset, int modelIdx, bool onlyModel, bool forceMove, bool l vert += offset; - if (std::abs(vert.x) > FLT_MAX_COORD || - std::abs(vert.y) > FLT_MAX_COORD || - std::abs(vert.z) > FLT_MAX_COORD) + if (std::fabs(vert.x) > FLT_MAX_COORD || + std::fabs(vert.y) > FLT_MAX_COORD || + std::fabs(vert.z) > FLT_MAX_COORD) { print_log(get_localized_string(LANG_0052)); } @@ -1116,8 +1155,8 @@ bool Bsp::move(vec3 offset, int modelIdx, bool onlyModel, bool forceMove, bool l BSPPLANE& plane = planes[i]; vec3 newPlaneOri = offset + (plane.vNormal * plane.fDist); - if (std::abs(newPlaneOri.x) > FLT_MAX_COORD || std::abs(newPlaneOri.y) > FLT_MAX_COORD || - std::abs(newPlaneOri.z) > FLT_MAX_COORD) + if (std::fabs(newPlaneOri.x) > FLT_MAX_COORD || std::fabs(newPlaneOri.y) > FLT_MAX_COORD || + std::fabs(newPlaneOri.z) > FLT_MAX_COORD) { print_log(get_localized_string(LANG_0053)); } @@ -1949,14 +1988,14 @@ bool operator == (BSPTEXTUREINFO& struct1, BSPTEXTUREINFO& struct2) { return struct1.iMiptex == struct2.iMiptex && struct1.nFlags == struct2.nFlags && - std::abs(struct1.shiftS - struct2.shiftS) < 0.01f && - std::abs(struct1.shiftT - struct2.shiftT) < 0.01f && + std::fabs(struct1.shiftS - struct2.shiftS) < 0.01f && + std::fabs(struct1.shiftT - struct2.shiftT) < 0.01f && struct1.vS.equal(struct2.vS, 0.001f) && struct1.vT.equal(struct2.vT, 0.001f); } bool operator == (BSPPLANE& struct1, BSPPLANE& struct2) { - return struct1.vNormal.equal(struct2.vNormal, 0.001f) && std::abs(struct1.fDist - struct2.fDist) < 0.01f; + return struct1.vNormal.equal(struct2.vNormal, 0.001f) && std::fabs(struct1.fDist - struct2.fDist) < 0.01f; } bool operator !=(BSPTEXTUREINFO& struct1, BSPTEXTUREINFO& struct2) @@ -2479,8 +2518,8 @@ bool Bsp::has_hull2_ents() return true; } } - else if (std::abs(minhull.x) > MAX_HULL1_EXTENT_MONSTER || std::abs(maxhull.x) > MAX_HULL1_EXTENT_MONSTER - || std::abs(minhull.y) > MAX_HULL1_EXTENT_MONSTER || std::abs(maxhull.y) > MAX_HULL1_EXTENT_MONSTER) + else if (std::fabs(minhull.x) > MAX_HULL1_EXTENT_MONSTER || std::fabs(maxhull.x) > MAX_HULL1_EXTENT_MONSTER + || std::fabs(minhull.y) > MAX_HULL1_EXTENT_MONSTER || std::fabs(maxhull.y) > MAX_HULL1_EXTENT_MONSTER) { return true; } @@ -3400,11 +3439,19 @@ void Bsp::count_leaves(int iNode, int& count) { struct CompareVert { vec3 pos; float u, v; + CompareVert() + { + u = v = 0.0f; + } }; struct ModelIdxRemap { int newIdx; vec3 offset; + ModelIdxRemap() + { + newIdx = 0; + } }; void Bsp::deduplicate_models() { @@ -9966,8 +10013,8 @@ int Bsp::merge_two_models_idx(int src_model, int dst_model, int& tryanotherway) BSPPLANE& plane = planes[i]; vec3 newPlaneOri = ent_offset + (plane.vNormal * plane.fDist); - if (std::abs(newPlaneOri.x) > FLT_MAX_COORD || std::abs(newPlaneOri.y) > FLT_MAX_COORD || - std::abs(newPlaneOri.z) > FLT_MAX_COORD) + if (std::fabs(newPlaneOri.x) > FLT_MAX_COORD || std::fabs(newPlaneOri.y) > FLT_MAX_COORD || + std::fabs(newPlaneOri.z) > FLT_MAX_COORD) { print_log(get_localized_string(LANG_0053)); } @@ -10206,8 +10253,8 @@ int Bsp::merge_two_models_ents(int src_ent, int dst_ent, int& tryanotherway) BSPPLANE& plane = planes[i]; vec3 newPlaneOri = ent_offset + (plane.vNormal * plane.fDist); - if (std::abs(newPlaneOri.x) > FLT_MAX_COORD || std::abs(newPlaneOri.y) > FLT_MAX_COORD || - std::abs(newPlaneOri.z) > FLT_MAX_COORD) + if (std::fabs(newPlaneOri.x) > FLT_MAX_COORD || std::fabs(newPlaneOri.y) > FLT_MAX_COORD || + std::fabs(newPlaneOri.z) > FLT_MAX_COORD) { print_log(get_localized_string(LANG_0053)); } @@ -11429,7 +11476,7 @@ void Bsp::ExportToObjWIP(const std::string& path, int iscale, bool lightmapmode, if (iscale == 1) scale = 1.0f; - scale = std::abs(scale); + scale = std::fabs(scale); print_log(get_localized_string(LANG_0194), bsp_name + ".obj", path); print_log(get_localized_string(LANG_0195), iscale == 1 ? "scale" : iscale < 0 ? "downscale" : "upscale", abs(iscale)); @@ -11969,7 +12016,7 @@ void placePointsToPlane(std::vector& points, const BSPPLANE& plane) for (auto& point : points) { double distance = (point.x * plane.vNormal.x + point.y * plane.vNormal.y + point.z * plane.vNormal.z - plane.fDist); - if (std::abs(distance) > EPSILON2) + if (std::fabs(distance) > EPSILON2) { point.x -= (float)(distance * plane.vNormal.x); point.y -= (float)(distance * plane.vNormal.y); @@ -11984,7 +12031,7 @@ bool isPointsToPlane(const std::vector& points, const BSPPLANE& plane) for (auto& point : points) { double distance = (point.x * plane.vNormal.x + point.y * plane.vNormal.y + point.z * plane.vNormal.z - plane.fDist); - if (std::abs(distance) > mON_EPSILON) + if (std::fabs(distance) > mON_EPSILON) { return false; } diff --git a/src/bsp/Bsp.h b/src/bsp/Bsp.h index a2de8be4..26639038 100644 --- a/src/bsp/Bsp.h +++ b/src/bsp/Bsp.h @@ -177,7 +177,7 @@ class Bsp void get_bounding_box(vec3& mins, vec3& maxs); // get the bounding box for all vertexes in a BSP tree - void get_model_vertex_bounds(int modelIdx, vec3& mins, vec3& maxs); + void get_model_vertex_bounds(int modelIdx, vec3& mins, vec3& maxs, bool skipSpecial = false); // face has duplicate verts, this is bad? bool is_face_duplicate_edges(int faceIdx); diff --git a/src/bsp/BspMerger.cpp b/src/bsp/BspMerger.cpp index 69e889ec..423c9f52 100644 --- a/src/bsp/BspMerger.cpp +++ b/src/bsp/BspMerger.cpp @@ -141,7 +141,7 @@ MergeResult BspMerger::merge(std::vector maps, const vec3& gap, const std: { MAPBLOCK& block = blocks[z][y][x]; - if (std::abs(block.offset.x) >= EPSILON || std::abs(block.offset.y) >= EPSILON || std::abs(block.offset.z) >= EPSILON) + if (std::fabs(block.offset.x) >= EPSILON || std::fabs(block.offset.y) >= EPSILON || std::fabs(block.offset.z) >= EPSILON) { print_log(" Apply offset ({:6.0f}, {:6.0f}, {:6.0f}) to {}\n", block.offset.x, block.offset.y, block.offset.z, block.map->bsp_name.c_str()); @@ -1296,7 +1296,7 @@ void BspMerger::merge_planes(Bsp& mapA, Bsp& mapB) bool isUnique = true; for (int k = 0; k < mapA.planeCount; k++) { - if (std::abs(mapB.planes[i].fDist - mapA.planes[k].fDist) < EPSILON + if (std::fabs(mapB.planes[i].fDist - mapA.planes[k].fDist) < EPSILON && mapB.planes[i].nType == mapA.planes[k].nType && mapB.planes[i].vNormal == mapA.planes[k].vNormal) { @@ -1475,8 +1475,8 @@ void BspMerger::merge_texinfo(Bsp& mapA, Bsp& mapB) { if (info.iMiptex == mapA.texinfos[k].iMiptex && info.nFlags == mapA.texinfos[k].nFlags - && std::abs(info.shiftS - mapA.texinfos[k].shiftS) < EPSILON - && std::abs(info.shiftT - mapA.texinfos[k].shiftT) < EPSILON + && std::fabs(info.shiftS - mapA.texinfos[k].shiftS) < EPSILON + && std::fabs(info.shiftT - mapA.texinfos[k].shiftT) < EPSILON && info.vS == mapA.texinfos[k].vS && info.vT == mapA.texinfos[k].vT) { diff --git a/src/bsp/bsptypes.cpp b/src/bsp/bsptypes.cpp index fa8d4206..686b7627 100644 --- a/src/bsp/bsptypes.cpp +++ b/src/bsp/bsptypes.cpp @@ -1,5 +1,6 @@ #include "bsptypes.h" #include +#include BSPEDGE16::BSPEDGE16() { @@ -31,9 +32,9 @@ BSPEDGE32::BSPEDGE32(unsigned int v1, unsigned int v2) bool BSPPLANE::update_plane(vec3 newNormal, float fdist, bool flip) { - float fx = std::abs(newNormal.x); - float fy = std::abs(newNormal.y); - float fz = std::abs(newNormal.z); + float fx = std::fabs(newNormal.x); + float fy = std::fabs(newNormal.y); + float fz = std::fabs(newNormal.z); int planeType = PLANE_ANYZ; bool shouldFlip = false; if (fx > 1.0f - EPSILON && fy < EPSILON && fz < EPSILON) diff --git a/src/editor/BspRenderer.cpp b/src/editor/BspRenderer.cpp index 912833ea..168fd415 100644 --- a/src/editor/BspRenderer.cpp +++ b/src/editor/BspRenderer.cpp @@ -1107,7 +1107,7 @@ int BspRenderer::refreshModel(int modelIdx, bool refreshClipnodes, bool triangul verts[e].r = 0.0f; if (ent && ent->rendermode > 0) { - verts[e].g = 1.001f + std::abs((float)ent->rendermode); + verts[e].g = 1.001f + std::fabs((float)ent->rendermode); } else { @@ -1985,7 +1985,7 @@ bool BspRenderer::setRenderAngles(const std::string& classname, mat4x4& outmat, } else if (classname == "env_sprite") { - if (std::abs(outangles.y) >= EPSILON && std::abs(outangles.z) < EPSILON) + if (std::fabs(outangles.y) >= EPSILON && std::fabs(outangles.z) < EPSILON) { outangles.z = 0.0f; outmat.rotateY(0.0); @@ -2944,7 +2944,7 @@ void BspRenderer::render(bool modelVertsDraw, int clipnodeHull) - if (g_app->pickMode == PICK_FACE_LEAF) + if (g_app->pickMode == PICK_FACE_LEAF && !ortho_overview) { glDepthMask(GL_FALSE); glDepthFunc(GL_ALWAYS); @@ -2976,7 +2976,7 @@ void BspRenderer::drawModelClipnodes(int modelIdx, bool highlight, int hullIdx) hullIdx = getBestClipnodeHull(modelIdx); } - if (hullIdx <= -1 || hullIdx > 3) + if (hullIdx <= -1 || hullIdx > 3 || ortho_overview) { return; // nothing can be drawn } @@ -3052,7 +3052,7 @@ void BspRenderer::drawModel(RenderEnt* ent, int pass, bool highlight, bool edges if (pass == REND_PASS_COLORSHADER) { RenderModel* rend_mdl = renderModels[modelIdx]; - if (rend_mdl->wireframeBuffer) + if (rend_mdl->wireframeBuffer && !ortho_overview) { if (ent && ent->isDuplicateModel) rend_mdl->wireframeBuffer->frameId--; @@ -3137,6 +3137,9 @@ void BspRenderer::drawModel(RenderEnt* ent, int pass, bool highlight, bool edges { if (rgroup.special) { + if (ortho_overview) + continue; + if (modelIdx == 0 && !(g_render_flags & RENDER_SPECIAL)) { continue; @@ -3220,7 +3223,7 @@ void BspRenderer::drawModel(RenderEnt* ent, int pass, bool highlight, bool edges } - if (g_app->pickMode != PICK_OBJECT && highlight) + if (g_app->pickMode != PICK_OBJECT && highlight && !ortho_overview) { if (ent) { @@ -3232,7 +3235,7 @@ void BspRenderer::drawModel(RenderEnt* ent, int pass, bool highlight, bool edges } else { - if (highlight) + if (highlight && !ortho_overview) { if (ent) { @@ -3268,10 +3271,22 @@ void BspRenderer::drawPointEntities(std::vector highlightEnts, int pass) { if (renderEnts[i].modelIdx >= 0) continue; - if (map->ents[i]->hide) + + Entity* mapEnt = map->ents[i]; + + if (mapEnt->hide) continue; - if (g_app->pickInfo.IsSelectedEnt(i)) + if (ortho_overview) + { + if (!starts_with(mapEnt->classname, "cycler_") && + !starts_with(mapEnt->classname, "func_")) + { + continue; + } + } + + if (g_app->pickInfo.IsSelectedEnt(i) && !ortho_overview) { if (g_render_flags & RENDER_SELECTED_AT_TOP) glDepthFunc(GL_ALWAYS); @@ -3287,12 +3302,12 @@ void BspRenderer::drawPointEntities(std::vector highlightEnts, int pass) { renderEnts[i].mdl->DrawMDL(); } - else if (renderEnts[i].spr) + else if (renderEnts[i].spr && !ortho_overview) { renderEnts[i].spr->DrawSprite(); } } - else if (pass == REND_PASS_COLORSHADER) + else if (pass == REND_PASS_COLORSHADER && !ortho_overview) { g_app->matmodel = renderEnts[i].modelMat4x4_calc_angles; g_app->colorShader->updateMatrixes(); @@ -3313,7 +3328,7 @@ void BspRenderer::drawPointEntities(std::vector highlightEnts, int pass) } else { - if (pass == REND_PASS_COLORSHADER) + if (pass == REND_PASS_COLORSHADER && !ortho_overview) { g_app->matmodel = renderEnts[i].modelMat4x4_calc_angles; g_app->colorShader->updateMatrixes(); @@ -3348,7 +3363,7 @@ void BspRenderer::drawPointEntities(std::vector highlightEnts, int pass) { renderEnts[i].mdl->DrawMDL(); } - else if (renderEnts[i].spr) + else if (renderEnts[i].spr && !ortho_overview) { renderEnts[i].spr->DrawSprite(); } @@ -3367,7 +3382,7 @@ void BspRenderer::drawPointEntities(std::vector highlightEnts, int pass) } else { - if (pass == REND_PASS_COLORSHADER) + if (pass == REND_PASS_COLORSHADER && !ortho_overview) { g_app->matmodel = renderEnts[i].modelMat4x4_calc_angles; g_app->colorShader->updateMatrixes(); diff --git a/src/editor/Fgd.cpp b/src/editor/Fgd.cpp index 9f4047fd..05c15096 100644 --- a/src/editor/Fgd.cpp +++ b/src/editor/Fgd.cpp @@ -760,7 +760,7 @@ void Fgd::processClassInheritance() { if (classes[i]->keyvalues[c].iType == FGD_KEY_TYPES::FGD_KEY_INTEGER) { - classes[i]->scale = str_to_int(classes[i]->keyvalues[c].defaultValue); + classes[i]->scale = str_to_int(classes[i]->keyvalues[c].defaultValue) * 1.0f; } else if (classes[i]->keyvalues[c].iType == FGD_KEY_TYPES::FGD_KEY_STRING) { diff --git a/src/editor/Gui.cpp b/src/editor/Gui.cpp index 6cb5d3f9..5f0053cc 100644 --- a/src/editor/Gui.cpp +++ b/src/editor/Gui.cpp @@ -176,6 +176,10 @@ void Gui::draw() { drawTextureBrowser(); } + if (showOverviewWidget) + { + drawOverviewWidget(); + } if (showTransformWidget) { drawTransformWidget(); @@ -3471,7 +3475,7 @@ void Gui::drawMenuBar() auto& faceMath = rend->faceMaths[faceIndices[f]]; float distanceToPlane = dotProduct(faceMath.normal, pos) - faceMath.fdist; - float dot = std::abs(distanceToPlane); + float dot = std::fabs(distanceToPlane); if (dot > minDist) { @@ -4887,7 +4891,7 @@ void Gui::drawMenuBar() for (float scale_val = 0.25f; scale_val <= 2.0f; scale_val += 0.25f) { - if (std::abs(scale_val - 1.0f) > EPSILON && ImGui::MenuItem(fmt::format("Scale {:2}X", scale_val).c_str())) + if (std::fabs(scale_val - 1.0f) > EPSILON && ImGui::MenuItem(fmt::format("Scale {:2}X", scale_val).c_str())) { if (ScaleOnlySelected) { @@ -4935,7 +4939,7 @@ void Gui::drawMenuBar() if (app->pickInfo.IsSelectedEnt(i)) { vec3 neworigin = map->ents[i]->origin * scale_val; - neworigin.z += std::abs(neworigin.z - map->ents[i]->origin.z) * scale_val; + neworigin.z += std::fabs(neworigin.z - map->ents[i]->origin.z) * scale_val; map->ents[i]->setOrAddKeyvalue("origin", neworigin.toKeyvalueString()); } } @@ -4985,7 +4989,7 @@ void Gui::drawMenuBar() for (size_t i = 0; i < map->ents.size(); i++) { vec3 neworigin = map->ents[i]->origin * scale_val; - neworigin.z += std::abs(neworigin.z - map->ents[i]->origin.z) * scale_val; + neworigin.z += std::fabs(neworigin.z - map->ents[i]->origin.z) * scale_val; map->ents[i]->setOrAddKeyvalue("origin", neworigin.toKeyvalueString()); } for (int i = 0; i < map->nodeCount; i++) @@ -5602,6 +5606,7 @@ void Gui::drawMenuBar() map->ents.erase(map->ents.begin() + i); } } + //todo.... } ImGui::EndMenu(); } @@ -5655,6 +5660,10 @@ void Gui::drawMenuBar() { showMergeMapWidget = !showMergeMapWidget; } + if (ImGui::MenuItem("Map Overview", "", showOverviewWidget)) + { + showOverviewWidget = !showOverviewWidget; + } if (ImGui::MenuItem(get_localized_string(LANG_1096).c_str(), "", showLogWidget)) { showLogWidget = !showLogWidget; @@ -6767,7 +6776,7 @@ void Gui::drawDebugWidget() vec3 normal = faceMath.normal.normalize(); float distanceToPlane = dotProduct(normal, cameraOrigin) - faceMath.fdist; - float dot = std::abs(distanceToPlane); + float dot = std::fabs(distanceToPlane); if (dot > minDist) { @@ -6886,6 +6895,115 @@ void Gui::drawDebugWidget() ImGui::End(); } +void Gui::drawOverviewWidget() +{ + static Bsp* lastMap = NULL; + static bool orthoMode = true; + static bool updateFarNear = false; + + if (updateFarNear) + { + updateFarNear = false; + ortho_near = (ortho_maxs.z - ortho_mins.z) + cameraOrigin.z; + ortho_far = (ortho_maxs.z - ortho_mins.z) * 2 + cameraOrigin.z; + } + + ortho_overview = orthoMode; + + Bsp* map = app->getSelectedMap(); + BspRenderer* mapRender = map ? map->getBspRender() : NULL; + + if (ImGui::Begin("Overview Widget###OVERVIEW_MAKER", &showOverviewWidget, ImGuiWindowFlags_AlwaysAutoResize)) + { + if (lastMap != map) + { + lastMap = map; + map->get_model_vertex_bounds(0, ortho_mins, ortho_maxs); + } + + if (!map) + { + ImGui::Text("No selected map"); + ImGui::End(); + return; + } + + ImGui::SeparatorText("Custom Window Size"); + ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.3f); + ImGui::DragFloat("Width", &ortho_custom_w, 1.0f, 256.0f, 2048.0f, "%.0f"); + ImGui::SameLine(); + ImGui::DragFloat("Height", &ortho_custom_h, 1.0f, 256.0f, 2048.0f, "%.0f"); + ImGui::PopItemWidth(); + + ImGui::SeparatorText("Overview Settings"); + ImGui::Checkbox("Show Overview", &orthoMode); + ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.3f); + ImGui::DragFloat("Aspect Ratio", &ortho_custom_aspect, 0.01f, 0.5f, 2.0f, "%.2f"); + ImGui::DragFloat("Ortho FOV", &ortho_fov, 0.1f, 10.0f, 100.0f, "%.2f"); + ImGui::DragFloat("Ortho Near", &ortho_near, 1.0f, -1.0f, 8192.0f, "%.2f"); + ImGui::DragFloat("Ortho Far", &ortho_far, 1.0f, -1.0f, FLT_MAX_COORD, "%.2f"); + ImGui::PopItemWidth(); + + ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.7f); + ImGui::DragFloat3("Mins", &ortho_mins.x, 1.0f, -FLT_MAX_COORD, FLT_MAX_COORD, "%.0f"); + ImGui::DragFloat3("Maxs", &ortho_maxs.x, 1.0f, -FLT_MAX_COORD, FLT_MAX_COORD, "%.0f"); + ImGui::DragFloat3("Offset", &ortho_offset.x, 1.0f, -FLT_MAX_COORD, FLT_MAX_COORD, "%.0f"); + ImGui::PopItemWidth(); + + ImGui::SeparatorText("Fill Overview Mins/Maxs"); + if (ImGui::Button("Fill from Model[0]")) { + map->get_bounding_box(ortho_mins, ortho_maxs); + } + if (ImGui::Button("Fill from Verts")) { + map->get_model_vertex_bounds(0, ortho_mins, ortho_maxs,true); + } + if (ImGui::Button("Fill from Leaves")) { + ortho_mins = vec3(FLT_MAX, FLT_MAX, FLT_MAX); + ortho_maxs = vec3(-FLT_MAX, -FLT_MAX, -FLT_MAX); + for (int i = 1; i < map->leafCount; i++) + { + if (map->leaves[i].nContents == CONTENTS_EMPTY || map->leaves[i].nContents == CONTENTS_WATER) + { + expandBoundingBox(map->leaves[i].nMins, ortho_mins, ortho_maxs); + expandBoundingBox(map->leaves[i].nMaxs, ortho_mins, ortho_maxs); + } + } + } + + if (ImGui::Button("Calculate Far/Near")) { + updateFarNear = true; + } + + ImGui::SeparatorText("Save to TGA"); + ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.3f); + ImGui::DragInt("Width###2", &ortho_tga_w, 1.0f, 256, 2048); + ImGui::SameLine(); + ImGui::DragInt("Height###3", &ortho_tga_h, 1.0f, 256, 2048); + ImGui::PopItemWidth(); + + if (ImGui::Button("Save .tga")) { + ortho_save_tga = true; + } + ImGui::SameLine(); + if (ImGui::Button("Save .bmp")) + { + ortho_save_bmp = true; + } + + if (ImGui::IsMouseReleased(ImGuiMouseButton_Left)) + { + if (std::fabs(ortho_custom_w) > EPSILON && ortho_custom_w < 256.0f) + ortho_custom_w = 256.0f; + + if (std::fabs(ortho_custom_h) > EPSILON && ortho_custom_h < 256.0f) + ortho_custom_h = 256.0f; + } + + ImGui::End(); + } +} + + void Gui::drawTextureBrowser() { Bsp* map = app->getSelectedMap(); @@ -7612,11 +7730,11 @@ struct TextChangeCallback vec3 newOrigin = parseVector(data->Buf); vec3 oldOrigin = parseVector(selent->keyvalues[key]); vec3 testOrigin = newOrigin - oldOrigin; - if (std::abs(testOrigin.x) > EPSILON2) + if (std::fabs(testOrigin.x) > EPSILON2) { part_vec = 0; } - else if (std::abs(testOrigin.y) > EPSILON2) + else if (std::fabs(testOrigin.y) > EPSILON2) { part_vec = 1; } @@ -8612,7 +8730,7 @@ void Gui::drawLog() { log_buffer_copy = g_log_buffer; color_buffer_copy = g_color_buffer; - scroll_to_bottom = true; + scroll_to_bottom = true; } g_mutex_list[0].unlock(); @@ -8634,7 +8752,7 @@ void Gui::drawLog() } if (ImGui::MenuItem(get_localized_string(LANG_0708).c_str(), NULL, &AutoScroll)) { - + } ImGui::EndPopup(); } @@ -9037,7 +9155,7 @@ void Gui::drawSettings() if (ImGui::Button(get_localized_string(LANG_0741).c_str())) { - g_settings.fgdPaths.emplace_back(std::string(),true); + g_settings.fgdPaths.emplace_back(std::string(), true); } } else if (settingsTab == 2) @@ -9443,7 +9561,7 @@ void Gui::drawSettings() { g_render_flags ^= RENDER_MAP_BOUNDARY; } - + ImGui::Columns(1); ImGui::Separator(); diff --git a/src/editor/Gui.h b/src/editor/Gui.h index 7e744e1f..47a4a5a5 100644 --- a/src/editor/Gui.h +++ b/src/editor/Gui.h @@ -82,6 +82,7 @@ class Gui bool showGOTOWidget_update = true; bool showGOTOWidget = false; bool showTextureBrowser = false; + bool showOverviewWidget = false; bool reloadSettings = true; bool openSavedTabs = false; @@ -127,6 +128,7 @@ class Gui void drawStatusMessage(); void drawDebugWidget(); void drawTextureBrowser(); + void drawOverviewWidget(); void drawKeyvalueEditor(); void drawKeyvalueEditor_SmartEditTab(int entIdx); void drawKeyvalueEditor_FlagsTab(int entIdx); diff --git a/src/editor/Renderer.cpp b/src/editor/Renderer.cpp index db762a3e..be1172a8 100644 --- a/src/editor/Renderer.cpp +++ b/src/editor/Renderer.cpp @@ -16,10 +16,27 @@ #include "LeafNavMesh.h" #include "Settings.h" +#define STB_IMAGE_WRITE_IMPLEMENTATION +#include "stb_image_write.h" + Renderer* g_app = NULL; std::vector mapRenderers{}; int current_fps = 0; +int ortho_overview = 0; + +vec3 ortho_mins(-FLT_MAX_COORD,-FLT_MAX_COORD, -FLT_MAX_COORD), ortho_maxs(FLT_MAX_COORD,FLT_MAX_COORD,FLT_MAX_COORD); +vec3 ortho_offset = {}; +float ortho_near = 1.0f; +float ortho_far = 262144.0f; +float ortho_fov = 45.0f; +float ortho_custom_aspect = 1.0f; +float ortho_custom_w = 0.0f; +float ortho_custom_h = 0.0f; +int ortho_tga_w = 1024; +int ortho_tga_h = 768; +bool ortho_save_tga = false; +bool ortho_save_bmp = false; vec2 mousePos; vec3 cameraOrigin; @@ -480,17 +497,40 @@ void Renderer::renderLoop() double xpos = 0.0, ypos = 0.0; - if (SelectedMap && SelectedMap->is_mdl_model) - glClearColor(0.25, 0.25, 0.25, 1.0); - else - glClearColor(0.0, 0.0, 0.0, 1.0); - + int clearcolor = 0; while (!glfwWindowShouldClose(window)) { + + //ortho_overview = DebugKeyPressed; + curTime = glfwGetTime(); if (g_rend_vsync != 0 || std::abs(curTime - framerateTime) > 1.0f / g_settings.fpslimit) { + if (SelectedMap && SelectedMap->is_mdl_model) + { + if (clearcolor != 1) + { + glClearColor(0.25, 0.25, 0.25, 1.0); + clearcolor = 1; + } + } + else if (!ortho_overview) + { + if (clearcolor != 2) + { + glClearColor(0.0, 0.0, 0.0, 1.0); + clearcolor = 2; + } + } + else + { + if (clearcolor != 3) + { + glClearColor(0.0, 1.0, 0.0, 1.0); + clearcolor = 3; + } + } if (std::abs(curTime - fpsTime) >= 0.5) { @@ -507,6 +547,33 @@ void Renderer::renderLoop() mousePos = vec2((float)xpos, (float)ypos); + GLuint fbo, texture, rbo; + + if (ortho_save_tga || ortho_save_bmp) + { + glGenFramebuffers(1, &fbo); + glBindFramebuffer(GL_FRAMEBUFFER, fbo); + + glGenTextures(1, &texture); + glBindTexture(GL_TEXTURE_2D, texture); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, ortho_tga_w, ortho_tga_h, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glBindTexture(GL_TEXTURE_2D, 0); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0); + + glGenRenderbuffers(1, &rbo); + glBindRenderbuffer(GL_RENDERBUFFER, rbo); + glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, ortho_tga_w, ortho_tga_h); + glBindRenderbuffer(GL_RENDERBUFFER, 0); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, rbo); + + if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) + std::cerr << "Framebuffer not complete!" << std::endl; + + glBindFramebuffer(GL_FRAMEBUFFER, fbo); + } + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //Update keyboard / mouse state @@ -606,7 +673,23 @@ void Renderer::renderLoop() gui->shouldUpdateUi = true; } - setupView(); + if (getSelectedMap() && ortho_overview) + { + /*static vec3 bmins = vec3(), bmaxs = vec3(); + + if (bmins == vec3() && bmaxs == vec3()) + { + for (int v = 0; v < getSelectedMap()->vertCount; v++) + { + expandBoundingBox(getSelectedMap()->verts[v], bmins, bmaxs); + } + }*/ + setupFakeOrthoView(0, 0, ortho_mins, ortho_maxs); + } + else + { + setupView(); + } drawEntConnections(); @@ -635,14 +718,14 @@ void Renderer::renderLoop() matmodel.loadIdentity(); modelShader->bind(); modelShader->updateMatrixes(); - if (anyCtrlPressed) + if (anyCtrlPressed && !ortho_overview) { if (SelectedMap->map_mdl->mdl_cube && SelectedMap->map_mdl->mdl_cube->axesBuffer) { SelectedMap->map_mdl->mdl_cube->axesBuffer->drawFull(); } } - if (anyAltPressed) + if (anyAltPressed && !ortho_overview) { if (SelectedMap->map_mdl->mdl_cube && SelectedMap->map_mdl->mdl_cube->cubeBuffer) { @@ -724,7 +807,7 @@ void Renderer::renderLoop() } } - if (SelectedMap) + if (SelectedMap && !ortho_overview) { if (debugClipnodes && modelIdx > 0) { @@ -787,7 +870,7 @@ void Renderer::renderLoop() glDepthMask(GL_FALSE); glDepthFunc(GL_ALWAYS); - if (entConnectionPoints && (g_render_flags & RENDER_ENT_CONNECTIONS)) + if (entConnectionPoints && (g_render_flags & RENDER_ENT_CONNECTIONS) && !ortho_overview) { matmodel.loadIdentity(); colorShader->updateMatrixes(); @@ -805,7 +888,7 @@ void Renderer::renderLoop() drawingMoveAxes = false; drawingScaleAxes = false; - if (showDragAxes && pickMode == pick_modes::PICK_OBJECT) + if (showDragAxes && !ortho_overview && pickMode == pick_modes::PICK_OBJECT) { if (!movingEnt && !isTransformingWorld && entIdx.size() && (isTransformingValid || isMovingOrigin)) { @@ -813,7 +896,7 @@ void Renderer::renderLoop() } } - if (modelIdx > 0 && pickMode == PICK_OBJECT) + if (modelIdx > 0 && !ortho_overview && pickMode == PICK_OBJECT) { if (transformTarget == TRANSFORM_VERTEX && isTransformableSolid) { @@ -827,6 +910,7 @@ void Renderer::renderLoop() } } + if (!ortho_overview) { matmodel.loadIdentity(); colorShader->updateMatrixes(); @@ -1080,6 +1164,40 @@ void Renderer::renderLoop() glDepthMask(GL_TRUE); glDepthFunc(GL_LESS); + + if (ortho_save_tga || ortho_save_bmp) + { + std::vector pixels(3 * ortho_tga_w * ortho_tga_h); + glBindFramebuffer(GL_FRAMEBUFFER, fbo); + glReadPixels(0, 0, ortho_tga_w, ortho_tga_h, GL_RGB, GL_UNSIGNED_BYTE, pixels.data()); + glBindFramebuffer(GL_FRAMEBUFFER, 0); + + for (int line = 0; line != ortho_tga_h / 2; ++line) { + std::swap_ranges(pixels.begin() + 3 * ortho_tga_w * line, + pixels.begin() + 3 * ortho_tga_w * (line + 1), + pixels.begin() + 3 * ortho_tga_w * (ortho_tga_h - line - 1)); + } + + if (ortho_save_tga) + { + stbi_write_tga((g_working_dir + "overview.tga").c_str(), ortho_tga_w, ortho_tga_h, 3, pixels.data()); + print_log("Saved to {} file!\n", (g_working_dir + "overview.tga").c_str()); + } + else + { + stbi_write_bmp((g_working_dir + "overview.bmp").c_str(), ortho_tga_w, ortho_tga_h, 3, pixels.data()); + print_log("Saved to {} file!\n", (g_working_dir + "overview.bmp").c_str()); + } + + + glBindFramebuffer(GL_FRAMEBUFFER, 0); + glDeleteFramebuffers(1, &fbo); + glDeleteTextures(1, &texture); + glDeleteRenderbuffers(1, &rbo); + ortho_save_tga = false; + ortho_save_bmp = false; + } + vec3 forward, right, up; makeVectors(cameraAngles, forward, right, up); if (!hideGui) @@ -1523,19 +1641,37 @@ void Renderer::controls() cameraOrigin += getMoveDir() * (float)(curTime - oldTime) * moveSpeed; - moveGrabbedEnt(); + if (!ortho_overview) + { + moveGrabbedEnt(); - vertexEditControls(); + vertexEditControls(); + } + else + { + ungrabEnt(); + hoverVert = hoverAxis = hoverEdge = -1; + showDragAxes = false; + } cameraContextMenus(); - cameraRotationControls(); + if (!ortho_overview) + { + cameraRotationControls(); + } makeVectors(cameraAngles, cameraForward, cameraRight, cameraUp); - cameraObjectHovering(); + if (!ortho_overview) + { + cameraObjectHovering(); + } - cameraPickingControls(); + if (!ortho_overview) + { + cameraPickingControls(); + } if (!gui->imgui_io->WantCaptureKeyboard) { @@ -1795,7 +1931,7 @@ void Renderer::cameraRotationControls() cameraAngles.z += drag.x * rotationSpeed * 0.1f; cameraAngles.x += drag.y * rotationSpeed * 0.1f; - totalMouseDrag += vec2(std::abs(drag.x), std::abs(drag.y)); + totalMouseDrag += vec2(std::fabs(drag.x), std::fabs(drag.y)); cameraAngles.x = clamp(cameraAngles.x, -90.0f, 90.0f); @@ -2096,7 +2232,7 @@ void Renderer::pickObject() { Bsp* map = SelectedMap; auto entIdx = pickInfo.selectedEnts; - if (!map) + if (!map/* || ortho_overview*/) return; bool pointEntWasSelected = entIdx.size(); @@ -2110,7 +2246,7 @@ void Renderer::pickObject() vec3 pickStart, pickDir; getPickRay(pickStart, pickDir); - if (DebugKeyPressed) + /*if (DebugKeyPressed) { TraceResult& tr = debugTrace; mapRenderers[0]->map->traceHull(pickStart, pickStart + pickDir * 512, 1, &tr); @@ -2124,7 +2260,7 @@ void Renderer::pickObject() else { - } + }*/ Bsp* oldmap = map; @@ -2657,6 +2793,62 @@ BspRenderer* Renderer::getMapContainingCamera() return NULL; } +void Renderer::setupFakeOrthoView(int forceW, int forceH, vec3 bboxMin, vec3 bboxMax) +{ + if (forceW == 0 || forceH == 0) + glfwGetFramebufferSize(window, &windowWidth, &windowHeight); + else + { + windowWidth = forceW; + windowHeight = forceH; + } + + glViewport(0, 0, windowWidth, windowHeight); + + float aspect = (float)windowWidth / (float)windowHeight; + + if (std::fabs(ortho_custom_aspect) > EPSILON) + aspect = ortho_custom_aspect; + + float bboxWidth = bboxMax.x - bboxMin.x; + float bboxHeight = bboxMax.y - bboxMin.y; + + projection.perspective(ortho_fov, aspect, std::fabs(ortho_near) > EPSILON ? ortho_near : zNear, + std::fabs(ortho_far) > EPSILON ? ortho_far : zFar); + + vec3 center = getCenter(bboxMin, bboxMax) + ortho_offset; + + float distanceX = bboxWidth / (2.0f * tan(ortho_fov * HL_PI / 360.0f)); + float distanceY = bboxHeight / (2.0f * tan(ortho_fov * HL_PI / 360.0f)); + float distance = std::max(distanceX, distanceY); + + matview.loadIdentity(); + matview.rotateX(90.0f * HL_PI / 180.0f); + + if (bboxWidth < bboxHeight) + { + matview.rotateY(90.0f * HL_PI / 180.0f); + } + + matview.translate(-center.x, -distance, center.y); + + cameraAngles.x = 90.0f; + cameraAngles.y = cameraAngles.z = 0.0f; + + if (bboxWidth < bboxHeight) + { + cameraAngles.z = 90.0f; + } + + cameraOrigin.x = center.x; + cameraOrigin.y = center.y; + + distance = std::max(bboxWidth, bboxHeight) / (2.0f * tan(this->fov * HL_PI / 360.0f)); + + cameraOrigin.z = distance; +} + + void Renderer::setupView(int forceW, int forceH) { if (forceW == 0 || forceH == 0) @@ -2895,7 +3087,7 @@ void Renderer::drawBox2D(vec2 center, float width, COLOR4 color) { void Renderer::drawPlane(BSPPLANE& plane, COLOR4 color, vec3 offset) { vec3 ori = plane.vNormal * plane.fDist; - vec3 crossDir = std::abs(plane.vNormal.z) > 0.9f ? vec3(1.0f, 0.0f, 0.0f) : vec3(0.0f, 0.0f, 1.0f); + vec3 crossDir = std::fabs(plane.vNormal.z) > 0.9f ? vec3(1.0f, 0.0f, 0.0f) : vec3(0.0f, 0.0f, 1.0f); vec3 right = crossProduct(plane.vNormal, crossDir); vec3 up = crossProduct(right, plane.vNormal); @@ -3234,7 +3426,7 @@ vec3 Renderer::getAxisDragPoint(vec3 origin) float dots[3]{}; for (int i = 0; i < 3; i++) { - dots[i] = std::abs(dotProduct(cameraForward, axisNormals[i])); + dots[i] = std::fabs(dotProduct(cameraForward, axisNormals[i])); } // best movement planee is most perpindicular to the camera direction @@ -3649,7 +3841,7 @@ bool Renderer::getModelSolid(std::vector& hullVerts, Bsp* map, So int iPlane2 = it2->first; BSPPLANE& p = map->planes[iPlane2]; float dist = dotProduct(midPoint, p.vNormal) - p.fDist; - if (std::abs(dist) < ON_EPSILON) + if (std::fabs(dist) < ON_EPSILON) { edge.planes[planeCount % 2] = iPlane2; planeCount++; @@ -3703,7 +3895,7 @@ void Renderer::scaleSelectedObject(Bsp* map, vec3 dir, const vec3& fromDir, bool if (entIdx.empty() || !SelectedMap) return; - bool scaleFromOrigin = std::abs(fromDir.x) < EPSILON && std::abs(fromDir.y) < EPSILON && std::abs(fromDir.z) < EPSILON; + bool scaleFromOrigin = std::fabs(fromDir.x) < EPSILON && std::fabs(fromDir.y) < EPSILON && std::fabs(fromDir.z) < EPSILON; vec3 minDist(FLT_MAX_COORD, FLT_MAX_COORD, FLT_MAX_COORD); vec3 maxDist(-FLT_MAX_COORD, -FLT_MAX_COORD, -FLT_MAX_COORD); @@ -3838,8 +4030,8 @@ void Renderer::scaleSelectedObject(Bsp* map, vec3 dir, const vec3& fromDir, bool float vsdiff = info.vS.length() - oldinfo.oldS.length(); float vtdiff = info.vT.length() - oldinfo.oldT.length(); - shiftS += (refDist * vsdiff * std::abs(dotS)) * dotSm; - shiftT += (refDist * vtdiff * std::abs(dotT)) * dotTm; + shiftS += (refDist * vsdiff * std::fabs(dotS)) * dotSm; + shiftT += (refDist * vtdiff * std::fabs(dotT)) * dotTm; } info.shiftS = shiftS; @@ -4572,9 +4764,11 @@ void Renderer::goToEnt(Bsp* map, int entIdx) void Renderer::ungrabEnt() { + if (!movingEnt) + return; Bsp* map = SelectedMap; auto pickEnts = pickInfo.selectedEnts; - if (!movingEnt || !map || pickEnts.empty()) + if (!map || pickEnts.empty()) { return; } diff --git a/src/editor/Renderer.h b/src/editor/Renderer.h index f073e3ce..9335089c 100644 --- a/src/editor/Renderer.h +++ b/src/editor/Renderer.h @@ -51,6 +51,19 @@ struct TransformAxes }; extern int current_fps; +extern int ortho_overview; +extern vec3 ortho_mins, ortho_maxs; +extern vec3 ortho_offset; +extern float ortho_near; +extern float ortho_far; +extern float ortho_fov; +extern float ortho_custom_aspect; +extern float ortho_custom_w; +extern float ortho_custom_h; +extern int ortho_tga_w; +extern int ortho_tga_h; +extern bool ortho_save_tga; +extern bool ortho_save_bmp; extern vec2 mousePos; extern vec3 cameraOrigin; @@ -313,6 +326,7 @@ class Renderer bool transformAxisControls(); // true if grabbing axes void applyTransform(Bsp* map, bool forceUpdate = false); void setupView(int forceW = 0, int forceH = 0); + void setupFakeOrthoView(int forceW, int forceH, vec3 bboxMin, vec3 bboxMax); void getPickRay(vec3& start, vec3& pickDir); void revertInvalidSolid(Bsp* map, int modelIdx); diff --git a/src/editor/Settings.cpp b/src/editor/Settings.cpp index f34af578..1f6f1fc2 100644 --- a/src/editor/Settings.cpp +++ b/src/editor/Settings.cpp @@ -626,7 +626,7 @@ void AppSettings::load() else if (key == "MAX_MAP_BOUNDARY") { MAX_MAP_BOUNDARY = str_to_float(val); - if (std::abs(MAX_MAP_BOUNDARY) < 512.0f) + if (std::fabs(MAX_MAP_BOUNDARY) < 512.0f) MAX_MAP_BOUNDARY = 4096; } else if (key == "TEXTURE_STEP") diff --git a/src/filedialog/stb_image.h b/src/filedialog/stb_image.h index aca996a9..9eedabed 100644 --- a/src/filedialog/stb_image.h +++ b/src/filedialog/stb_image.h @@ -1,4 +1,4 @@ -/* stb_image - v2.27 - public domain image loader - http://nothings.org/stb +/* stb_image - v2.30 - public domain image loader - http://nothings.org/stb no warranty implied; use at your own risk Do this: @@ -48,6 +48,9 @@ LICENSE RECENT REVISION HISTORY: + 2.30 (2024-05-31) avoid erroneous gcc warning + 2.29 (2023-05-xx) optimizations + 2.28 (2023-01-29) many error fixes, security errors, just tons of stuff 2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes 2.26 (2020-07-13) many minor fixes 2.25 (2020-02-02) fix warnings @@ -108,7 +111,7 @@ RECENT REVISION HISTORY: Cass Everitt Ryamond Barbiero github:grim210 Paul Du Bois Engin Manap Aldo Culquicondor github:sammyhw Philipp Wiesemann Dale Weiler Oriol Ferrer Mesia github:phprus - Josh Tobin Matthew Gregan github:poppolopoppo + Josh Tobin Neil Bickford Matthew Gregan github:poppolopoppo Julian Raschke Gregory Mullen Christian Floisand github:darealshinji Baldur Karlsson Kevin Schmidt JR Smith github:Michaelangel007 Brad Weinberger Matvey Cherevko github:mosra @@ -140,7 +143,7 @@ RECENT REVISION HISTORY: // // ... x = width, y = height, n = # 8-bit components per pixel ... // // ... replace '0' with '1'..'4' to force that many components per pixel // // ... but 'n' will always be the number that it would have been if you said 0 -// stbi_image_free(data) +// stbi_image_free(data); // // Standard parameters: // int *x -- outputs image width in pixels @@ -635,7 +638,7 @@ STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const ch #endif #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__SYMBIAN32__) typedef unsigned short stbi__uint16; typedef signed short stbi__int16; typedef unsigned int stbi__uint32; @@ -644,8 +647,8 @@ typedef signed int stbi__int32; #include typedef uint16_t stbi__uint16; typedef int16_t stbi__int16; -typedef unsigned int stbi__uint32; -typedef int stbi__int32; +typedef uint32_t stbi__uint32; +typedef int32_t stbi__int32; #endif // should produce compiler error if size is wrong @@ -1063,6 +1066,23 @@ static void *stbi__malloc_mad4(int a, int b, int c, int d, int add) } #endif +// returns 1 if the sum of two signed ints is valid (between -2^31 and 2^31-1 inclusive), 0 on overflow. +static int stbi__addints_valid(int a, int b) +{ + if ((a >= 0) != (b >= 0)) return 1; // a and b have different signs, so no overflow + if (a < 0 && b < 0) return a >= INT_MIN - b; // same as a + b >= INT_MIN; INT_MIN - b cannot overflow since b < 0. + return a <= INT_MAX - b; +} + +// returns 1 if the product of two ints fits in a signed short, 0 on overflow. +static int stbi__mul2shorts_valid(int a, int b) +{ + if (b == 0 || b == -1) return 1; // multiplication by 0 is always 0; check for -1 so SHRT_MIN/b doesn't overflow + if ((a >= 0) == (b >= 0)) return a <= SHRT_MAX/b; // product is positive, so similar to mul2sizes_valid + if (b < 0) return a <= SHRT_MIN / b; // same as a * b >= SHRT_MIN + return a >= SHRT_MIN / b; +} + // stbi__err - error // stbi__errpf - error returning pointer to float // stbi__errpuc - error returning pointer to unsigned char @@ -1985,9 +2005,12 @@ static int stbi__build_huffman(stbi__huffman *h, int *count) int i,j,k=0; unsigned int code; // build size list for each symbol (from JPEG spec) - for (i=0; i < 16; ++i) - for (j=0; j < count[i]; ++j) + for (i=0; i < 16; ++i) { + for (j=0; j < count[i]; ++j) { h->size[k++] = (stbi_uc) (i+1); + if(k >= 257) return stbi__err("bad size list","Corrupt JPEG"); + } + } h->size[k] = 0; // compute actual symbols (from jpeg spec) @@ -2112,6 +2135,8 @@ stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) // convert the huffman code to the symbol id c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; + if(c < 0 || c >= 256) // symbol id out of bounds! + return -1; STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); // convert the id to a symbol @@ -2130,6 +2155,7 @@ stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n) unsigned int k; int sgn; if (j->code_bits < n) stbi__grow_buffer_unsafe(j); + if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative) k = stbi_lrot(j->code_buffer, n); @@ -2144,6 +2170,7 @@ stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) { unsigned int k; if (j->code_bits < n) stbi__grow_buffer_unsafe(j); + if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing k = stbi_lrot(j->code_buffer, n); j->code_buffer = k & ~stbi__bmask[n]; k &= stbi__bmask[n]; @@ -2155,6 +2182,7 @@ stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) { unsigned int k; if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); + if (j->code_bits < 1) return 0; // ran out of bits from stream, return 0s intead of continuing k = j->code_buffer; j->code_buffer <<= 1; --j->code_bits; @@ -2192,8 +2220,10 @@ static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman memset(data,0,64*sizeof(data[0])); diff = t ? stbi__extend_receive(j, t) : 0; + if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta","Corrupt JPEG"); dc = j->img_comp[b].dc_pred + diff; j->img_comp[b].dc_pred = dc; + if (!stbi__mul2shorts_valid(dc, dequant[0])) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); data[0] = (short) (dc * dequant[0]); // decode AC components, see JPEG spec @@ -2207,6 +2237,7 @@ static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman if (r) { // fast-AC path k += (r >> 4) & 15; // run s = r & 15; // combined length + if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available"); j->code_buffer <<= s; j->code_bits -= s; // decode into unzigzag'd location @@ -2246,8 +2277,10 @@ static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__ if (t < 0 || t > 15) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); diff = t ? stbi__extend_receive(j, t) : 0; + if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta", "Corrupt JPEG"); dc = j->img_comp[b].dc_pred + diff; j->img_comp[b].dc_pred = dc; + if (!stbi__mul2shorts_valid(dc, 1 << j->succ_low)) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); data[0] = (short) (dc * (1 << j->succ_low)); } else { // refinement scan for DC coefficient @@ -2282,6 +2315,7 @@ static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__ if (r) { // fast-AC path k += (r >> 4) & 15; // run s = r & 15; // combined length + if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available"); j->code_buffer <<= s; j->code_bits -= s; zig = stbi__jpeg_dezigzag[k++]; @@ -3102,6 +3136,7 @@ static int stbi__process_marker(stbi__jpeg *z, int m) sizes[i] = stbi__get8(z->s); n += sizes[i]; } + if(n > 256) return stbi__err("bad DHT header","Corrupt JPEG"); // Loop over i < n would write past end of values! L -= 17; if (tc == 0) { if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; @@ -3351,6 +3386,28 @@ static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) return 1; } +static stbi_uc stbi__skip_jpeg_junk_at_end(stbi__jpeg *j) +{ + // some JPEGs have junk at end, skip over it but if we find what looks + // like a valid marker, resume there + while (!stbi__at_eof(j->s)) { + stbi_uc x = stbi__get8(j->s); + while (x == 0xff) { // might be a marker + if (stbi__at_eof(j->s)) return STBI__MARKER_none; + x = stbi__get8(j->s); + if (x != 0x00 && x != 0xff) { + // not a stuffed zero or lead-in to another marker, looks + // like an actual marker, return it + return x; + } + // stuffed zero has x=0 now which ends the loop, meaning we go + // back to regular scan loop. + // repeated 0xff keeps trying to read the next byte of the marker. + } + } + return STBI__MARKER_none; +} + // decode image to YCbCr format static int stbi__decode_jpeg_image(stbi__jpeg *j) { @@ -3367,25 +3424,22 @@ static int stbi__decode_jpeg_image(stbi__jpeg *j) if (!stbi__process_scan_header(j)) return 0; if (!stbi__parse_entropy_coded_data(j)) return 0; if (j->marker == STBI__MARKER_none ) { - // handle 0s at the end of image data from IP Kamera 9060 - while (!stbi__at_eof(j->s)) { - int x = stbi__get8(j->s); - if (x == 255) { - j->marker = stbi__get8(j->s); - break; - } - } + j->marker = stbi__skip_jpeg_junk_at_end(j); // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 } + m = stbi__get_marker(j); + if (STBI__RESTART(m)) + m = stbi__get_marker(j); } else if (stbi__DNL(m)) { int Ld = stbi__get16be(j->s); stbi__uint32 NL = stbi__get16be(j->s); if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG"); if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG"); + m = stbi__get_marker(j); } else { - if (!stbi__process_marker(j, m)) return 0; + if (!stbi__process_marker(j, m)) return 1; + m = stbi__get_marker(j); } - m = stbi__get_marker(j); } if (j->progressive) stbi__jpeg_finish(j); @@ -3976,6 +4030,7 @@ static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int re unsigned char* result; stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg)); if (!j) return stbi__errpuc("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); STBI_NOTUSED(ri); j->s = s; stbi__setup_jpeg(j); @@ -3989,6 +4044,7 @@ static int stbi__jpeg_test(stbi__context *s) int r; stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg)); if (!j) return stbi__err("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); j->s = s; stbi__setup_jpeg(j); r = stbi__decode_jpeg_header(j, STBI__SCAN_type); @@ -4014,6 +4070,7 @@ static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) int result; stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg))); if (!j) return stbi__err("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); j->s = s; result = stbi__jpeg_info_raw(j, x, y, comp); STBI_FREE(j); @@ -4121,6 +4178,7 @@ typedef struct { stbi_uc *zbuffer, *zbuffer_end; int num_bits; + int hit_zeof_once; stbi__uint32 code_buffer; char *zout; @@ -4187,9 +4245,20 @@ stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) int b,s; if (a->num_bits < 16) { if (stbi__zeof(a)) { - return -1; /* report error for unexpected end of data. */ + if (!a->hit_zeof_once) { + // This is the first time we hit eof, insert 16 extra padding btis + // to allow us to keep going; if we actually consume any of them + // though, that is invalid data. This is caught later. + a->hit_zeof_once = 1; + a->num_bits += 16; // add 16 implicit zero bits + } else { + // We already inserted our extra 16 padding bits and are again + // out, this stream is actually prematurely terminated. + return -1; + } + } else { + stbi__fill_bits(a); } - stbi__fill_bits(a); } b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; if (b) { @@ -4254,17 +4323,25 @@ static int stbi__parse_huffman_block(stbi__zbuf *a) int len,dist; if (z == 256) { a->zout = zout; + if (a->hit_zeof_once && a->num_bits < 16) { + // The first time we hit zeof, we inserted 16 extra zero bits into our bit + // buffer so the decoder can just do its speculative decoding. But if we + // actually consumed any of those bits (which is the case when num_bits < 16), + // the stream actually read past the end so it is malformed. + return stbi__err("unexpected end","Corrupt PNG"); + } return 1; } + if (z >= 286) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, length codes 286 and 287 must not appear in compressed data z -= 257; len = stbi__zlength_base[z]; if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); z = stbi__zhuffman_decode(a, &a->z_distance); - if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); + if (z < 0 || z >= 30) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, distance codes 30 and 31 must not appear in compressed data dist = stbi__zdist_base[z]; if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); - if (zout + len > a->zout_end) { + if (len > a->zout_end - zout) { if (!stbi__zexpand(a, zout, len)) return 0; zout = a->zout; } @@ -4408,6 +4485,7 @@ static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) if (!stbi__parse_zlib_header(a)) return 0; a->num_bits = 0; a->code_buffer = 0; + a->hit_zeof_once = 0; do { final = stbi__zreceive(a,1); type = stbi__zreceive(a,2); @@ -4563,9 +4641,8 @@ enum { STBI__F_up=2, STBI__F_avg=3, STBI__F_paeth=4, - // synthetic filters used for first scanline to avoid needing a dummy row of 0s - STBI__F_avg_first, - STBI__F_paeth_first + // synthetic filter used for first scanline to avoid needing a dummy row of 0s + STBI__F_avg_first }; static stbi_uc first_row_filter[5] = @@ -4574,29 +4651,56 @@ static stbi_uc first_row_filter[5] = STBI__F_sub, STBI__F_none, STBI__F_avg_first, - STBI__F_paeth_first + STBI__F_sub // Paeth with b=c=0 turns out to be equivalent to sub }; static int stbi__paeth(int a, int b, int c) { - int p = a + b - c; - int pa = abs(p-a); - int pb = abs(p-b); - int pc = abs(p-c); - if (pa <= pb && pa <= pc) return a; - if (pb <= pc) return b; - return c; + // This formulation looks very different from the reference in the PNG spec, but is + // actually equivalent and has favorable data dependencies and admits straightforward + // generation of branch-free code, which helps performance significantly. + int thresh = c*3 - (a + b); + int lo = a < b ? a : b; + int hi = a < b ? b : a; + int t0 = (hi <= thresh) ? lo : c; + int t1 = (thresh <= lo) ? hi : t0; + return t1; } static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 }; +// adds an extra all-255 alpha channel +// dest == src is legal +// img_n must be 1 or 3 +static void stbi__create_png_alpha_expand8(stbi_uc *dest, stbi_uc *src, stbi__uint32 x, int img_n) +{ + int i; + // must process data backwards since we allow dest==src + if (img_n == 1) { + for (i=x-1; i >= 0; --i) { + dest[i*2+1] = 255; + dest[i*2+0] = src[i]; + } + } else { + STBI_ASSERT(img_n == 3); + for (i=x-1; i >= 0; --i) { + dest[i*4+3] = 255; + dest[i*4+2] = src[i*3+2]; + dest[i*4+1] = src[i*3+1]; + dest[i*4+0] = src[i*3+0]; + } + } +} + // create the png data from post-deflated data static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) { - int bytes = (depth == 16? 2 : 1); + int bytes = (depth == 16 ? 2 : 1); stbi__context *s = a->s; stbi__uint32 i,j,stride = x*out_n*bytes; stbi__uint32 img_len, img_width_bytes; + stbi_uc *filter_buf; + int all_ok = 1; int k; int img_n = s->img_n; // copy it into a local for later @@ -4608,8 +4712,11 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into if (!a->out) return stbi__err("outofmem", "Out of memory"); + // note: error exits here don't need to clean up a->out individually, + // stbi__do_png always does on error. if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG"); img_width_bytes = (((img_n * x * depth) + 7) >> 3); + if (!stbi__mad2sizes_valid(img_width_bytes, y, img_width_bytes)) return stbi__err("too large", "Corrupt PNG"); img_len = (img_width_bytes + 1) * y; // we used to check for exact match between raw_len and img_len on non-interlaced PNGs, @@ -4617,189 +4724,137 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r // so just check for raw_len < img_len always. if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG"); + // Allocate two scan lines worth of filter workspace buffer. + filter_buf = (stbi_uc *) stbi__malloc_mad2(img_width_bytes, 2, 0); + if (!filter_buf) return stbi__err("outofmem", "Out of memory"); + + // Filtering for low-bit-depth images + if (depth < 8) { + filter_bytes = 1; + width = img_width_bytes; + } + for (j=0; j < y; ++j) { - stbi_uc *cur = a->out + stride*j; - stbi_uc *prior; + // cur/prior filter buffers alternate + stbi_uc *cur = filter_buf + (j & 1)*img_width_bytes; + stbi_uc *prior = filter_buf + (~j & 1)*img_width_bytes; + stbi_uc *dest = a->out + stride*j; + int nk = width * filter_bytes; int filter = *raw++; - if (filter > 4) - return stbi__err("invalid filter","Corrupt PNG"); - - if (depth < 8) { - if (img_width_bytes > x) return stbi__err("invalid width","Corrupt PNG"); - cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place - filter_bytes = 1; - width = img_width_bytes; + // check filter type + if (filter > 4) { + all_ok = stbi__err("invalid filter","Corrupt PNG"); + break; } - prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above // if first row, use special filter that doesn't sample previous row if (j == 0) filter = first_row_filter[filter]; - // handle first byte explicitly - for (k=0; k < filter_bytes; ++k) { - switch (filter) { - case STBI__F_none : cur[k] = raw[k]; break; - case STBI__F_sub : cur[k] = raw[k]; break; - case STBI__F_up : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; - case STBI__F_avg : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break; - case STBI__F_paeth : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break; - case STBI__F_avg_first : cur[k] = raw[k]; break; - case STBI__F_paeth_first: cur[k] = raw[k]; break; - } - } - - if (depth == 8) { - if (img_n != out_n) - cur[img_n] = 255; // first pixel - raw += img_n; - cur += out_n; - prior += out_n; - } else if (depth == 16) { - if (img_n != out_n) { - cur[filter_bytes] = 255; // first pixel top byte - cur[filter_bytes+1] = 255; // first pixel bottom byte - } - raw += filter_bytes; - cur += output_bytes; - prior += output_bytes; - } else { - raw += 1; - cur += 1; - prior += 1; + // perform actual filtering + switch (filter) { + case STBI__F_none: + memcpy(cur, raw, nk); + break; + case STBI__F_sub: + memcpy(cur, raw, filter_bytes); + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); + break; + case STBI__F_up: + for (k = 0; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + prior[k]); + break; + case STBI__F_avg: + for (k = 0; k < filter_bytes; ++k) + cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); + break; + case STBI__F_paeth: + for (k = 0; k < filter_bytes; ++k) + cur[k] = STBI__BYTECAST(raw[k] + prior[k]); // prior[k] == stbi__paeth(0,prior[k],0) + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes], prior[k], prior[k-filter_bytes])); + break; + case STBI__F_avg_first: + memcpy(cur, raw, filter_bytes); + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); + break; } - // this is a little gross, so that we don't switch per-pixel or per-component - if (depth < 8 || img_n == out_n) { - int nk = (width - 1)*filter_bytes; - #define STBI__CASE(f) \ - case f: \ - for (k=0; k < nk; ++k) - switch (filter) { - // "none" filter turns into a memcpy here; make that explicit. - case STBI__F_none: memcpy(cur, raw, nk); break; - STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); } break; - STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break; - STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); } break; - STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); } break; - STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); } break; - STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); } break; - } - #undef STBI__CASE - raw += nk; - } else { - STBI_ASSERT(img_n+1 == out_n); - #define STBI__CASE(f) \ - case f: \ - for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \ - for (k=0; k < filter_bytes; ++k) - switch (filter) { - STBI__CASE(STBI__F_none) { cur[k] = raw[k]; } break; - STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); } break; - STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break; - STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); } break; - STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); } break; - STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); } break; - STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); } break; - } - #undef STBI__CASE - - // the loop above sets the high byte of the pixels' alpha, but for - // 16 bit png files we also need the low byte set. we'll do that here. - if (depth == 16) { - cur = a->out + stride*j; // start at the beginning of the row again - for (i=0; i < x; ++i,cur+=output_bytes) { - cur[filter_bytes+1] = 255; - } - } - } - } + raw += nk; - // we make a separate pass to expand bits to pixels; for performance, - // this could run two scanlines behind the above code, so it won't - // intefere with filtering but will still be in the cache. - if (depth < 8) { - for (j=0; j < y; ++j) { - stbi_uc *cur = a->out + stride*j; - stbi_uc *in = a->out + stride*j + x*out_n - img_width_bytes; - // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit - // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop + // expand decoded bits in cur to dest, also adding an extra alpha channel if desired + if (depth < 8) { stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range + stbi_uc *in = cur; + stbi_uc *out = dest; + stbi_uc inb = 0; + stbi__uint32 nsmp = x*img_n; - // note that the final byte might overshoot and write more data than desired. - // we can allocate enough data that this never writes out of memory, but it - // could also overwrite the next scanline. can it overwrite non-empty data - // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel. - // so we need to explicitly clamp the final ones - + // expand bits to bytes first if (depth == 4) { - for (k=x*img_n; k >= 2; k-=2, ++in) { - *cur++ = scale * ((*in >> 4) ); - *cur++ = scale * ((*in ) & 0x0f); + for (i=0; i < nsmp; ++i) { + if ((i & 1) == 0) inb = *in++; + *out++ = scale * (inb >> 4); + inb <<= 4; } - if (k > 0) *cur++ = scale * ((*in >> 4) ); } else if (depth == 2) { - for (k=x*img_n; k >= 4; k-=4, ++in) { - *cur++ = scale * ((*in >> 6) ); - *cur++ = scale * ((*in >> 4) & 0x03); - *cur++ = scale * ((*in >> 2) & 0x03); - *cur++ = scale * ((*in ) & 0x03); + for (i=0; i < nsmp; ++i) { + if ((i & 3) == 0) inb = *in++; + *out++ = scale * (inb >> 6); + inb <<= 2; } - if (k > 0) *cur++ = scale * ((*in >> 6) ); - if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03); - if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03); - } else if (depth == 1) { - for (k=x*img_n; k >= 8; k-=8, ++in) { - *cur++ = scale * ((*in >> 7) ); - *cur++ = scale * ((*in >> 6) & 0x01); - *cur++ = scale * ((*in >> 5) & 0x01); - *cur++ = scale * ((*in >> 4) & 0x01); - *cur++ = scale * ((*in >> 3) & 0x01); - *cur++ = scale * ((*in >> 2) & 0x01); - *cur++ = scale * ((*in >> 1) & 0x01); - *cur++ = scale * ((*in ) & 0x01); + } else { + STBI_ASSERT(depth == 1); + for (i=0; i < nsmp; ++i) { + if ((i & 7) == 0) inb = *in++; + *out++ = scale * (inb >> 7); + inb <<= 1; } - if (k > 0) *cur++ = scale * ((*in >> 7) ); - if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01); - if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01); - if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01); - if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01); - if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01); - if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01); } - if (img_n != out_n) { - int q; - // insert alpha = 255 - cur = a->out + stride*j; + + // insert alpha=255 values if desired + if (img_n != out_n) + stbi__create_png_alpha_expand8(dest, dest, x, img_n); + } else if (depth == 8) { + if (img_n == out_n) + memcpy(dest, cur, x*img_n); + else + stbi__create_png_alpha_expand8(dest, cur, x, img_n); + } else if (depth == 16) { + // convert the image data from big-endian to platform-native + stbi__uint16 *dest16 = (stbi__uint16*)dest; + stbi__uint32 nsmp = x*img_n; + + if (img_n == out_n) { + for (i = 0; i < nsmp; ++i, ++dest16, cur += 2) + *dest16 = (cur[0] << 8) | cur[1]; + } else { + STBI_ASSERT(img_n+1 == out_n); if (img_n == 1) { - for (q=x-1; q >= 0; --q) { - cur[q*2+1] = 255; - cur[q*2+0] = cur[q]; + for (i = 0; i < x; ++i, dest16 += 2, cur += 2) { + dest16[0] = (cur[0] << 8) | cur[1]; + dest16[1] = 0xffff; } } else { STBI_ASSERT(img_n == 3); - for (q=x-1; q >= 0; --q) { - cur[q*4+3] = 255; - cur[q*4+2] = cur[q*3+2]; - cur[q*4+1] = cur[q*3+1]; - cur[q*4+0] = cur[q*3+0]; + for (i = 0; i < x; ++i, dest16 += 4, cur += 6) { + dest16[0] = (cur[0] << 8) | cur[1]; + dest16[1] = (cur[2] << 8) | cur[3]; + dest16[2] = (cur[4] << 8) | cur[5]; + dest16[3] = 0xffff; } } } } - } else if (depth == 16) { - // force the image data from big-endian to platform-native. - // this is done in a separate pass due to the decoding relying - // on the data being untouched, but could probably be done - // per-line during decode if care is taken. - stbi_uc *cur = a->out; - stbi__uint16 *cur16 = (stbi__uint16*)cur; - - for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) { - *cur16 = (cur[0] << 8) | cur[1]; - } } + STBI_FREE(filter_buf); + if (!all_ok) return 0; + return 1; } @@ -4955,7 +5010,7 @@ STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) static STBI_THREAD_LOCAL int stbi__unpremultiply_on_load_local, stbi__unpremultiply_on_load_set; static STBI_THREAD_LOCAL int stbi__de_iphone_flag_local, stbi__de_iphone_flag_set; -STBIDEF void stbi__unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply) +STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply) { stbi__unpremultiply_on_load_local = flag_true_if_should_unpremultiply; stbi__unpremultiply_on_load_set = 1; @@ -5064,14 +5119,13 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) if (!pal_img_n) { s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); - if (scan == STBI__SCAN_header) return 1; } else { // if paletted, then pal_n is our final components, and // img_n is # components to decompress/filter. s->img_n = 1; if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); - // if SCAN_header, have to scan to see if we have a tRNS } + // even with SCAN_header, have to scan to see if we have a tRNS break; } @@ -5103,10 +5157,14 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); has_trans = 1; + // non-paletted with tRNS = constant alpha. if header-scanning, we can stop now. + if (scan == STBI__SCAN_header) { ++s->img_n; return 1; } if (z->depth == 16) { - for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is + for (k = 0; k < s->img_n && k < 3; ++k) // extra loop test to suppress false GCC warning + tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is } else { - for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger + for (k = 0; k < s->img_n && k < 3; ++k) + tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger } } break; @@ -5115,7 +5173,13 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) case STBI__PNG_TYPE('I','D','A','T'): { if (first) return stbi__err("first not IHDR", "Corrupt PNG"); if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); - if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; } + if (scan == STBI__SCAN_header) { + // header scan definitely stops at first IDAT + if (pal_img_n) + s->img_n = pal_img_n; + return 1; + } + if (c.length > (1u << 30)) return stbi__err("IDAT size limit", "IDAT section larger than 2^30 bytes"); if ((int)(ioff + c.length) < (int)ioff) return 0; if (ioff + c.length > idata_limit) { stbi__uint32 idata_limit_old = idata_limit; @@ -5498,8 +5562,22 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req psize = (info.offset - info.extra_read - info.hsz) >> 2; } if (psize == 0) { - if (info.offset != s->callback_already_read + (s->img_buffer - s->img_buffer_original)) { - return stbi__errpuc("bad offset", "Corrupt BMP"); + // accept some number of extra bytes after the header, but if the offset points either to before + // the header ends or implies a large amount of extra data, reject the file as malformed + int bytes_read_so_far = s->callback_already_read + (int)(s->img_buffer - s->img_buffer_original); + int header_limit = 1024; // max we actually read is below 256 bytes currently. + int extra_data_limit = 256*4; // what ordinarily goes here is a palette; 256 entries*4 bytes is its max size. + if (bytes_read_so_far <= 0 || bytes_read_so_far > header_limit) { + return stbi__errpuc("bad header", "Corrupt BMP"); + } + // we established that bytes_read_so_far is positive and sensible. + // the first half of this test rejects offsets that are either too small positives, or + // negative, and guarantees that info.offset >= bytes_read_so_far > 0. this in turn + // ensures the number computed in the second half of the test can't overflow. + if (info.offset < bytes_read_so_far || info.offset - bytes_read_so_far > extra_data_limit) { + return stbi__errpuc("bad offset", "Corrupt BMP"); + } else { + stbi__skip(s, info.offset - bytes_read_so_far); } } @@ -7187,12 +7265,12 @@ static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int re // Run value = stbi__get8(s); count -= 128; - if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } + if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } for (z = 0; z < count; ++z) scanline[i++ * 4 + k] = value; } else { // Dump - if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } + if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } for (z = 0; z < count; ++z) scanline[i++ * 4 + k] = stbi__get8(s); } @@ -7446,10 +7524,17 @@ static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req out = (stbi_uc *) stbi__malloc_mad4(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0); if (!out) return stbi__errpuc("outofmem", "Out of memory"); - stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8)); + if (!stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8))) { + STBI_FREE(out); + return stbi__errpuc("bad PNM", "PNM file truncated"); + } if (req_comp && req_comp != s->img_n) { - out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); + if (ri->bits_per_channel == 16) { + out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, s->img_n, req_comp, s->img_x, s->img_y); + } else { + out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); + } if (out == NULL) return out; // stbi__convert_format frees input on failure } return out; @@ -7486,6 +7571,8 @@ static int stbi__pnm_getinteger(stbi__context *s, char *c) while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { value = value*10 + (*c - '0'); *c = (char) stbi__get8(s); + if((value > 214748364) || (value == 214748364 && *c > '7')) + return stbi__err("integer parse overflow", "Parsing an integer in the PPM header overflowed a 32-bit int"); } return value; @@ -7516,9 +7603,13 @@ static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) stbi__pnm_skip_whitespace(s, &c); *x = stbi__pnm_getinteger(s, &c); // read width + if(*x == 0) + return stbi__err("invalid width", "PPM image header had zero or overflowing width"); stbi__pnm_skip_whitespace(s, &c); *y = stbi__pnm_getinteger(s, &c); // read height + if (*y == 0) + return stbi__err("invalid width", "PPM image header had zero or overflowing width"); stbi__pnm_skip_whitespace(s, &c); maxv = stbi__pnm_getinteger(s, &c); // read max value diff --git a/src/filedialog/stb_image_write.h b/src/filedialog/stb_image_write.h new file mode 100644 index 00000000..e4b32ed1 --- /dev/null +++ b/src/filedialog/stb_image_write.h @@ -0,0 +1,1724 @@ +/* stb_image_write - v1.16 - public domain - http://nothings.org/stb + writes out PNG/BMP/TGA/JPEG/HDR images to C stdio - Sean Barrett 2010-2015 + no warranty implied; use at your own risk + + Before #including, + + #define STB_IMAGE_WRITE_IMPLEMENTATION + + in the file that you want to have the implementation. + + Will probably not work correctly with strict-aliasing optimizations. + +ABOUT: + + This header file is a library for writing images to C stdio or a callback. + + The PNG output is not optimal; it is 20-50% larger than the file + written by a decent optimizing implementation; though providing a custom + zlib compress function (see STBIW_ZLIB_COMPRESS) can mitigate that. + This library is designed for source code compactness and simplicity, + not optimal image file size or run-time performance. + +BUILDING: + + You can #define STBIW_ASSERT(x) before the #include to avoid using assert.h. + You can #define STBIW_MALLOC(), STBIW_REALLOC(), and STBIW_FREE() to replace + malloc,realloc,free. + You can #define STBIW_MEMMOVE() to replace memmove() + You can #define STBIW_ZLIB_COMPRESS to use a custom zlib-style compress function + for PNG compression (instead of the builtin one), it must have the following signature: + unsigned char * my_compress(unsigned char *data, int data_len, int *out_len, int quality); + The returned data will be freed with STBIW_FREE() (free() by default), + so it must be heap allocated with STBIW_MALLOC() (malloc() by default), + +UNICODE: + + If compiling for Windows and you wish to use Unicode filenames, compile + with + #define STBIW_WINDOWS_UTF8 + and pass utf8-encoded filenames. Call stbiw_convert_wchar_to_utf8 to convert + Windows wchar_t filenames to utf8. + +USAGE: + + There are five functions, one for each image file format: + + int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes); + int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data); + int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data); + int stbi_write_jpg(char const *filename, int w, int h, int comp, const void *data, int quality); + int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data); + + void stbi_flip_vertically_on_write(int flag); // flag is non-zero to flip data vertically + + There are also five equivalent functions that use an arbitrary write function. You are + expected to open/close your file-equivalent before and after calling these: + + int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data, int stride_in_bytes); + int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); + int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); + int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const float *data); + int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality); + + where the callback is: + void stbi_write_func(void *context, void *data, int size); + + You can configure it with these global variables: + int stbi_write_tga_with_rle; // defaults to true; set to 0 to disable RLE + int stbi_write_png_compression_level; // defaults to 8; set to higher for more compression + int stbi_write_force_png_filter; // defaults to -1; set to 0..5 to force a filter mode + + + You can define STBI_WRITE_NO_STDIO to disable the file variant of these + functions, so the library will not use stdio.h at all. However, this will + also disable HDR writing, because it requires stdio for formatted output. + + Each function returns 0 on failure and non-0 on success. + + The functions create an image file defined by the parameters. The image + is a rectangle of pixels stored from left-to-right, top-to-bottom. + Each pixel contains 'comp' channels of data stored interleaved with 8-bits + per channel, in the following order: 1=Y, 2=YA, 3=RGB, 4=RGBA. (Y is + monochrome color.) The rectangle is 'w' pixels wide and 'h' pixels tall. + The *data pointer points to the first byte of the top-left-most pixel. + For PNG, "stride_in_bytes" is the distance in bytes from the first byte of + a row of pixels to the first byte of the next row of pixels. + + PNG creates output files with the same number of components as the input. + The BMP format expands Y to RGB in the file format and does not + output alpha. + + PNG supports writing rectangles of data even when the bytes storing rows of + data are not consecutive in memory (e.g. sub-rectangles of a larger image), + by supplying the stride between the beginning of adjacent rows. The other + formats do not. (Thus you cannot write a native-format BMP through the BMP + writer, both because it is in BGR order and because it may have padding + at the end of the line.) + + PNG allows you to set the deflate compression level by setting the global + variable 'stbi_write_png_compression_level' (it defaults to 8). + + HDR expects linear float data. Since the format is always 32-bit rgb(e) + data, alpha (if provided) is discarded, and for monochrome data it is + replicated across all three channels. + + TGA supports RLE or non-RLE compressed data. To use non-RLE-compressed + data, set the global variable 'stbi_write_tga_with_rle' to 0. + + JPEG does ignore alpha channels in input data; quality is between 1 and 100. + Higher quality looks better but results in a bigger image. + JPEG baseline (no JPEG progressive). + +CREDITS: + + + Sean Barrett - PNG/BMP/TGA + Baldur Karlsson - HDR + Jean-Sebastien Guay - TGA monochrome + Tim Kelsey - misc enhancements + Alan Hickman - TGA RLE + Emmanuel Julien - initial file IO callback implementation + Jon Olick - original jo_jpeg.cpp code + Daniel Gibson - integrate JPEG, allow external zlib + Aarni Koskela - allow choosing PNG filter + + bugfixes: + github:Chribba + Guillaume Chereau + github:jry2 + github:romigrou + Sergio Gonzalez + Jonas Karlsson + Filip Wasil + Thatcher Ulrich + github:poppolopoppo + Patrick Boettcher + github:xeekworx + Cap Petschulat + Simon Rodriguez + Ivan Tikhonov + github:ignotion + Adam Schackart + Andrew Kensler + +LICENSE + + See end of file for license information. + +*/ + +#ifndef INCLUDE_STB_IMAGE_WRITE_H +#define INCLUDE_STB_IMAGE_WRITE_H + +#include + +// if STB_IMAGE_WRITE_STATIC causes problems, try defining STBIWDEF to 'inline' or 'static inline' +#ifndef STBIWDEF +#ifdef STB_IMAGE_WRITE_STATIC +#define STBIWDEF static +#else +#ifdef __cplusplus +#define STBIWDEF extern "C" +#else +#define STBIWDEF extern +#endif +#endif +#endif + +#ifndef STB_IMAGE_WRITE_STATIC // C++ forbids static forward declarations +STBIWDEF int stbi_write_tga_with_rle; +STBIWDEF int stbi_write_png_compression_level; +STBIWDEF int stbi_write_force_png_filter; +#endif + +#ifndef STBI_WRITE_NO_STDIO +STBIWDEF int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes); +STBIWDEF int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data); +STBIWDEF int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data); +STBIWDEF int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data); +STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality); + +#ifdef STBIW_WINDOWS_UTF8 +STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input); +#endif +#endif + +typedef void stbi_write_func(void *context, void *data, int size); + +STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data, int stride_in_bytes); +STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); +STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); +STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const float *data); +STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality); + +STBIWDEF void stbi_flip_vertically_on_write(int flip_boolean); + +#endif//INCLUDE_STB_IMAGE_WRITE_H + +#ifdef STB_IMAGE_WRITE_IMPLEMENTATION + +#ifdef _WIN32 + #ifndef _CRT_SECURE_NO_WARNINGS + #define _CRT_SECURE_NO_WARNINGS + #endif + #ifndef _CRT_NONSTDC_NO_DEPRECATE + #define _CRT_NONSTDC_NO_DEPRECATE + #endif +#endif + +#ifndef STBI_WRITE_NO_STDIO +#include +#endif // STBI_WRITE_NO_STDIO + +#include +#include +#include +#include + +#if defined(STBIW_MALLOC) && defined(STBIW_FREE) && (defined(STBIW_REALLOC) || defined(STBIW_REALLOC_SIZED)) +// ok +#elif !defined(STBIW_MALLOC) && !defined(STBIW_FREE) && !defined(STBIW_REALLOC) && !defined(STBIW_REALLOC_SIZED) +// ok +#else +#error "Must define all or none of STBIW_MALLOC, STBIW_FREE, and STBIW_REALLOC (or STBIW_REALLOC_SIZED)." +#endif + +#ifndef STBIW_MALLOC +#define STBIW_MALLOC(sz) malloc(sz) +#define STBIW_REALLOC(p,newsz) realloc(p,newsz) +#define STBIW_FREE(p) free(p) +#endif + +#ifndef STBIW_REALLOC_SIZED +#define STBIW_REALLOC_SIZED(p,oldsz,newsz) STBIW_REALLOC(p,newsz) +#endif + + +#ifndef STBIW_MEMMOVE +#define STBIW_MEMMOVE(a,b,sz) memmove(a,b,sz) +#endif + + +#ifndef STBIW_ASSERT +#include +#define STBIW_ASSERT(x) assert(x) +#endif + +#define STBIW_UCHAR(x) (unsigned char) ((x) & 0xff) + +#ifdef STB_IMAGE_WRITE_STATIC +static int stbi_write_png_compression_level = 8; +static int stbi_write_tga_with_rle = 1; +static int stbi_write_force_png_filter = -1; +#else +int stbi_write_png_compression_level = 8; +int stbi_write_tga_with_rle = 1; +int stbi_write_force_png_filter = -1; +#endif + +static int stbi__flip_vertically_on_write = 0; + +STBIWDEF void stbi_flip_vertically_on_write(int flag) +{ + stbi__flip_vertically_on_write = flag; +} + +typedef struct +{ + stbi_write_func *func; + void *context; + unsigned char buffer[64]; + int buf_used; +} stbi__write_context; + +// initialize a callback-based context +static void stbi__start_write_callbacks(stbi__write_context *s, stbi_write_func *c, void *context) +{ + s->func = c; + s->context = context; +} + +#ifndef STBI_WRITE_NO_STDIO + +static void stbi__stdio_write(void *context, void *data, int size) +{ + fwrite(data,1,size,(FILE*) context); +} + +#if defined(_WIN32) && defined(STBIW_WINDOWS_UTF8) +#ifdef __cplusplus +#define STBIW_EXTERN extern "C" +#else +#define STBIW_EXTERN extern +#endif +STBIW_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide); +STBIW_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); + +STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input) +{ + return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL); +} +#endif + +static FILE *stbiw__fopen(char const *filename, char const *mode) +{ + FILE *f; +#if defined(_WIN32) && defined(STBIW_WINDOWS_UTF8) + wchar_t wMode[64]; + wchar_t wFilename[1024]; + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename))) + return 0; + + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode))) + return 0; + +#if defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != _wfopen_s(&f, wFilename, wMode)) + f = 0; +#else + f = _wfopen(wFilename, wMode); +#endif + +#elif defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != fopen_s(&f, filename, mode)) + f=0; +#else + f = fopen(filename, mode); +#endif + return f; +} + +static int stbi__start_write_file(stbi__write_context *s, const char *filename) +{ + FILE *f = stbiw__fopen(filename, "wb"); + stbi__start_write_callbacks(s, stbi__stdio_write, (void *) f); + return f != NULL; +} + +static void stbi__end_write_file(stbi__write_context *s) +{ + fclose((FILE *)s->context); +} + +#endif // !STBI_WRITE_NO_STDIO + +typedef unsigned int stbiw_uint32; +typedef int stb_image_write_test[sizeof(stbiw_uint32)==4 ? 1 : -1]; + +static void stbiw__writefv(stbi__write_context *s, const char *fmt, va_list v) +{ + while (*fmt) { + switch (*fmt++) { + case ' ': break; + case '1': { unsigned char x = STBIW_UCHAR(va_arg(v, int)); + s->func(s->context,&x,1); + break; } + case '2': { int x = va_arg(v,int); + unsigned char b[2]; + b[0] = STBIW_UCHAR(x); + b[1] = STBIW_UCHAR(x>>8); + s->func(s->context,b,2); + break; } + case '4': { stbiw_uint32 x = va_arg(v,int); + unsigned char b[4]; + b[0]=STBIW_UCHAR(x); + b[1]=STBIW_UCHAR(x>>8); + b[2]=STBIW_UCHAR(x>>16); + b[3]=STBIW_UCHAR(x>>24); + s->func(s->context,b,4); + break; } + default: + STBIW_ASSERT(0); + return; + } + } +} + +static void stbiw__writef(stbi__write_context *s, const char *fmt, ...) +{ + va_list v; + va_start(v, fmt); + stbiw__writefv(s, fmt, v); + va_end(v); +} + +static void stbiw__write_flush(stbi__write_context *s) +{ + if (s->buf_used) { + s->func(s->context, &s->buffer, s->buf_used); + s->buf_used = 0; + } +} + +static void stbiw__putc(stbi__write_context *s, unsigned char c) +{ + s->func(s->context, &c, 1); +} + +static void stbiw__write1(stbi__write_context *s, unsigned char a) +{ + if ((size_t)s->buf_used + 1 > sizeof(s->buffer)) + stbiw__write_flush(s); + s->buffer[s->buf_used++] = a; +} + +static void stbiw__write3(stbi__write_context *s, unsigned char a, unsigned char b, unsigned char c) +{ + int n; + if ((size_t)s->buf_used + 3 > sizeof(s->buffer)) + stbiw__write_flush(s); + n = s->buf_used; + s->buf_used = n+3; + s->buffer[n+0] = a; + s->buffer[n+1] = b; + s->buffer[n+2] = c; +} + +static void stbiw__write_pixel(stbi__write_context *s, int rgb_dir, int comp, int write_alpha, int expand_mono, unsigned char *d) +{ + unsigned char bg[3] = { 255, 0, 255}, px[3]; + int k; + + if (write_alpha < 0) + stbiw__write1(s, d[comp - 1]); + + switch (comp) { + case 2: // 2 pixels = mono + alpha, alpha is written separately, so same as 1-channel case + case 1: + if (expand_mono) + stbiw__write3(s, d[0], d[0], d[0]); // monochrome bmp + else + stbiw__write1(s, d[0]); // monochrome TGA + break; + case 4: + if (!write_alpha) { + // composite against pink background + for (k = 0; k < 3; ++k) + px[k] = bg[k] + ((d[k] - bg[k]) * d[3]) / 255; + stbiw__write3(s, px[1 - rgb_dir], px[1], px[1 + rgb_dir]); + break; + } + /* FALLTHROUGH */ + case 3: + stbiw__write3(s, d[1 - rgb_dir], d[1], d[1 + rgb_dir]); + break; + } + if (write_alpha > 0) + stbiw__write1(s, d[comp - 1]); +} + +static void stbiw__write_pixels(stbi__write_context *s, int rgb_dir, int vdir, int x, int y, int comp, void *data, int write_alpha, int scanline_pad, int expand_mono) +{ + stbiw_uint32 zero = 0; + int i,j, j_end; + + if (y <= 0) + return; + + if (stbi__flip_vertically_on_write) + vdir *= -1; + + if (vdir < 0) { + j_end = -1; j = y-1; + } else { + j_end = y; j = 0; + } + + for (; j != j_end; j += vdir) { + for (i=0; i < x; ++i) { + unsigned char *d = (unsigned char *) data + (j*x+i)*comp; + stbiw__write_pixel(s, rgb_dir, comp, write_alpha, expand_mono, d); + } + stbiw__write_flush(s); + s->func(s->context, &zero, scanline_pad); + } +} + +static int stbiw__outfile(stbi__write_context *s, int rgb_dir, int vdir, int x, int y, int comp, int expand_mono, void *data, int alpha, int pad, const char *fmt, ...) +{ + if (y < 0 || x < 0) { + return 0; + } else { + va_list v; + va_start(v, fmt); + stbiw__writefv(s, fmt, v); + va_end(v); + stbiw__write_pixels(s,rgb_dir,vdir,x,y,comp,data,alpha,pad, expand_mono); + return 1; + } +} + +static int stbi_write_bmp_core(stbi__write_context *s, int x, int y, int comp, const void *data) +{ + if (comp != 4) { + // write RGB bitmap + int pad = (-x*3) & 3; + return stbiw__outfile(s,-1,-1,x,y,comp,1,(void *) data,0,pad, + "11 4 22 4" "4 44 22 444444", + 'B', 'M', 14+40+(x*3+pad)*y, 0,0, 14+40, // file header + 40, x,y, 1,24, 0,0,0,0,0,0); // bitmap header + } else { + // RGBA bitmaps need a v4 header + // use BI_BITFIELDS mode with 32bpp and alpha mask + // (straight BI_RGB with alpha mask doesn't work in most readers) + return stbiw__outfile(s,-1,-1,x,y,comp,1,(void *)data,1,0, + "11 4 22 4" "4 44 22 444444 4444 4 444 444 444 444", + 'B', 'M', 14+108+x*y*4, 0, 0, 14+108, // file header + 108, x,y, 1,32, 3,0,0,0,0,0, 0xff0000,0xff00,0xff,0xff000000u, 0, 0,0,0, 0,0,0, 0,0,0, 0,0,0); // bitmap V4 header + } +} + +STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data) +{ + stbi__write_context s = { 0 }; + stbi__start_write_callbacks(&s, func, context); + return stbi_write_bmp_core(&s, x, y, comp, data); +} + +#ifndef STBI_WRITE_NO_STDIO +STBIWDEF int stbi_write_bmp(char const *filename, int x, int y, int comp, const void *data) +{ + stbi__write_context s = { 0 }; + if (stbi__start_write_file(&s,filename)) { + int r = stbi_write_bmp_core(&s, x, y, comp, data); + stbi__end_write_file(&s); + return r; + } else + return 0; +} +#endif //!STBI_WRITE_NO_STDIO + +static int stbi_write_tga_core(stbi__write_context *s, int x, int y, int comp, void *data) +{ + int has_alpha = (comp == 2 || comp == 4); + int colorbytes = has_alpha ? comp-1 : comp; + int format = colorbytes < 2 ? 3 : 2; // 3 color channels (RGB/RGBA) = 2, 1 color channel (Y/YA) = 3 + + if (y < 0 || x < 0) + return 0; + + if (!stbi_write_tga_with_rle) { + return stbiw__outfile(s, -1, -1, x, y, comp, 0, (void *) data, has_alpha, 0, + "111 221 2222 11", 0, 0, format, 0, 0, 0, 0, 0, x, y, (colorbytes + has_alpha) * 8, has_alpha * 8); + } else { + int i,j,k; + int jend, jdir; + + stbiw__writef(s, "111 221 2222 11", 0,0,format+8, 0,0,0, 0,0,x,y, (colorbytes + has_alpha) * 8, has_alpha * 8); + + if (stbi__flip_vertically_on_write) { + j = 0; + jend = y; + jdir = 1; + } else { + j = y-1; + jend = -1; + jdir = -1; + } + for (; j != jend; j += jdir) { + unsigned char *row = (unsigned char *) data + j * x * comp; + int len; + + for (i = 0; i < x; i += len) { + unsigned char *begin = row + i * comp; + int diff = 1; + len = 1; + + if (i < x - 1) { + ++len; + diff = memcmp(begin, row + (i + 1) * comp, comp); + if (diff) { + const unsigned char *prev = begin; + for (k = i + 2; k < x && len < 128; ++k) { + if (memcmp(prev, row + k * comp, comp)) { + prev += comp; + ++len; + } else { + --len; + break; + } + } + } else { + for (k = i + 2; k < x && len < 128; ++k) { + if (!memcmp(begin, row + k * comp, comp)) { + ++len; + } else { + break; + } + } + } + } + + if (diff) { + unsigned char header = STBIW_UCHAR(len - 1); + stbiw__write1(s, header); + for (k = 0; k < len; ++k) { + stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin + k * comp); + } + } else { + unsigned char header = STBIW_UCHAR(len - 129); + stbiw__write1(s, header); + stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin); + } + } + } + stbiw__write_flush(s); + } + return 1; +} + +STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data) +{ + stbi__write_context s = { 0 }; + stbi__start_write_callbacks(&s, func, context); + return stbi_write_tga_core(&s, x, y, comp, (void *) data); +} + +#ifndef STBI_WRITE_NO_STDIO +STBIWDEF int stbi_write_tga(char const *filename, int x, int y, int comp, const void *data) +{ + stbi__write_context s = { 0 }; + if (stbi__start_write_file(&s,filename)) { + int r = stbi_write_tga_core(&s, x, y, comp, (void *) data); + stbi__end_write_file(&s); + return r; + } else + return 0; +} +#endif + +// ************************************************************************************************* +// Radiance RGBE HDR writer +// by Baldur Karlsson + +#define stbiw__max(a, b) ((a) > (b) ? (a) : (b)) + +#ifndef STBI_WRITE_NO_STDIO + +static void stbiw__linear_to_rgbe(unsigned char *rgbe, float *linear) +{ + int exponent; + float maxcomp = stbiw__max(linear[0], stbiw__max(linear[1], linear[2])); + + if (maxcomp < 1e-32f) { + rgbe[0] = rgbe[1] = rgbe[2] = rgbe[3] = 0; + } else { + float normalize = (float) frexp(maxcomp, &exponent) * 256.0f/maxcomp; + + rgbe[0] = (unsigned char)(linear[0] * normalize); + rgbe[1] = (unsigned char)(linear[1] * normalize); + rgbe[2] = (unsigned char)(linear[2] * normalize); + rgbe[3] = (unsigned char)(exponent + 128); + } +} + +static void stbiw__write_run_data(stbi__write_context *s, int length, unsigned char databyte) +{ + unsigned char lengthbyte = STBIW_UCHAR(length+128); + STBIW_ASSERT(length+128 <= 255); + s->func(s->context, &lengthbyte, 1); + s->func(s->context, &databyte, 1); +} + +static void stbiw__write_dump_data(stbi__write_context *s, int length, unsigned char *data) +{ + unsigned char lengthbyte = STBIW_UCHAR(length); + STBIW_ASSERT(length <= 128); // inconsistent with spec but consistent with official code + s->func(s->context, &lengthbyte, 1); + s->func(s->context, data, length); +} + +static void stbiw__write_hdr_scanline(stbi__write_context *s, int width, int ncomp, unsigned char *scratch, float *scanline) +{ + unsigned char scanlineheader[4] = { 2, 2, 0, 0 }; + unsigned char rgbe[4]; + float linear[3]; + int x; + + scanlineheader[2] = (width&0xff00)>>8; + scanlineheader[3] = (width&0x00ff); + + /* skip RLE for images too small or large */ + if (width < 8 || width >= 32768) { + for (x=0; x < width; x++) { + switch (ncomp) { + case 4: /* fallthrough */ + case 3: linear[2] = scanline[x*ncomp + 2]; + linear[1] = scanline[x*ncomp + 1]; + linear[0] = scanline[x*ncomp + 0]; + break; + default: + linear[0] = linear[1] = linear[2] = scanline[x*ncomp + 0]; + break; + } + stbiw__linear_to_rgbe(rgbe, linear); + s->func(s->context, rgbe, 4); + } + } else { + int c,r; + /* encode into scratch buffer */ + for (x=0; x < width; x++) { + switch(ncomp) { + case 4: /* fallthrough */ + case 3: linear[2] = scanline[x*ncomp + 2]; + linear[1] = scanline[x*ncomp + 1]; + linear[0] = scanline[x*ncomp + 0]; + break; + default: + linear[0] = linear[1] = linear[2] = scanline[x*ncomp + 0]; + break; + } + stbiw__linear_to_rgbe(rgbe, linear); + scratch[x + width*0] = rgbe[0]; + scratch[x + width*1] = rgbe[1]; + scratch[x + width*2] = rgbe[2]; + scratch[x + width*3] = rgbe[3]; + } + + s->func(s->context, scanlineheader, 4); + + /* RLE each component separately */ + for (c=0; c < 4; c++) { + unsigned char *comp = &scratch[width*c]; + + x = 0; + while (x < width) { + // find first run + r = x; + while (r+2 < width) { + if (comp[r] == comp[r+1] && comp[r] == comp[r+2]) + break; + ++r; + } + if (r+2 >= width) + r = width; + // dump up to first run + while (x < r) { + int len = r-x; + if (len > 128) len = 128; + stbiw__write_dump_data(s, len, &comp[x]); + x += len; + } + // if there's a run, output it + if (r+2 < width) { // same test as what we break out of in search loop, so only true if we break'd + // find next byte after run + while (r < width && comp[r] == comp[x]) + ++r; + // output run up to r + while (x < r) { + int len = r-x; + if (len > 127) len = 127; + stbiw__write_run_data(s, len, comp[x]); + x += len; + } + } + } + } + } +} + +static int stbi_write_hdr_core(stbi__write_context *s, int x, int y, int comp, float *data) +{ + if (y <= 0 || x <= 0 || data == NULL) + return 0; + else { + // Each component is stored separately. Allocate scratch space for full output scanline. + unsigned char *scratch = (unsigned char *) STBIW_MALLOC(x*4); + int i, len; + char buffer[128]; + char header[] = "#?RADIANCE\n# Written by stb_image_write.h\nFORMAT=32-bit_rle_rgbe\n"; + s->func(s->context, header, sizeof(header)-1); + +#ifdef __STDC_LIB_EXT1__ + len = sprintf_s(buffer, sizeof(buffer), "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x); +#else + len = sprintf(buffer, "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x); +#endif + s->func(s->context, buffer, len); + + for(i=0; i < y; i++) + stbiw__write_hdr_scanline(s, x, comp, scratch, data + comp*x*(stbi__flip_vertically_on_write ? y-1-i : i)); + STBIW_FREE(scratch); + return 1; + } +} + +STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const float *data) +{ + stbi__write_context s = { 0 }; + stbi__start_write_callbacks(&s, func, context); + return stbi_write_hdr_core(&s, x, y, comp, (float *) data); +} + +STBIWDEF int stbi_write_hdr(char const *filename, int x, int y, int comp, const float *data) +{ + stbi__write_context s = { 0 }; + if (stbi__start_write_file(&s,filename)) { + int r = stbi_write_hdr_core(&s, x, y, comp, (float *) data); + stbi__end_write_file(&s); + return r; + } else + return 0; +} +#endif // STBI_WRITE_NO_STDIO + + +////////////////////////////////////////////////////////////////////////////// +// +// PNG writer +// + +#ifndef STBIW_ZLIB_COMPRESS +// stretchy buffer; stbiw__sbpush() == vector<>::push_back() -- stbiw__sbcount() == vector<>::size() +#define stbiw__sbraw(a) ((int *) (void *) (a) - 2) +#define stbiw__sbm(a) stbiw__sbraw(a)[0] +#define stbiw__sbn(a) stbiw__sbraw(a)[1] + +#define stbiw__sbneedgrow(a,n) ((a)==0 || stbiw__sbn(a)+n >= stbiw__sbm(a)) +#define stbiw__sbmaybegrow(a,n) (stbiw__sbneedgrow(a,(n)) ? stbiw__sbgrow(a,n) : 0) +#define stbiw__sbgrow(a,n) stbiw__sbgrowf((void **) &(a), (n), sizeof(*(a))) + +#define stbiw__sbpush(a, v) (stbiw__sbmaybegrow(a,1), (a)[stbiw__sbn(a)++] = (v)) +#define stbiw__sbcount(a) ((a) ? stbiw__sbn(a) : 0) +#define stbiw__sbfree(a) ((a) ? STBIW_FREE(stbiw__sbraw(a)),0 : 0) + +static void *stbiw__sbgrowf(void **arr, int increment, int itemsize) +{ + int m = *arr ? 2*stbiw__sbm(*arr)+increment : increment+1; + void *p = STBIW_REALLOC_SIZED(*arr ? stbiw__sbraw(*arr) : 0, *arr ? (stbiw__sbm(*arr)*itemsize + sizeof(int)*2) : 0, itemsize * m + sizeof(int)*2); + STBIW_ASSERT(p); + if (p) { + if (!*arr) ((int *) p)[1] = 0; + *arr = (void *) ((int *) p + 2); + stbiw__sbm(*arr) = m; + } + return *arr; +} + +static unsigned char *stbiw__zlib_flushf(unsigned char *data, unsigned int *bitbuffer, int *bitcount) +{ + while (*bitcount >= 8) { + stbiw__sbpush(data, STBIW_UCHAR(*bitbuffer)); + *bitbuffer >>= 8; + *bitcount -= 8; + } + return data; +} + +static int stbiw__zlib_bitrev(int code, int codebits) +{ + int res=0; + while (codebits--) { + res = (res << 1) | (code & 1); + code >>= 1; + } + return res; +} + +static unsigned int stbiw__zlib_countm(unsigned char *a, unsigned char *b, int limit) +{ + int i; + for (i=0; i < limit && i < 258; ++i) + if (a[i] != b[i]) break; + return i; +} + +static unsigned int stbiw__zhash(unsigned char *data) +{ + stbiw_uint32 hash = data[0] + (data[1] << 8) + (data[2] << 16); + hash ^= hash << 3; + hash += hash >> 5; + hash ^= hash << 4; + hash += hash >> 17; + hash ^= hash << 25; + hash += hash >> 6; + return hash; +} + +#define stbiw__zlib_flush() (out = stbiw__zlib_flushf(out, &bitbuf, &bitcount)) +#define stbiw__zlib_add(code,codebits) \ + (bitbuf |= (code) << bitcount, bitcount += (codebits), stbiw__zlib_flush()) +#define stbiw__zlib_huffa(b,c) stbiw__zlib_add(stbiw__zlib_bitrev(b,c),c) +// default huffman tables +#define stbiw__zlib_huff1(n) stbiw__zlib_huffa(0x30 + (n), 8) +#define stbiw__zlib_huff2(n) stbiw__zlib_huffa(0x190 + (n)-144, 9) +#define stbiw__zlib_huff3(n) stbiw__zlib_huffa(0 + (n)-256,7) +#define stbiw__zlib_huff4(n) stbiw__zlib_huffa(0xc0 + (n)-280,8) +#define stbiw__zlib_huff(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : (n) <= 255 ? stbiw__zlib_huff2(n) : (n) <= 279 ? stbiw__zlib_huff3(n) : stbiw__zlib_huff4(n)) +#define stbiw__zlib_huffb(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : stbiw__zlib_huff2(n)) + +#define stbiw__ZHASH 16384 + +#endif // STBIW_ZLIB_COMPRESS + +STBIWDEF unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality) +{ +#ifdef STBIW_ZLIB_COMPRESS + // user provided a zlib compress implementation, use that + return STBIW_ZLIB_COMPRESS(data, data_len, out_len, quality); +#else // use builtin + static unsigned short lengthc[] = { 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, 259 }; + static unsigned char lengtheb[]= { 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 }; + static unsigned short distc[] = { 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, 32768 }; + static unsigned char disteb[] = { 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 }; + unsigned int bitbuf=0; + int i,j, bitcount=0; + unsigned char *out = NULL; + unsigned char ***hash_table = (unsigned char***) STBIW_MALLOC(stbiw__ZHASH * sizeof(unsigned char**)); + if (hash_table == NULL) + return NULL; + if (quality < 5) quality = 5; + + stbiw__sbpush(out, 0x78); // DEFLATE 32K window + stbiw__sbpush(out, 0x5e); // FLEVEL = 1 + stbiw__zlib_add(1,1); // BFINAL = 1 + stbiw__zlib_add(1,2); // BTYPE = 1 -- fixed huffman + + for (i=0; i < stbiw__ZHASH; ++i) + hash_table[i] = NULL; + + i=0; + while (i < data_len-3) { + // hash next 3 bytes of data to be compressed + int h = stbiw__zhash(data+i)&(stbiw__ZHASH-1), best=3; + unsigned char *bestloc = 0; + unsigned char **hlist = hash_table[h]; + int n = stbiw__sbcount(hlist); + for (j=0; j < n; ++j) { + if (hlist[j]-data > i-32768) { // if entry lies within window + int d = stbiw__zlib_countm(hlist[j], data+i, data_len-i); + if (d >= best) { best=d; bestloc=hlist[j]; } + } + } + // when hash table entry is too long, delete half the entries + if (hash_table[h] && stbiw__sbn(hash_table[h]) == 2*quality) { + STBIW_MEMMOVE(hash_table[h], hash_table[h]+quality, sizeof(hash_table[h][0])*quality); + stbiw__sbn(hash_table[h]) = quality; + } + stbiw__sbpush(hash_table[h],data+i); + + if (bestloc) { + // "lazy matching" - check match at *next* byte, and if it's better, do cur byte as literal + h = stbiw__zhash(data+i+1)&(stbiw__ZHASH-1); + hlist = hash_table[h]; + n = stbiw__sbcount(hlist); + for (j=0; j < n; ++j) { + if (hlist[j]-data > i-32767) { + int e = stbiw__zlib_countm(hlist[j], data+i+1, data_len-i-1); + if (e > best) { // if next match is better, bail on current match + bestloc = NULL; + break; + } + } + } + } + + if (bestloc) { + int d = (int) (data+i - bestloc); // distance back + STBIW_ASSERT(d <= 32767 && best <= 258); + for (j=0; best > lengthc[j+1]-1; ++j); + stbiw__zlib_huff(j+257); + if (lengtheb[j]) stbiw__zlib_add(best - lengthc[j], lengtheb[j]); + for (j=0; d > distc[j+1]-1; ++j); + stbiw__zlib_add(stbiw__zlib_bitrev(j,5),5); + if (disteb[j]) stbiw__zlib_add(d - distc[j], disteb[j]); + i += best; + } else { + stbiw__zlib_huffb(data[i]); + ++i; + } + } + // write out final bytes + for (;i < data_len; ++i) + stbiw__zlib_huffb(data[i]); + stbiw__zlib_huff(256); // end of block + // pad with 0 bits to byte boundary + while (bitcount) + stbiw__zlib_add(0,1); + + for (i=0; i < stbiw__ZHASH; ++i) + (void) stbiw__sbfree(hash_table[i]); + STBIW_FREE(hash_table); + + // store uncompressed instead if compression was worse + if (stbiw__sbn(out) > data_len + 2 + ((data_len+32766)/32767)*5) { + stbiw__sbn(out) = 2; // truncate to DEFLATE 32K window and FLEVEL = 1 + for (j = 0; j < data_len;) { + int blocklen = data_len - j; + if (blocklen > 32767) blocklen = 32767; + stbiw__sbpush(out, data_len - j == blocklen); // BFINAL = ?, BTYPE = 0 -- no compression + stbiw__sbpush(out, STBIW_UCHAR(blocklen)); // LEN + stbiw__sbpush(out, STBIW_UCHAR(blocklen >> 8)); + stbiw__sbpush(out, STBIW_UCHAR(~blocklen)); // NLEN + stbiw__sbpush(out, STBIW_UCHAR(~blocklen >> 8)); + memcpy(out+stbiw__sbn(out), data+j, blocklen); + stbiw__sbn(out) += blocklen; + j += blocklen; + } + } + + { + // compute adler32 on input + unsigned int s1=1, s2=0; + int blocklen = (int) (data_len % 5552); + j=0; + while (j < data_len) { + for (i=0; i < blocklen; ++i) { s1 += data[j+i]; s2 += s1; } + s1 %= 65521; s2 %= 65521; + j += blocklen; + blocklen = 5552; + } + stbiw__sbpush(out, STBIW_UCHAR(s2 >> 8)); + stbiw__sbpush(out, STBIW_UCHAR(s2)); + stbiw__sbpush(out, STBIW_UCHAR(s1 >> 8)); + stbiw__sbpush(out, STBIW_UCHAR(s1)); + } + *out_len = stbiw__sbn(out); + // make returned pointer freeable + STBIW_MEMMOVE(stbiw__sbraw(out), out, *out_len); + return (unsigned char *) stbiw__sbraw(out); +#endif // STBIW_ZLIB_COMPRESS +} + +static unsigned int stbiw__crc32(unsigned char *buffer, int len) +{ +#ifdef STBIW_CRC32 + return STBIW_CRC32(buffer, len); +#else + static unsigned int crc_table[256] = + { + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, + 0x0eDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, + 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, + 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, + 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, + 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, + 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, + 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, + 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, + 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, + 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, + 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, + 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, + 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, + 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, + 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, + 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, + 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, + 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, + 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, + 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, + 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, + 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, + 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, + 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, + 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, + 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, + 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, + 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D + }; + + unsigned int crc = ~0u; + int i; + for (i=0; i < len; ++i) + crc = (crc >> 8) ^ crc_table[buffer[i] ^ (crc & 0xff)]; + return ~crc; +#endif +} + +#define stbiw__wpng4(o,a,b,c,d) ((o)[0]=STBIW_UCHAR(a),(o)[1]=STBIW_UCHAR(b),(o)[2]=STBIW_UCHAR(c),(o)[3]=STBIW_UCHAR(d),(o)+=4) +#define stbiw__wp32(data,v) stbiw__wpng4(data, (v)>>24,(v)>>16,(v)>>8,(v)); +#define stbiw__wptag(data,s) stbiw__wpng4(data, s[0],s[1],s[2],s[3]) + +static void stbiw__wpcrc(unsigned char **data, int len) +{ + unsigned int crc = stbiw__crc32(*data - len - 4, len+4); + stbiw__wp32(*data, crc); +} + +static unsigned char stbiw__paeth(int a, int b, int c) +{ + int p = a + b - c, pa = abs(p-a), pb = abs(p-b), pc = abs(p-c); + if (pa <= pb && pa <= pc) return STBIW_UCHAR(a); + if (pb <= pc) return STBIW_UCHAR(b); + return STBIW_UCHAR(c); +} + +// @OPTIMIZE: provide an option that always forces left-predict or paeth predict +static void stbiw__encode_png_line(unsigned char *pixels, int stride_bytes, int width, int height, int y, int n, int filter_type, signed char *line_buffer) +{ + static int mapping[] = { 0,1,2,3,4 }; + static int firstmap[] = { 0,1,0,5,6 }; + int *mymap = (y != 0) ? mapping : firstmap; + int i; + int type = mymap[filter_type]; + unsigned char *z = pixels + stride_bytes * (stbi__flip_vertically_on_write ? height-1-y : y); + int signed_stride = stbi__flip_vertically_on_write ? -stride_bytes : stride_bytes; + + if (type==0) { + memcpy(line_buffer, z, width*n); + return; + } + + // first loop isn't optimized since it's just one pixel + for (i = 0; i < n; ++i) { + switch (type) { + case 1: line_buffer[i] = z[i]; break; + case 2: line_buffer[i] = z[i] - z[i-signed_stride]; break; + case 3: line_buffer[i] = z[i] - (z[i-signed_stride]>>1); break; + case 4: line_buffer[i] = (signed char) (z[i] - stbiw__paeth(0,z[i-signed_stride],0)); break; + case 5: line_buffer[i] = z[i]; break; + case 6: line_buffer[i] = z[i]; break; + } + } + switch (type) { + case 1: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - z[i-n]; break; + case 2: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - z[i-signed_stride]; break; + case 3: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - ((z[i-n] + z[i-signed_stride])>>1); break; + case 4: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - stbiw__paeth(z[i-n], z[i-signed_stride], z[i-signed_stride-n]); break; + case 5: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - (z[i-n]>>1); break; + case 6: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - stbiw__paeth(z[i-n], 0,0); break; + } +} + +STBIWDEF unsigned char *stbi_write_png_to_mem(const unsigned char *pixels, int stride_bytes, int x, int y, int n, int *out_len) +{ + int force_filter = stbi_write_force_png_filter; + int ctype[5] = { -1, 0, 4, 2, 6 }; + unsigned char sig[8] = { 137,80,78,71,13,10,26,10 }; + unsigned char *out,*o, *filt, *zlib; + signed char *line_buffer; + int j,zlen; + + if (stride_bytes == 0) + stride_bytes = x * n; + + if (force_filter >= 5) { + force_filter = -1; + } + + filt = (unsigned char *) STBIW_MALLOC((x*n+1) * y); if (!filt) return 0; + line_buffer = (signed char *) STBIW_MALLOC(x * n); if (!line_buffer) { STBIW_FREE(filt); return 0; } + for (j=0; j < y; ++j) { + int filter_type; + if (force_filter > -1) { + filter_type = force_filter; + stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, force_filter, line_buffer); + } else { // Estimate the best filter by running through all of them: + int best_filter = 0, best_filter_val = 0x7fffffff, est, i; + for (filter_type = 0; filter_type < 5; filter_type++) { + stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, filter_type, line_buffer); + + // Estimate the entropy of the line using this filter; the less, the better. + est = 0; + for (i = 0; i < x*n; ++i) { + est += abs((signed char) line_buffer[i]); + } + if (est < best_filter_val) { + best_filter_val = est; + best_filter = filter_type; + } + } + if (filter_type != best_filter) { // If the last iteration already got us the best filter, don't redo it + stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, best_filter, line_buffer); + filter_type = best_filter; + } + } + // when we get here, filter_type contains the filter type, and line_buffer contains the data + filt[j*(x*n+1)] = (unsigned char) filter_type; + STBIW_MEMMOVE(filt+j*(x*n+1)+1, line_buffer, x*n); + } + STBIW_FREE(line_buffer); + zlib = stbi_zlib_compress(filt, y*( x*n+1), &zlen, stbi_write_png_compression_level); + STBIW_FREE(filt); + if (!zlib) return 0; + + // each tag requires 12 bytes of overhead + out = (unsigned char *) STBIW_MALLOC(8 + 12+13 + 12+zlen + 12); + if (!out) return 0; + *out_len = 8 + 12+13 + 12+zlen + 12; + + o=out; + STBIW_MEMMOVE(o,sig,8); o+= 8; + stbiw__wp32(o, 13); // header length + stbiw__wptag(o, "IHDR"); + stbiw__wp32(o, x); + stbiw__wp32(o, y); + *o++ = 8; + *o++ = STBIW_UCHAR(ctype[n]); + *o++ = 0; + *o++ = 0; + *o++ = 0; + stbiw__wpcrc(&o,13); + + stbiw__wp32(o, zlen); + stbiw__wptag(o, "IDAT"); + STBIW_MEMMOVE(o, zlib, zlen); + o += zlen; + STBIW_FREE(zlib); + stbiw__wpcrc(&o, zlen); + + stbiw__wp32(o,0); + stbiw__wptag(o, "IEND"); + stbiw__wpcrc(&o,0); + + STBIW_ASSERT(o == out + *out_len); + + return out; +} + +#ifndef STBI_WRITE_NO_STDIO +STBIWDEF int stbi_write_png(char const *filename, int x, int y, int comp, const void *data, int stride_bytes) +{ + FILE *f; + int len; + unsigned char *png = stbi_write_png_to_mem((const unsigned char *) data, stride_bytes, x, y, comp, &len); + if (png == NULL) return 0; + + f = stbiw__fopen(filename, "wb"); + if (!f) { STBIW_FREE(png); return 0; } + fwrite(png, 1, len, f); + fclose(f); + STBIW_FREE(png); + return 1; +} +#endif + +STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int stride_bytes) +{ + int len; + unsigned char *png = stbi_write_png_to_mem((const unsigned char *) data, stride_bytes, x, y, comp, &len); + if (png == NULL) return 0; + func(context, png, len); + STBIW_FREE(png); + return 1; +} + + +/* *************************************************************************** + * + * JPEG writer + * + * This is based on Jon Olick's jo_jpeg.cpp: + * public domain Simple, Minimalistic JPEG writer - http://www.jonolick.com/code.html + */ + +static const unsigned char stbiw__jpg_ZigZag[] = { 0,1,5,6,14,15,27,28,2,4,7,13,16,26,29,42,3,8,12,17,25,30,41,43,9,11,18, + 24,31,40,44,53,10,19,23,32,39,45,52,54,20,22,33,38,46,51,55,60,21,34,37,47,50,56,59,61,35,36,48,49,57,58,62,63 }; + +static void stbiw__jpg_writeBits(stbi__write_context *s, int *bitBufP, int *bitCntP, const unsigned short *bs) { + int bitBuf = *bitBufP, bitCnt = *bitCntP; + bitCnt += bs[1]; + bitBuf |= bs[0] << (24 - bitCnt); + while(bitCnt >= 8) { + unsigned char c = (bitBuf >> 16) & 255; + stbiw__putc(s, c); + if(c == 255) { + stbiw__putc(s, 0); + } + bitBuf <<= 8; + bitCnt -= 8; + } + *bitBufP = bitBuf; + *bitCntP = bitCnt; +} + +static void stbiw__jpg_DCT(float *d0p, float *d1p, float *d2p, float *d3p, float *d4p, float *d5p, float *d6p, float *d7p) { + float d0 = *d0p, d1 = *d1p, d2 = *d2p, d3 = *d3p, d4 = *d4p, d5 = *d5p, d6 = *d6p, d7 = *d7p; + float z1, z2, z3, z4, z5, z11, z13; + + float tmp0 = d0 + d7; + float tmp7 = d0 - d7; + float tmp1 = d1 + d6; + float tmp6 = d1 - d6; + float tmp2 = d2 + d5; + float tmp5 = d2 - d5; + float tmp3 = d3 + d4; + float tmp4 = d3 - d4; + + // Even part + float tmp10 = tmp0 + tmp3; // phase 2 + float tmp13 = tmp0 - tmp3; + float tmp11 = tmp1 + tmp2; + float tmp12 = tmp1 - tmp2; + + d0 = tmp10 + tmp11; // phase 3 + d4 = tmp10 - tmp11; + + z1 = (tmp12 + tmp13) * 0.707106781f; // c4 + d2 = tmp13 + z1; // phase 5 + d6 = tmp13 - z1; + + // Odd part + tmp10 = tmp4 + tmp5; // phase 2 + tmp11 = tmp5 + tmp6; + tmp12 = tmp6 + tmp7; + + // The rotator is modified from fig 4-8 to avoid extra negations. + z5 = (tmp10 - tmp12) * 0.382683433f; // c6 + z2 = tmp10 * 0.541196100f + z5; // c2-c6 + z4 = tmp12 * 1.306562965f + z5; // c2+c6 + z3 = tmp11 * 0.707106781f; // c4 + + z11 = tmp7 + z3; // phase 5 + z13 = tmp7 - z3; + + *d5p = z13 + z2; // phase 6 + *d3p = z13 - z2; + *d1p = z11 + z4; + *d7p = z11 - z4; + + *d0p = d0; *d2p = d2; *d4p = d4; *d6p = d6; +} + +static void stbiw__jpg_calcBits(int val, unsigned short bits[2]) { + int tmp1 = val < 0 ? -val : val; + val = val < 0 ? val-1 : val; + bits[1] = 1; + while(tmp1 >>= 1) { + ++bits[1]; + } + bits[0] = val & ((1<0)&&(DU[end0pos]==0); --end0pos) { + } + // end0pos = first element in reverse order !=0 + if(end0pos == 0) { + stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB); + return DU[0]; + } + for(i = 1; i <= end0pos; ++i) { + int startpos = i; + int nrzeroes; + unsigned short bits[2]; + for (; DU[i]==0 && i<=end0pos; ++i) { + } + nrzeroes = i-startpos; + if ( nrzeroes >= 16 ) { + int lng = nrzeroes>>4; + int nrmarker; + for (nrmarker=1; nrmarker <= lng; ++nrmarker) + stbiw__jpg_writeBits(s, bitBuf, bitCnt, M16zeroes); + nrzeroes &= 15; + } + stbiw__jpg_calcBits(DU[i], bits); + stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTAC[(nrzeroes<<4)+bits[1]]); + stbiw__jpg_writeBits(s, bitBuf, bitCnt, bits); + } + if(end0pos != 63) { + stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB); + } + return DU[0]; +} + +static int stbi_write_jpg_core(stbi__write_context *s, int width, int height, int comp, const void* data, int quality) { + // Constants that don't pollute global namespace + static const unsigned char std_dc_luminance_nrcodes[] = {0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0}; + static const unsigned char std_dc_luminance_values[] = {0,1,2,3,4,5,6,7,8,9,10,11}; + static const unsigned char std_ac_luminance_nrcodes[] = {0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d}; + static const unsigned char std_ac_luminance_values[] = { + 0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08, + 0x23,0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0,0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,0x17,0x18,0x19,0x1a,0x25,0x26,0x27,0x28, + 0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59, + 0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x83,0x84,0x85,0x86,0x87,0x88,0x89, + 0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6, + 0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2, + 0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa + }; + static const unsigned char std_dc_chrominance_nrcodes[] = {0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0}; + static const unsigned char std_dc_chrominance_values[] = {0,1,2,3,4,5,6,7,8,9,10,11}; + static const unsigned char std_ac_chrominance_nrcodes[] = {0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77}; + static const unsigned char std_ac_chrominance_values[] = { + 0x00,0x01,0x02,0x03,0x11,0x04,0x05,0x21,0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,0x13,0x22,0x32,0x81,0x08,0x14,0x42,0x91, + 0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0,0x15,0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26, + 0x27,0x28,0x29,0x2a,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58, + 0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87, + 0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4, + 0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda, + 0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa + }; + // Huffman tables + static const unsigned short YDC_HT[256][2] = { {0,2},{2,3},{3,3},{4,3},{5,3},{6,3},{14,4},{30,5},{62,6},{126,7},{254,8},{510,9}}; + static const unsigned short UVDC_HT[256][2] = { {0,2},{1,2},{2,2},{6,3},{14,4},{30,5},{62,6},{126,7},{254,8},{510,9},{1022,10},{2046,11}}; + static const unsigned short YAC_HT[256][2] = { + {10,4},{0,2},{1,2},{4,3},{11,4},{26,5},{120,7},{248,8},{1014,10},{65410,16},{65411,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {12,4},{27,5},{121,7},{502,9},{2038,11},{65412,16},{65413,16},{65414,16},{65415,16},{65416,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {28,5},{249,8},{1015,10},{4084,12},{65417,16},{65418,16},{65419,16},{65420,16},{65421,16},{65422,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {58,6},{503,9},{4085,12},{65423,16},{65424,16},{65425,16},{65426,16},{65427,16},{65428,16},{65429,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {59,6},{1016,10},{65430,16},{65431,16},{65432,16},{65433,16},{65434,16},{65435,16},{65436,16},{65437,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {122,7},{2039,11},{65438,16},{65439,16},{65440,16},{65441,16},{65442,16},{65443,16},{65444,16},{65445,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {123,7},{4086,12},{65446,16},{65447,16},{65448,16},{65449,16},{65450,16},{65451,16},{65452,16},{65453,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {250,8},{4087,12},{65454,16},{65455,16},{65456,16},{65457,16},{65458,16},{65459,16},{65460,16},{65461,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {504,9},{32704,15},{65462,16},{65463,16},{65464,16},{65465,16},{65466,16},{65467,16},{65468,16},{65469,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {505,9},{65470,16},{65471,16},{65472,16},{65473,16},{65474,16},{65475,16},{65476,16},{65477,16},{65478,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {506,9},{65479,16},{65480,16},{65481,16},{65482,16},{65483,16},{65484,16},{65485,16},{65486,16},{65487,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {1017,10},{65488,16},{65489,16},{65490,16},{65491,16},{65492,16},{65493,16},{65494,16},{65495,16},{65496,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {1018,10},{65497,16},{65498,16},{65499,16},{65500,16},{65501,16},{65502,16},{65503,16},{65504,16},{65505,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {2040,11},{65506,16},{65507,16},{65508,16},{65509,16},{65510,16},{65511,16},{65512,16},{65513,16},{65514,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {65515,16},{65516,16},{65517,16},{65518,16},{65519,16},{65520,16},{65521,16},{65522,16},{65523,16},{65524,16},{0,0},{0,0},{0,0},{0,0},{0,0}, + {2041,11},{65525,16},{65526,16},{65527,16},{65528,16},{65529,16},{65530,16},{65531,16},{65532,16},{65533,16},{65534,16},{0,0},{0,0},{0,0},{0,0},{0,0} + }; + static const unsigned short UVAC_HT[256][2] = { + {0,2},{1,2},{4,3},{10,4},{24,5},{25,5},{56,6},{120,7},{500,9},{1014,10},{4084,12},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {11,4},{57,6},{246,8},{501,9},{2038,11},{4085,12},{65416,16},{65417,16},{65418,16},{65419,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {26,5},{247,8},{1015,10},{4086,12},{32706,15},{65420,16},{65421,16},{65422,16},{65423,16},{65424,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {27,5},{248,8},{1016,10},{4087,12},{65425,16},{65426,16},{65427,16},{65428,16},{65429,16},{65430,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {58,6},{502,9},{65431,16},{65432,16},{65433,16},{65434,16},{65435,16},{65436,16},{65437,16},{65438,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {59,6},{1017,10},{65439,16},{65440,16},{65441,16},{65442,16},{65443,16},{65444,16},{65445,16},{65446,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {121,7},{2039,11},{65447,16},{65448,16},{65449,16},{65450,16},{65451,16},{65452,16},{65453,16},{65454,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {122,7},{2040,11},{65455,16},{65456,16},{65457,16},{65458,16},{65459,16},{65460,16},{65461,16},{65462,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {249,8},{65463,16},{65464,16},{65465,16},{65466,16},{65467,16},{65468,16},{65469,16},{65470,16},{65471,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {503,9},{65472,16},{65473,16},{65474,16},{65475,16},{65476,16},{65477,16},{65478,16},{65479,16},{65480,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {504,9},{65481,16},{65482,16},{65483,16},{65484,16},{65485,16},{65486,16},{65487,16},{65488,16},{65489,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {505,9},{65490,16},{65491,16},{65492,16},{65493,16},{65494,16},{65495,16},{65496,16},{65497,16},{65498,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {506,9},{65499,16},{65500,16},{65501,16},{65502,16},{65503,16},{65504,16},{65505,16},{65506,16},{65507,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {2041,11},{65508,16},{65509,16},{65510,16},{65511,16},{65512,16},{65513,16},{65514,16},{65515,16},{65516,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {16352,14},{65517,16},{65518,16},{65519,16},{65520,16},{65521,16},{65522,16},{65523,16},{65524,16},{65525,16},{0,0},{0,0},{0,0},{0,0},{0,0}, + {1018,10},{32707,15},{65526,16},{65527,16},{65528,16},{65529,16},{65530,16},{65531,16},{65532,16},{65533,16},{65534,16},{0,0},{0,0},{0,0},{0,0},{0,0} + }; + static const int YQT[] = {16,11,10,16,24,40,51,61,12,12,14,19,26,58,60,55,14,13,16,24,40,57,69,56,14,17,22,29,51,87,80,62,18,22, + 37,56,68,109,103,77,24,35,55,64,81,104,113,92,49,64,78,87,103,121,120,101,72,92,95,98,112,100,103,99}; + static const int UVQT[] = {17,18,24,47,99,99,99,99,18,21,26,66,99,99,99,99,24,26,56,99,99,99,99,99,47,66,99,99,99,99,99,99, + 99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99}; + static const float aasf[] = { 1.0f * 2.828427125f, 1.387039845f * 2.828427125f, 1.306562965f * 2.828427125f, 1.175875602f * 2.828427125f, + 1.0f * 2.828427125f, 0.785694958f * 2.828427125f, 0.541196100f * 2.828427125f, 0.275899379f * 2.828427125f }; + + int row, col, i, k, subsample; + float fdtbl_Y[64], fdtbl_UV[64]; + unsigned char YTable[64], UVTable[64]; + + if(!data || !width || !height || comp > 4 || comp < 1) { + return 0; + } + + quality = quality ? quality : 90; + subsample = quality <= 90 ? 1 : 0; + quality = quality < 1 ? 1 : quality > 100 ? 100 : quality; + quality = quality < 50 ? 5000 / quality : 200 - quality * 2; + + for(i = 0; i < 64; ++i) { + int uvti, yti = (YQT[i]*quality+50)/100; + YTable[stbiw__jpg_ZigZag[i]] = (unsigned char) (yti < 1 ? 1 : yti > 255 ? 255 : yti); + uvti = (UVQT[i]*quality+50)/100; + UVTable[stbiw__jpg_ZigZag[i]] = (unsigned char) (uvti < 1 ? 1 : uvti > 255 ? 255 : uvti); + } + + for(row = 0, k = 0; row < 8; ++row) { + for(col = 0; col < 8; ++col, ++k) { + fdtbl_Y[k] = 1 / (YTable [stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]); + fdtbl_UV[k] = 1 / (UVTable[stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]); + } + } + + // Write Headers + { + static const unsigned char head0[] = { 0xFF,0xD8,0xFF,0xE0,0,0x10,'J','F','I','F',0,1,1,0,0,1,0,1,0,0,0xFF,0xDB,0,0x84,0 }; + static const unsigned char head2[] = { 0xFF,0xDA,0,0xC,3,1,0,2,0x11,3,0x11,0,0x3F,0 }; + const unsigned char head1[] = { 0xFF,0xC0,0,0x11,8,(unsigned char)(height>>8),STBIW_UCHAR(height),(unsigned char)(width>>8),STBIW_UCHAR(width), + 3,1,(unsigned char)(subsample?0x22:0x11),0,2,0x11,1,3,0x11,1,0xFF,0xC4,0x01,0xA2,0 }; + s->func(s->context, (void*)head0, sizeof(head0)); + s->func(s->context, (void*)YTable, sizeof(YTable)); + stbiw__putc(s, 1); + s->func(s->context, UVTable, sizeof(UVTable)); + s->func(s->context, (void*)head1, sizeof(head1)); + s->func(s->context, (void*)(std_dc_luminance_nrcodes+1), sizeof(std_dc_luminance_nrcodes)-1); + s->func(s->context, (void*)std_dc_luminance_values, sizeof(std_dc_luminance_values)); + stbiw__putc(s, 0x10); // HTYACinfo + s->func(s->context, (void*)(std_ac_luminance_nrcodes+1), sizeof(std_ac_luminance_nrcodes)-1); + s->func(s->context, (void*)std_ac_luminance_values, sizeof(std_ac_luminance_values)); + stbiw__putc(s, 1); // HTUDCinfo + s->func(s->context, (void*)(std_dc_chrominance_nrcodes+1), sizeof(std_dc_chrominance_nrcodes)-1); + s->func(s->context, (void*)std_dc_chrominance_values, sizeof(std_dc_chrominance_values)); + stbiw__putc(s, 0x11); // HTUACinfo + s->func(s->context, (void*)(std_ac_chrominance_nrcodes+1), sizeof(std_ac_chrominance_nrcodes)-1); + s->func(s->context, (void*)std_ac_chrominance_values, sizeof(std_ac_chrominance_values)); + s->func(s->context, (void*)head2, sizeof(head2)); + } + + // Encode 8x8 macroblocks + { + static const unsigned short fillBits[] = {0x7F, 7}; + int DCY=0, DCU=0, DCV=0; + int bitBuf=0, bitCnt=0; + // comp == 2 is grey+alpha (alpha is ignored) + int ofsG = comp > 2 ? 1 : 0, ofsB = comp > 2 ? 2 : 0; + const unsigned char *dataR = (const unsigned char *)data; + const unsigned char *dataG = dataR + ofsG; + const unsigned char *dataB = dataR + ofsB; + int x, y, pos; + if(subsample) { + for(y = 0; y < height; y += 16) { + for(x = 0; x < width; x += 16) { + float Y[256], U[256], V[256]; + for(row = y, pos = 0; row < y+16; ++row) { + // row >= height => use last input row + int clamped_row = (row < height) ? row : height - 1; + int base_p = (stbi__flip_vertically_on_write ? (height-1-clamped_row) : clamped_row)*width*comp; + for(col = x; col < x+16; ++col, ++pos) { + // if col >= width => use pixel from last input column + int p = base_p + ((col < width) ? col : (width-1))*comp; + float r = dataR[p], g = dataG[p], b = dataB[p]; + Y[pos]= +0.29900f*r + 0.58700f*g + 0.11400f*b - 128; + U[pos]= -0.16874f*r - 0.33126f*g + 0.50000f*b; + V[pos]= +0.50000f*r - 0.41869f*g - 0.08131f*b; + } + } + DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+0, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT); + DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+8, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT); + DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+128, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT); + DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+136, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT); + + // subsample U,V + { + float subU[64], subV[64]; + int yy, xx; + for(yy = 0, pos = 0; yy < 8; ++yy) { + for(xx = 0; xx < 8; ++xx, ++pos) { + int j = yy*32+xx*2; + subU[pos] = (U[j+0] + U[j+1] + U[j+16] + U[j+17]) * 0.25f; + subV[pos] = (V[j+0] + V[j+1] + V[j+16] + V[j+17]) * 0.25f; + } + } + DCU = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, subU, 8, fdtbl_UV, DCU, UVDC_HT, UVAC_HT); + DCV = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, subV, 8, fdtbl_UV, DCV, UVDC_HT, UVAC_HT); + } + } + } + } else { + for(y = 0; y < height; y += 8) { + for(x = 0; x < width; x += 8) { + float Y[64], U[64], V[64]; + for(row = y, pos = 0; row < y+8; ++row) { + // row >= height => use last input row + int clamped_row = (row < height) ? row : height - 1; + int base_p = (stbi__flip_vertically_on_write ? (height-1-clamped_row) : clamped_row)*width*comp; + for(col = x; col < x+8; ++col, ++pos) { + // if col >= width => use pixel from last input column + int p = base_p + ((col < width) ? col : (width-1))*comp; + float r = dataR[p], g = dataG[p], b = dataB[p]; + Y[pos]= +0.29900f*r + 0.58700f*g + 0.11400f*b - 128; + U[pos]= -0.16874f*r - 0.33126f*g + 0.50000f*b; + V[pos]= +0.50000f*r - 0.41869f*g - 0.08131f*b; + } + } + + DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y, 8, fdtbl_Y, DCY, YDC_HT, YAC_HT); + DCU = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, U, 8, fdtbl_UV, DCU, UVDC_HT, UVAC_HT); + DCV = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, V, 8, fdtbl_UV, DCV, UVDC_HT, UVAC_HT); + } + } + } + + // Do the bit alignment of the EOI marker + stbiw__jpg_writeBits(s, &bitBuf, &bitCnt, fillBits); + } + + // EOI + stbiw__putc(s, 0xFF); + stbiw__putc(s, 0xD9); + + return 1; +} + +STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality) +{ + stbi__write_context s = { 0 }; + stbi__start_write_callbacks(&s, func, context); + return stbi_write_jpg_core(&s, x, y, comp, (void *) data, quality); +} + + +#ifndef STBI_WRITE_NO_STDIO +STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality) +{ + stbi__write_context s = { 0 }; + if (stbi__start_write_file(&s,filename)) { + int r = stbi_write_jpg_core(&s, x, y, comp, data, quality); + stbi__end_write_file(&s); + return r; + } else + return 0; +} +#endif + +#endif // STB_IMAGE_WRITE_IMPLEMENTATION + +/* Revision history + 1.16 (2021-07-11) + make Deflate code emit uncompressed blocks when it would otherwise expand + support writing BMPs with alpha channel + 1.15 (2020-07-13) unknown + 1.14 (2020-02-02) updated JPEG writer to downsample chroma channels + 1.13 + 1.12 + 1.11 (2019-08-11) + + 1.10 (2019-02-07) + support utf8 filenames in Windows; fix warnings and platform ifdefs + 1.09 (2018-02-11) + fix typo in zlib quality API, improve STB_I_W_STATIC in C++ + 1.08 (2018-01-29) + add stbi__flip_vertically_on_write, external zlib, zlib quality, choose PNG filter + 1.07 (2017-07-24) + doc fix + 1.06 (2017-07-23) + writing JPEG (using Jon Olick's code) + 1.05 ??? + 1.04 (2017-03-03) + monochrome BMP expansion + 1.03 ??? + 1.02 (2016-04-02) + avoid allocating large structures on the stack + 1.01 (2016-01-16) + STBIW_REALLOC_SIZED: support allocators with no realloc support + avoid race-condition in crc initialization + minor compile issues + 1.00 (2015-09-14) + installable file IO function + 0.99 (2015-09-13) + warning fixes; TGA rle support + 0.98 (2015-04-08) + added STBIW_MALLOC, STBIW_ASSERT etc + 0.97 (2015-01-18) + fixed HDR asserts, rewrote HDR rle logic + 0.96 (2015-01-17) + add HDR output + fix monochrome BMP + 0.95 (2014-08-17) + add monochrome TGA output + 0.94 (2014-05-31) + rename private functions to avoid conflicts with stb_image.h + 0.93 (2014-05-27) + warning fixes + 0.92 (2010-08-01) + casts to unsigned char to fix warnings + 0.91 (2010-07-17) + first public release + 0.90 first internal release +*/ + +/* +------------------------------------------------------------------------------ +This software is available under 2 licenses -- choose whichever you prefer. +------------------------------------------------------------------------------ +ALTERNATIVE A - MIT License +Copyright (c) 2017 Sean Barrett +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. +------------------------------------------------------------------------------ +ALTERNATIVE B - Public Domain (www.unlicense.org) +This is free and unencumbered software released into the public domain. +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, +commercial or non-commercial, and by any means. +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to +this software under copyright law. +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 BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------------------------------------------------------------------ +*/ diff --git a/src/main.cpp b/src/main.cpp index e8ab50a2..3a5f0768 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,7 +27,7 @@ // Solve: // Create empty hull 0 box ? -std::string g_version_string = "NewBSPGuy v4.30"; +std::string g_version_string = "NewBSPGuy v4.31"; bool g_verbose = false; diff --git a/src/mdl/mdl_studio.cpp b/src/mdl/mdl_studio.cpp index d0ceeec6..3985705d 100644 --- a/src/mdl/mdl_studio.cpp +++ b/src/mdl/mdl_studio.cpp @@ -277,7 +277,7 @@ void StudioModel::AdvanceFrame(float dt) m_frame += dt * pseqdesc->fps; if (pseqdesc->numframes > 1) { - m_frame = std::fmod(m_frame, pseqdesc->numframes - 1); + m_frame = (float)std::fmod(m_frame, pseqdesc->numframes - 1); } if (m_frame >= pseqdesc->numframes) { @@ -799,9 +799,9 @@ void StudioModel::RefreshMeshList(int body) if (needForceUpdate) { - if (std::abs(mins.x - maxs.x) > 512.f && - std::abs(mins.y - maxs.y) > 512.f && - std::abs(mins.z - maxs.z) > 512.f) + if (std::fabs(mins.x - maxs.x) > 512.f && + std::fabs(mins.y - maxs.y) > 512.f && + std::fabs(mins.z - maxs.z) > 512.f) ExtractBBox(mins, maxs); if (mdl_cube != NULL) @@ -918,7 +918,7 @@ void StudioModel::DrawMDL(int meshnum) if (frametime < 0.0f) frametime = g_app->curTime; - if (needForceUpdate || (g_app->curTime - frametime > (1.0f / fps) && (g_render_flags & RENDER_MODELS_ANIMATED))) + if (needForceUpdate || (g_app->curTime - frametime > (1.0f / fps) && !ortho_overview && (g_render_flags & RENDER_MODELS_ANIMATED))) { if (needForceUpdate) { diff --git a/src/qtools/winding.cpp b/src/qtools/winding.cpp index 792bf22b..5b801be8 100644 --- a/src/qtools/winding.cpp +++ b/src/qtools/winding.cpp @@ -259,9 +259,9 @@ bool Winding::Clip(BSPPLANE& split, bool keepon, float epsilon) dot = dists[i] / (dists[i] - dists[i + 1]); for (j = 0; j < 3ul; j++) { // avoid round off error when possible - if (std::abs(split.vNormal[j] - 1.0f) < EPSILON) + if (std::fabs(split.vNormal[j] - 1.0f) < EPSILON) mid[j] = split.fDist; - else if (std::abs(split.vNormal[j] - -1.0f) < EPSILON) + else if (std::fabs(split.vNormal[j] - -1.0f) < EPSILON) mid[j] = -split.fDist; else mid[j] = p1[j] + dot * (p2[j] - p1[j]); diff --git a/src/util/mat4x4.cpp b/src/util/mat4x4.cpp index 4ac4489f..bc1dc357 100644 --- a/src/util/mat4x4.cpp +++ b/src/util/mat4x4.cpp @@ -48,10 +48,11 @@ void mat4x4::perspective(float fov, float aspect, float near, float far) glhFrustumf2(m, -xmax, xmax, -ymax, ymax, near, far); } -// Set up an orthographic projection matrix -// http://en.wikipedia.org/wiki/Orthographic_projection_(geometry) + void mat4x4::ortho(float left, float right, float bottom, float top, float near, float far) { + // Set up an orthographic projection matrix + // http://en.wikipedia.org/wiki/Orthographic_projection_(geometry) loadIdentity(); float w = right - left; float h = top - bottom; @@ -400,7 +401,7 @@ mat4x4 mat4x4::invert(bool* result) float det = m[0] * inv[0] + m[1] * inv[4] + m[2] * inv[8] + m[3] * inv[12]; - if (std::abs(det) < EPSILON) + if (std::fabs(det) < EPSILON) { if (result) *result = false; diff --git a/src/util/util.cpp b/src/util/util.cpp index 7e101395..874208ca 100644 --- a/src/util/util.cpp +++ b/src/util/util.cpp @@ -406,7 +406,7 @@ bool pickAABB(const vec3& start, const vec3& rayDir, const vec3& mins, const vec for (int i = 0; i < 3; ++i) { - if (quadrant[i] != 2 && std::abs(rayDir[i]) >= EPSILON) + if (quadrant[i] != 2 && std::fabs(rayDir[i]) >= EPSILON) maxT[i] = (candidatePlane[i] - start[i]) / rayDir[i]; } @@ -446,7 +446,7 @@ bool rayPlaneIntersect(const vec3& start, const vec3& dir, const vec3& normal, f { float dot = normal.dot(dir); - if (std::abs(dot) < EPSILON) return false; + if (std::fabs(dot) < EPSILON) return false; intersectDist = normal.dot((normal * fdist) - start) / dot; return intersectDist >= 0.0f; @@ -477,7 +477,7 @@ bool getPlaneFromVerts(const std::vector& verts, vec3& outNormal, float& o { outNormal = normal; } - else if (std::abs(outNormal.dot(normal)) < 1.0f - tolerance) + else if (std::fabs(outNormal.dot(normal)) < 1.0f - tolerance) { return false; } @@ -705,7 +705,7 @@ std::vector getPlaneIntersectVerts(const std::vector& planes) { n0.y * (n1.z * n2.x - n1.x * n2.z) + n0.z * (n1.x * n2.y - n1.y * n2.x); - if (std::abs(t) < EPSILON) { + if (std::fabs(t) < EPSILON) { continue; } @@ -797,7 +797,7 @@ std::vector getTriangularVerts(std::vector& verts) { vec3 ab = (verts[i1] - verts[i0]).normalize(); vec3 ac = (verts[i] - verts[i0]).normalize(); - if (std::abs(dotProduct(ab, ac) - 1.0) < EPSILON) + if (std::fabs(dotProduct(ab, ac) - 1.0) < EPSILON) { continue; } @@ -952,7 +952,7 @@ bool pointInsidePolygon(std::vector& poly, vec2 p) vec2& v1 = poly[i]; vec2& v2 = poly[(i + 1) % poly.size()]; - if (std::abs(v1.x - p.x) < EPSILON && std::abs(v1.y - p.y) < EPSILON) + if (std::fabs(v1.x - p.x) < EPSILON && std::fabs(v1.y - p.y) < EPSILON) { break; // on edge = inside } @@ -2355,11 +2355,11 @@ std::vector solve_uv_matrix_svd(const std::vector>& ma for (int i = 0; i < 3; ++i) { // Find the row with the largest pivot element int maxRow = i; - float maxPivot = std::abs(augmentedMatrix[i][i]); + float maxPivot = std::fabs(augmentedMatrix[i][i]); for (int j = i + 1; j < 3; ++j) { - if (std::abs(augmentedMatrix[j][i]) > maxPivot) { + if (std::fabs(augmentedMatrix[j][i]) > maxPivot) { maxRow = j; - maxPivot = std::abs(augmentedMatrix[j][i]); + maxPivot = std::fabs(augmentedMatrix[j][i]); } } @@ -2556,7 +2556,7 @@ bool rayIntersectsTriangle(const vec3& origin, const vec3& direction, const vec3 vec3 h = crossProduct(direction, edge2); float a = dotProduct(edge1, h); - if (std::abs(a) < EPSILON) { + if (std::fabs(a) < EPSILON) { return false; // Ray is parallel to the triangle } diff --git a/src/util/vectors.cpp b/src/util/vectors.cpp index 8302de2f..9ebd076b 100644 --- a/src/util/vectors.cpp +++ b/src/util/vectors.cpp @@ -5,11 +5,11 @@ bool operator==(const vec3& v1, const vec3& v2) { vec3 v = v1 - v2; - if (std::abs(v.x) >= EPSILON) + if (std::fabs(v.x) >= EPSILON) return false; - if (std::abs(v.y) >= EPSILON) + if (std::fabs(v.y) >= EPSILON) return false; - if (std::abs(v.z) >= EPSILON) + if (std::fabs(v.z) >= EPSILON) return false; return true; } @@ -17,11 +17,11 @@ bool operator==(const vec3& v1, const vec3& v2) bool operator!=(const vec3& v1, const vec3& v2) { vec3 v = v1 - v2; - if (std::abs(v.x) >= EPSILON) + if (std::fabs(v.x) >= EPSILON) return true; - if (std::abs(v.y) >= EPSILON) + if (std::fabs(v.y) >= EPSILON) return true; - if (std::abs(v.z) >= EPSILON) + if (std::fabs(v.z) >= EPSILON) return true; return false; } @@ -145,11 +145,11 @@ void vec3::operator/=(float f) y /= f; z /= f; } -vec3 crossProduct( vec3 v1, vec3 v2 ) +vec3 crossProduct(vec3 v1, vec3 v2) { - float x = v1.y*v2.z - v2.y*v1.z; - float y = v2.x*v1.z - v1.x*v2.z; - float z = v1.x*v2.y - v1.y*v2.x; + float x = v1.y * v2.z - v2.y * v1.z; + float y = v2.x * v1.z - v1.x * v2.z; + float z = v1.x * v2.y - v1.y * v2.x; return vec3(x, y, z); } @@ -176,10 +176,10 @@ float dotProduct(vec2 v1, vec2 v2) { } float distanceToPlane(const vec3& point, const vec3& planeNormal, float planeDist) { - return std::abs(planeNormal.dot(point) - planeDist); + return std::fabs(planeNormal.dot(point) - planeDist); } -bool isPointInFace(const vec3& point, const std::vector& faceVertices) +bool isPointInFace(const vec3& point, const std::vector& faceVertices) { vec3 v0 = faceVertices[1] - faceVertices[0]; vec3 v1 = faceVertices[2] - faceVertices[0]; @@ -217,7 +217,7 @@ void makeVectors(const vec3& angles, vec3& forward, vec3& right, vec3& up) vec3 vec3::normalize(float length) const { - if (std::abs(x) < EPSILON2 && std::abs(y) < EPSILON2 && std::abs(z) < EPSILON2) + if (std::fabs(x) < EPSILON2 && std::fabs(y) < EPSILON2 && std::fabs(z) < EPSILON2) return vec3(); float d = length / sqrt((x * x) + (y * y) + (z * z)); @@ -226,11 +226,11 @@ vec3 vec3::normalize(float length) const bool vec3::equal(vec3 to, float epsilon) const { - if (std::abs(x - to.x) >= epsilon) + if (std::fabs(x - to.x) >= epsilon) return false; - if (std::abs(y - to.y) >= epsilon) + if (std::fabs(y - to.y) >= epsilon) return false; - if (std::abs(z - to.z) >= epsilon) + if (std::fabs(z - to.z) >= epsilon) return false; return true; } @@ -272,12 +272,12 @@ vec3 vec3::swap_xz() vec3 vec3::abs() { - return vec3(std::abs(x), std::abs(y), std::abs(z)); + return vec3(std::fabs(x), std::fabs(y), std::fabs(z)); } vec3 vec3::invert() { - return vec3( -x , -y, -z ); + return vec3(-x, -y, -z); } float vec3::length() const @@ -292,7 +292,7 @@ float vec3::lengthSquared() const bool vec3::IsZero() const { - return (std::abs(x) + std::abs(y) + std::abs(z)) < EPSILON; + return (std::fabs(x) + std::fabs(y) + std::fabs(z)) < EPSILON; } std::string vec3::toString() @@ -302,7 +302,7 @@ std::string vec3::toString() std::string vec3::toKeyvalueString(bool truncate, const std::string& suffix_x, const std::string& suffix_y, const std::string& suffix_z) { - std::string parts[3] = {std::to_string(x) ,std::to_string(y), std::to_string(z)}; + std::string parts[3] = { std::to_string(x) ,std::to_string(y), std::to_string(z) }; // remove trailing zeros to save some space for (int i = 0; i < 3; i++) @@ -367,16 +367,16 @@ float vec3::dist(vec3 to) const bool operator==(const vec2& v1, const vec2& v2) { vec2 v = v1 - v2; - if (std::abs(v.x) >= EPSILON) + if (std::fabs(v.x) >= EPSILON) return false; - if (std::abs(v.y) >= EPSILON) + if (std::fabs(v.y) >= EPSILON) return false; return true; } bool operator!=(const vec2& v1, const vec2& v2) { - return std::abs(v1.x - v2.x) >= EPSILON || std::abs(v1.y - v2.y) >= EPSILON; + return std::fabs(v1.x - v2.x) >= EPSILON || std::fabs(v1.y - v2.y) >= EPSILON; } vec2 operator-(vec2 v1, const vec2& v2) @@ -490,7 +490,7 @@ float vec2::length() vec2 vec2::normalize(float length) { - if (std::abs(x) < EPSILON2 && std::abs(y) < EPSILON2) + if (std::fabs(x) < EPSILON2 && std::fabs(y) < EPSILON2) return vec2(); float d = length / sqrt((x * x) + (y * y)); return vec2(x * d, y * d); @@ -506,7 +506,7 @@ vec2 vec2::swap() bool operator==(const vec4& v1, const vec4& v2) { vec4 v = v1 - v2; - return std::abs(v.x) < EPSILON && std::abs(v.y) < EPSILON && std::abs(v.z) < EPSILON && std::abs(v.w) < EPSILON; + return std::fabs(v.x) < EPSILON && std::fabs(v.y) < EPSILON && std::fabs(v.z) < EPSILON && std::fabs(v.w) < EPSILON; } @@ -638,7 +638,7 @@ bool VectorCompare(const vec3& v1, const vec3& v2, float epsilon) int i; for (i = 0; i < 3; i++) - if (std::abs(v1[i] - v2[i]) > epsilon) + if (std::fabs(v1[i] - v2[i]) > epsilon) return false; return true; @@ -785,14 +785,14 @@ float VectorNormalize(vec3& v) int i; float length; - if (std::abs(v[1] - 0.000215956f) < 0.0001f) + if (std::fabs(v[1] - 0.000215956f) < 0.0001f) i = 1; length = +0.0f; for (i = 0; i < 3; i++) length += v[i] * v[i]; length = sqrt(length); - if (std::abs(length) < EPSILON) + if (std::fabs(length) < EPSILON) return 0.0f; for (i = 0; i < 3; i++) diff --git a/src/util/vectors.h b/src/util/vectors.h index f66bfca0..6e106fb2 100644 --- a/src/util/vectors.h +++ b/src/util/vectors.h @@ -2,6 +2,7 @@ #include #include +#include #define HL_PI 3.141592f @@ -76,15 +77,15 @@ struct vec3 vec3(float x, float y, float z) : x(x), y(y), z(z) { - if (std::abs(x) < EPSILON2) + if (std::fabs(x) < EPSILON2) { x = +0.00f; } - if (std::abs(y) < EPSILON2) + if (std::fabs(y) < EPSILON2) { y = +0.00f; } - if (std::abs(z) < EPSILON2) + if (std::fabs(z) < EPSILON2) { z = +0.00f; } @@ -210,16 +211,16 @@ struct vec2 float x, y; vec2() : x(0), y(0) { - if (std::abs(x) < EPSILON) + if (std::fabs(x) < EPSILON) x = +0.0f; - if (std::abs(y) < EPSILON) + if (std::fabs(y) < EPSILON) y = +0.0f; } vec2(float x, float y) : x(x), y(y) { - if (std::abs(x) < EPSILON) + if (std::fabs(x) < EPSILON) x = +0.0f; - if (std::abs(y) < EPSILON) + if (std::fabs(y) < EPSILON) y = +0.0f; } vec2 swap(); @@ -264,44 +265,44 @@ struct vec4 } vec4(float x, float y, float z) : x(x), y(y), z(z), w(1) { - if (std::abs(x) < EPSILON) + if (std::fabs(x) < EPSILON) x = +0.0f; - if (std::abs(y) < EPSILON) + if (std::fabs(y) < EPSILON) y = +0.0f; - if (std::abs(z) < EPSILON) + if (std::fabs(z) < EPSILON) z = +0.0f; } vec4(float x, float y, float z, float w) : x(x), y(y), z(z), w(w) { - if (std::abs(x) < EPSILON) + if (std::fabs(x) < EPSILON) x = +0.0f; - if (std::abs(y) < EPSILON) + if (std::fabs(y) < EPSILON) y = +0.0f; - if (std::abs(z) < EPSILON) + if (std::fabs(z) < EPSILON) z = +0.0f; - if (std::abs(w) < EPSILON) + if (std::fabs(w) < EPSILON) w = +0.0f; } vec4(const vec3& v, float a) : x(v.x), y(v.y), z(v.z), w(a) { - if (std::abs(x) < EPSILON) + if (std::fabs(x) < EPSILON) x = +0.0f; - if (std::abs(y) < EPSILON) + if (std::fabs(y) < EPSILON) y = +0.0f; - if (std::abs(z) < EPSILON) + if (std::fabs(z) < EPSILON) z = +0.0f; - if (std::abs(w) < EPSILON) + if (std::fabs(w) < EPSILON) w = +0.0f; } vec4(const COLOR4& c) : x(c.r / 255.0f), y(c.g / 255.0f), z(c.b / 255.0f), w(c.a / 255.0f) { - if (std::abs(x) < EPSILON) + if (std::fabs(x) < EPSILON) x = +0.0f; - if (std::abs(y) < EPSILON) + if (std::fabs(y) < EPSILON) y = +0.0f; - if (std::abs(z) < EPSILON) + if (std::fabs(z) < EPSILON) z = +0.0f; - if (std::abs(w) < EPSILON) + if (std::fabs(w) < EPSILON) w = +0.0f; } vec3 xyz(); diff --git a/vs-project/bspguy.vcxproj b/vs-project/bspguy.vcxproj index d57f7da3..09a45aa4 100644 --- a/vs-project/bspguy.vcxproj +++ b/vs-project/bspguy.vcxproj @@ -814,6 +814,7 @@ del "$(TargetDir)bspguy.cfg_bak" + diff --git a/vs-project/bspguy.vcxproj.filters b/vs-project/bspguy.vcxproj.filters index f6b2fe36..edf82326 100644 --- a/vs-project/bspguy.vcxproj.filters +++ b/vs-project/bspguy.vcxproj.filters @@ -282,9 +282,6 @@ Header Files\util\lib - - Header Files\filedialog - Header Files\filedialog @@ -327,6 +324,12 @@ Header Files\util + + Header Files\util\lib + + + Header Files\util\lib +