From bfbf02e49ef327aa55a342bd6e9dab9f4b357abd Mon Sep 17 00:00:00 2001 From: themancalledjakob Date: Wed, 29 Mar 2023 20:45:09 +0200 Subject: [PATCH] comment unnecessary code --- src/ofxMsdfgen.cpp | 152 ++++++++++++++++++++++----------------------- src/ofxMsdfgen.h | 25 ++++---- 2 files changed, 89 insertions(+), 88 deletions(-) diff --git a/src/ofxMsdfgen.cpp b/src/ofxMsdfgen.cpp index a894fce..3a75314 100644 --- a/src/ofxMsdfgen.cpp +++ b/src/ofxMsdfgen.cpp @@ -1,80 +1,80 @@ #include "ofxMsdfgen.h" -#include "BitmapRef.hpp" -#include "ofGraphicsConstants.h" -#include "ofPixels.h" +//#include "BitmapRef.hpp" +//#include "ofGraphicsConstants.h" +//#include "ofPixels.h" -bool ofxMsdfgen::generateAtlas(const char * fontFilename){ - bool success = false; - // Initialize instance of FreeType library - if(msdfgen::FreetypeHandle * ft = msdfgen::initializeFreetype()){ - // Load font file - if(msdfgen::FontHandle * font = msdfgen::loadFont(ft, fontFilename)){ - // Storage for glyph geometry and their coordinates in the atlas - std::vector glyphs; - // FontGeometry is a helper class that loads a set of glyphs from a single font. - // It can also be used to get additional font metrics, kerning information, etc. - msdf_atlas::FontGeometry fontGeometry(&glyphs); - // Load a set of character glyphs: - // The second argument can be ignored unless you mix different font sizes in one atlas. - // In the last argument, you can specify a charset other than ASCII. - // To load specific glyph indices, use loadGlyphs instead. - fontGeometry.loadCharset(font, 1.0, msdf_atlas::Charset::ASCII); - // Apply MSDF edge coloring. See edge-coloring.h for other coloring strategies. - const double maxCornerAngle = 3.0; - for(msdf_atlas::GlyphGeometry & glyph : glyphs){ - glyph.edgeColoring(&msdfgen::edgeColoringInkTrap, maxCornerAngle, 0); - } - // TightAtlasPacker class computes the layout of the atlas. - msdf_atlas::TightAtlasPacker packer; - // Set atlas parameters: - // setDimensions or setDimensionsConstraint to find the best value - packer.setDimensionsConstraint(msdf_atlas::TightAtlasPacker::DimensionsConstraint::SQUARE); - // setScale for a fixed size or setMinimumScale to use the largest that fits - packer.setMinimumScale(24.0); - // setPixelRange or setUnitRange - packer.setPixelRange(2.0); - packer.setMiterLimit(1.0); - // Compute atlas layout - pack glyphs - packer.pack(glyphs.data(), glyphs.size()); - // Get final atlas dimensions - int width = 0, height = 0; - packer.getDimensions(width, height); - // The ImmediateAtlasGenerator class facilitates the generation of the atlas bitmap. - msdf_atlas::ImmediateAtlasGenerator < - float, // pixel type of buffer for individual glyphs depends on generator function - 3, // number of atlas color channels - & msdf_atlas::msdfGenerator, // function to generate bitmaps for individual glyphs - msdf_atlas::BitmapAtlasStorage // class that stores the atlas bitmap - // For example, a custom atlas storage class that stores it in VRAM can be used. - > generator(width, height); - // GeneratorAttributes can be modified to change the generator's default settings. - msdf_atlas::GeneratorAttributes attributes; - generator.setAttributes(attributes); - generator.setThreadCount(12); - // Generate atlas bitmap - generator.generate(glyphs.data(), glyphs.size()); - // The atlas bitmap can now be retrieved via atlasStorage as a BitmapConstRef. - // The glyphs array (or fontGeometry) contains positioning data for typesetting text. - success = submitAtlasBitmapAndLayout((msdfgen::BitmapConstRef )generator.atlasStorage(), - glyphs, - width, - height); - // Cleanup - msdfgen::destroyFont(font); - } - msdfgen::deinitializeFreetype(ft); - } - return success; -} +//bool ofxMsdfgen::generateAtlas(const char * fontFilename){ +//bool success = false; +//// Initialize instance of FreeType library +//if(msdfgen::FreetypeHandle * ft = msdfgen::initializeFreetype()){ +//// Load font file +//if(msdfgen::FontHandle * font = msdfgen::loadFont(ft, fontFilename)){ +//// Storage for glyph geometry and their coordinates in the atlas +//std::vector glyphs; +//// FontGeometry is a helper class that loads a set of glyphs from a single font. +//// It can also be used to get additional font metrics, kerning information, etc. +//msdf_atlas::FontGeometry fontGeometry(&glyphs); +//// Load a set of character glyphs: +//// The second argument can be ignored unless you mix different font sizes in one atlas. +//// In the last argument, you can specify a charset other than ASCII. +//// To load specific glyph indices, use loadGlyphs instead. +//fontGeometry.loadCharset(font, 1.0, msdf_atlas::Charset::ASCII); +//// Apply MSDF edge coloring. See edge-coloring.h for other coloring strategies. +//const double maxCornerAngle = 3.0; +//for(msdf_atlas::GlyphGeometry & glyph : glyphs){ +//glyph.edgeColoring(&msdfgen::edgeColoringInkTrap, maxCornerAngle, 0); +//} +//// TightAtlasPacker class computes the layout of the atlas. +//msdf_atlas::TightAtlasPacker packer; +//// Set atlas parameters: +//// setDimensions or setDimensionsConstraint to find the best value +//packer.setDimensionsConstraint(msdf_atlas::TightAtlasPacker::DimensionsConstraint::SQUARE); +//// setScale for a fixed size or setMinimumScale to use the largest that fits +//packer.setMinimumScale(24.0); +//// setPixelRange or setUnitRange +//packer.setPixelRange(2.0); +//packer.setMiterLimit(1.0); +//// Compute atlas layout - pack glyphs +//packer.pack(glyphs.data(), glyphs.size()); +//// Get final atlas dimensions +//int width = 0, height = 0; +//packer.getDimensions(width, height); +//// The ImmediateAtlasGenerator class facilitates the generation of the atlas bitmap. +//msdf_atlas::ImmediateAtlasGenerator < +//float, // pixel type of buffer for individual glyphs depends on generator function +//3, // number of atlas color channels +//& msdf_atlas::msdfGenerator, // function to generate bitmaps for individual glyphs +//msdf_atlas::BitmapAtlasStorage // class that stores the atlas bitmap +//// For example, a custom atlas storage class that stores it in VRAM can be used. +//> generator(width, height); +//// GeneratorAttributes can be modified to change the generator's default settings. +//msdf_atlas::GeneratorAttributes attributes; +//generator.setAttributes(attributes); +//generator.setThreadCount(12); +//// Generate atlas bitmap +//generator.generate(glyphs.data(), glyphs.size()); +//// The atlas bitmap can now be retrieved via atlasStorage as a BitmapConstRef. +//// The glyphs array (or fontGeometry) contains positioning data for typesetting text. +//success = submitAtlasBitmapAndLayout((msdfgen::BitmapConstRef )generator.atlasStorage(), +//glyphs, +//width, +//height); +//// Cleanup +//msdfgen::destroyFont(font); +//} +//msdfgen::deinitializeFreetype(ft); +//} +//return success; +//} -bool ofxMsdfgen::submitAtlasBitmapAndLayout(const msdfgen::BitmapConstRef & storage, - const std::vector & glyphs, - const int & width, - const int & height){ - const msdfgen::Bitmap bitmap(storage); - ofImage image; - toOfImage(bitmap, image); - image.save("atlas.png"); +//bool ofxMsdfgen::submitAtlasBitmapAndLayout(const msdfgen::BitmapConstRef & storage, +//const std::vector & glyphs, +//const int & width, +//const int & height){ +//const msdfgen::Bitmap bitmap(storage); +//ofImage image; +//toOfImage(bitmap, image); +//image.save("atlas.png"); - return true; -} +//return true; +//} diff --git a/src/ofxMsdfgen.h b/src/ofxMsdfgen.h index 08740a0..26562cc 100644 --- a/src/ofxMsdfgen.h +++ b/src/ofxMsdfgen.h @@ -1,20 +1,21 @@ #pragma once -#include "BitmapAtlasStorage.h" -#include "GlyphGeometry.h" +//#include "BitmapAtlasStorage.h" +//#include "GlyphGeometry.h" #include "ofMain.h" -#include "freetype2/freetype/freetype.h" -#include -#include "Atlas.h" +//#include FT_FREETYPE_H +//#include FT_MULTIPLE_MASTERS_H +//#include #include "conversion.h" +#include "Atlas.h" namespace ofxMsdfgen { -bool generateAtlas(const char * fontFilename); +//bool generateAtlas(const char * fontFilename); -// doesn't really do anything yet -// just saves the atlas as a png -bool submitAtlasBitmapAndLayout(const msdfgen::BitmapConstRef & storage, - const std::vector & glyphs, - const int & width, - const int & height); +//// doesn't really do anything yet +//// just saves the atlas as a png +//bool submitAtlasBitmapAndLayout(const msdfgen::BitmapConstRef & storage, +//const std::vector & glyphs, +//const int & width, +//const int & height); }