Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Labeling Basic Example #73

Merged
merged 101 commits into from
Oct 12, 2018
Merged

Labeling Basic Example #73

merged 101 commits into from
Oct 12, 2018

Conversation

anne-gropler
Copy link
Collaborator

@anne-gropler anne-gropler commented Jun 7, 2018 •
edited
Loading

Hello World Example for a Labels.

For this, I hijacked the testrenderer.

Right now you should see various labels: three labels in 3D and one in 2D (navigate using mouse to better see the difference).

cgcostume and others added 28 commits April 6, 2018 16:07
@cgcostume
add font face
d3dfef3
@cgcostume
refine font face, add glyph object
d34d48f
@cgcostume
quicksave
63258de
@cgcostume
refine typesetter
901f7c8
@anne-gropler
GlyphSequence was renamed to Label, so update comments
662fa62
@anne-gropler
initial commit: hijacked the testrenderer (now using LabelRender)
4973426
@anne-gropler
stripped-down glyph shaders
b4a834a
@anne-gropler
fix: precision for float
634f9b7
@anne-gropler
added fontloader; untested
8485777
@anne-gropler
use fontloader; ToDo: copy source/data to build/data when installing
61b69ff
@anne-gropler
load font in onInitialize
668f679
@anne-gropler
WIP: trying to typeset a label
aa5a43d
@anne-gropler
Hello Glyph Texture!
3b5b4c7
@anne-gropler
WIPcommit. idea: gather all vertex data in labelgeometry.
99ed0cb
@anne-gropler
WIP: typesetting seems to work, tex coords don't
622678c
@anne-gropler
WIP: changed image loading, still not working (stays black)
1899fb1
@anne-gropler
texture coordinates seem right now.
fbb905c
@anne-gropler
removed codes in comments
549c57b
@anne-gropler
introduced camera, fixes aspect ratio
dd7cb94
@anne-gropler
Deleted outdated comments. No functional changes.
57b8270
@anne-gropler
build: copy data dir
0342bf2
@anne-gropler
WIP: draw arrays instanced; still not working
5536ae0
@anne-gropler
fixed: draw arrays instanced.
52ae73d
@anne-gropler
doc; cleaned up unused / unnecessary code
d7a343c
@anne-gropler
avoid division by zero when converting from vec4 to vec3
6ffbff6
@anne-gropler
3D-label, kind of. usertransform doesn't work yet
a897ab8
@anne-gropler
fix: transform for multiple labels (still seem kind of stretched)
1851cd0
@anne-gropler
deleted unused+duplicated+commented code.
22b6df3
@anne-gropler anne-gropler changed the title [WIP] Labeling Basic Example Labeling Basic Example Jun 29, 2018
@anne-gropler anne-gropler self-assigned this Oct 10, 2018
cgcostume
cgcostume reviewed Oct 10, 2018
View reviewed changes
source/fontloader.ts Outdated Show resolved Hide resolved
source/fontloader.ts Show resolved Hide resolved
source/fontloader.ts Outdated Show resolved Hide resolved
source/fontloader.ts Outdated Show resolved Hide resolved
source/gl-matrix-extensions.ts Show resolved Hide resolved
source/shaders/glyphquad.vert Outdated Show resolved Hide resolved
source/typesetter.ts Show resolved Hide resolved
source/typesetter.ts Outdated Show resolved Hide resolved
source/position3dlabel.ts Outdated Show resolved Hide resolved
source/webgl-operate.ts Show resolved Hide resolved
@anne-gropler anne-gropler mentioned this pull request Oct 11, 2018
Closed
@cgcostume cgcostume merged commit 4fb5322 into cginternals:master Oct 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bwasty bwasty bwasty left review comments

@cgcostume cgcostume cgcostume approved these changes

Assignees

@anne-gropler anne-gropler

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@anne-gropler @coveralls @bwasty @cgcostume