-
-
Notifications
You must be signed in to change notification settings - Fork 146
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Initial work for GlyphString editing and extensible data path #36
Open
syntelos
wants to merge
11
commits into
sgothel:master
Choose a base branch
from
syntelos:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…es for position and selection
…reate to GlyphString constructor; change AffineTransform clone method return type from Object to AffineTransform
Conflicts: src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java src/jogl/classes/jogamp/graph/curve/text/GlyphString.java src/jogl/classes/jogamp/graph/font/FontInt.java src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
Not sure why my diffs are so ugly.. in one case i dropped mangled CR characters which could do that.. (sorry) The only real change aside from a basic merge is getPaths(String) to getPaths(CharSequence) -- (mod to Rami's change from getOutline in support of a new meaning for getOutline). |
Conflicts: src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java src/jogl/classes/com/jogamp/graph/curve/Region.java src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java src/jogl/classes/com/jogamp/graph/geom/Outline.java src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
Conflicts: src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sven,
I think the commit logs tell the story. I'm going to take a break and get back to this in a couple days to wrap up the remainder of the StringBuilder API to append to the CharSequence API -- as documented in GlyphString.
(Not sure if we discussed the github account name subject, thought about it and would prefer to change it -- i've got an organization going that's simple and reflects lessons learned from [email protected]).
All comments most welcome,
John