variablelab/ofxVariableLab
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nodes per layer and transform origin fixes

Browse source
This commit is contained in:
jrkb 2023-04-18 14:58:09 +02:00
parent 53f3b92e70
commit 7d4786d418
7 changed files with 112 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
src/GPUFontAtlasLayerCombo.cpp
View file

@ -6,6 +6,7 @@
#include "ofGraphics.h"
#include "ofRectangle.h"
#include "ofUtils.h"
#include "quaternion.hpp"
namespace ofxVariableLab {
@ -224,80 +225,15 @@ void GPUFontAtlasLayerCombo::draw(){
font->collectBoundingBoxes(layer->getVariationText(),
bb, bbs, advanceY,
true, layer->getProps().fontSize_px);
ofNode momNode;
ofNode node;
node.setParent(momNode);
glm::vec4 transformOrigin;
switch(layer->getProps().transformOrigin){
default:
case Layer::TransformOrigin::TOP_LEFT: {
node.move(glm::vec3(0,
ascender,
0));
momNode.rotateDeg(layer->getProps().rotation, glm::vec3(0, 0, 1));
transformOrigin = glm::vec4(layer->getProps().x,
layer->getProps().y - ascender,
0, 1);
momNode.move(transformOrigin);
break;
}
case Layer::TransformOrigin::TOP_RIGHT: {
float moveX = bb.p1.x - bb.p0.x;
node.move(glm::vec3(-moveX,
ascender,
0));
momNode.rotateDeg(layer->getProps().rotation, glm::vec3(0, 0, 1));
transformOrigin = glm::vec4(layer->getProps().x + moveX,
layer->getProps().y - ascender,
0, 1);
momNode.move(transformOrigin);
break;
}
case Layer::TransformOrigin::CENTER: {
float moveX = (bb.p2.x - bb.p0.x) * 0.5 + bb.p0.x;
float moveY = (bb.p2.y - bb.p0.y) * 0.5 - bb.p2.y;
node.move(glm::vec3(-moveX,
moveY,
0));
momNode.rotateDeg(layer->getProps().rotation, glm::vec3(0, 0, 1));
transformOrigin = glm::vec4(layer->getProps().x + moveX,
layer->getProps().y - moveY,
0, 1);
momNode.move(transformOrigin);
break;
}
case Layer::TransformOrigin::BOTTOM_LEFT: {
float moveY = ascender - advanceY;
node.move(glm::vec3(0,
moveY,
0));
momNode.rotateDeg(layer->getProps().rotation, glm::vec3(0, 0, 1));
transformOrigin = glm::vec4(layer->getProps().x,
layer->getProps().y - moveY,
0, 1);
momNode.move(transformOrigin);
break;
}
case Layer::TransformOrigin::BOTTOM_RIGHT: {
float moveY = ascender - (advanceY);
float moveX = (bb.p2.x - bb.p0.x);
node.move(glm::vec3(-moveX,
moveY,
0));
momNode.rotateDeg(layer->getProps().rotation, glm::vec3(0, 0, 1));
transformOrigin = glm::vec4(layer->getProps().x + moveX,
layer->getProps().y - moveY,
0, 1);
momNode.move(transformOrigin);
break;
}
}
bb.multiply(node.getGlobalTransformMatrix());
getAndApplyTransformOrigin(transformOrigin,
layer->getOuterNode(),
layer->getInnerNode(),
bb,
ascender,
advanceY,
layer->getProps());
bb.multiply(layer->getInnerNode().getGlobalTransformMatrix());
ofVboMesh mesh;
mesh.addVertices({bb.p0, bb.p1, bb.p2, bb.p3,
glm::vec4(layer->getProps().x, layer->getProps().y, 0, 1),
@ -313,7 +249,7 @@ void GPUFontAtlasLayerCombo::draw(){
});
outerBoundingBoxes.push_back(mesh);
font->collectVerticesAndIndices(node,
font->collectVerticesAndIndices(layer->getInnerNode(),
bbs,
vertices,
indices,
@ -350,4 +286,74 @@ void GPUFontAtlasLayerCombo::draw(){
, 20, 20);
}
void GPUFontAtlasLayerCombo::getAndApplyTransformOrigin(glm::vec4 & transformOrigin,
ofNode & momNode,
ofNode & node,
const ofxGPUFont::Font::BoundingBox & bb,
const float ascender,
const float advanceY,
const Layer::Props & props){
switch(props.transformOrigin){
default:
case Layer::TransformOrigin::TOP_LEFT: {
node.setPosition(glm::vec3(0,
ascender,
0));
transformOrigin = glm::vec4(props.x,
props.y - ascender,
0, 1);
break;
}
case Layer::TransformOrigin::TOP_RIGHT: {
float moveX = bb.p1.x - bb.p0.x;
node.setPosition(glm::vec3(-moveX,
ascender,
0));
transformOrigin = glm::vec4(props.x + moveX,
props.y - ascender,
0, 1);
break;
}
case Layer::TransformOrigin::CENTER: {
float moveX = (bb.p2.x - bb.p0.x) * 0.5 + bb.p0.x;
float moveY = (bb.p2.y - bb.p0.y) * 0.5 - bb.p2.y;
node.setPosition(glm::vec3(-moveX,
moveY,
0));
transformOrigin = glm::vec4(props.x + moveX,
props.y - moveY,
0, 1);
break;
}
case Layer::TransformOrigin::BOTTOM_LEFT: {
float moveY = ascender - advanceY;
node.setPosition(glm::vec3(0,
moveY,
0));
transformOrigin = glm::vec4(props.x,
props.y - moveY,
0, 1);
break;
}
case Layer::TransformOrigin::BOTTOM_RIGHT: {
float moveY = ascender - (advanceY);
float moveX = (bb.p2.x - bb.p0.x);
node.setPosition(glm::vec3(-moveX,
moveY,
0));
transformOrigin = glm::vec4(props.x + moveX,
props.y - moveY,
0, 1);
break;
}
}
momNode.setOrientation(glm::quat(1, 0, 0, 0));
momNode.rotateDeg(props.rotation, glm::vec3(0, 0, 1));
momNode.setPosition(transformOrigin);
}
}

8
src/GPUFontAtlasLayerCombo.h
View file

@ -10,6 +10,7 @@
#endif
namespace ofxVariableLab {
struct GPUFontAtlasLayerComboSettings : public AtlasLayerComboSettings {
int gpuTextureOffset = 0;
};
@ -55,6 +56,13 @@ class GPUFontAtlasLayerCombo : public AtlasLayerCombo {
return glm::lookAt(glm::vec3(0, 0, distance), glm::vec3(0, 0, 0), glm::vec3(0, 1, 0)) * glm::mat4(rotation) * translation;
}
};
void getAndApplyTransformOrigin(glm::vec4 & transformOrigin,
ofNode & momNode,
ofNode & node,
const ofxGPUFont::Font::BoundingBox & bb,
const float ascender,
const float advanceY,
const Layer::Props & props);
public:
void setup(const ComboIdentifier & identifier,
AtlasLayerComboSettings settings = GPUFontAtlasLayerComboSettings()) override;

7
src/GPUFontLayer.cpp
View file

@ -15,6 +15,7 @@ void GPUFontLayer::setup(const LayerSettings & settings){
id = "layer-" + ofToString(Layer::n_layers);
n_layers++;
}
innerNode.setParent(outerNode);
}
void GPUFontLayer::update(){
@ -99,6 +100,12 @@ const Layer::Props & GPUFontLayer::getProps() const {
const glm::vec4 & GPUFontLayer::getColor() const {
return color;
}
ofNode & GPUFontLayer::getOuterNode(){
return outerNode;
}
ofNode & GPUFontLayer::getInnerNode(){
return innerNode;
}
void GPUFontLayer::clearPropsBuffer(){
propsBuffer.clear();
}

4
src/GPUFontLayer.h
View file

@ -43,6 +43,8 @@ class GPUFontLayer : public Layer {
void isWithNewMom() override;
const ComboIdentifier & getMomsComboIdentifier() const override;
void setMomsComboIdentifier(const ComboIdentifier & identifier) override;
ofNode & getOuterNode() override;
ofNode & getInnerNode() override;
const vector <ofxGPUFont::GlyphIdentity> & getVariationText();
@ -65,5 +67,7 @@ class GPUFontLayer : public Layer {
bool notHappyWithMom = false;
LayerType type = GPUFONT;
glm::vec4 color;
ofNode outerNode;
ofNode innerNode;
};
}

2
src/Layer.h
View file

@ -81,6 +81,8 @@ class Layer {
virtual void isWithNewMom() = 0;
virtual const ComboIdentifier & getMomsComboIdentifier() const = 0;
virtual void setMomsComboIdentifier(const ComboIdentifier & identifier) = 0;
virtual ofNode & getOuterNode() = 0;
virtual ofNode & getInnerNode() = 0;
static int n_layers;
};
}

7
src/MsdfLayer.cpp
View file

@ -13,6 +13,7 @@ void MsdfLayer::setup(const LayerSettings & settings){
id = "layer-" + ofToString(Layer::n_layers);
n_layers++;
}
innerNode.setParent(outerNode);
}
void MsdfLayer::update(){
@ -298,6 +299,12 @@ const ComboIdentifier & MsdfLayer::getMomsComboIdentifier() const {
void MsdfLayer::setMomsComboIdentifier(const ComboIdentifier & identifier){
momsComboIdentifier = identifier;
}
ofNode & MsdfLayer::getOuterNode(){
return outerNode;
}
ofNode & MsdfLayer::getInnerNode(){
return innerNode;
}
void MsdfLayer::setAtlas(shared_ptr <ofxMsdfgen::Atlas> _atlas){
atlas = _atlas;
// TODO: this does not seem proper

4
src/MsdfLayer.h
View file

@ -36,6 +36,8 @@ class MsdfLayer : public Layer {
void isWithNewMom() override;
const ComboIdentifier & getMomsComboIdentifier() const override;
void setMomsComboIdentifier(const ComboIdentifier & identifier) override;
ofNode & getOuterNode() override;
ofNode & getInnerNode() override;
void setAtlas(shared_ptr <ofxMsdfgen::Atlas> _atlas);
shared_ptr <ofxMsdfgen::Atlas> getAtlas() const;
@ -56,5 +58,7 @@ class MsdfLayer : public Layer {
ComboIdentifier momsComboIdentifier;
LayerType type = MSDFGEN;
glm::vec4 color;
ofNode outerNode;
ofNode innerNode;
};
}