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

Commits on Apr 6, 2018

  1. add font face

    @cgcostume
    cgcostume committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    d3dfef3 View commit details
    Browse the repository at this point in the history

  2. refine font face, add glyph object

    @cgcostume
    cgcostume committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    d34d48f View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2018

  1. quicksave

    @cgcostume
    cgcostume committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    63258de View commit details
    Browse the repository at this point in the history

Commits on May 10, 2018

  1. refine typesetter

    @cgcostume
    cgcostume committed May 10, 2018
    Configuration menu
    Copy the full SHA
    901f7c8 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. GlyphSequence was renamed to Label, so update comments

    @anne-gropler
    anne-gropler committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    662fa62 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2018

  1. initial commit: hijacked the testrenderer (now using LabelRender)

    @anne-gropler
    anne-gropler committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    4973426 View commit details
    Browse the repository at this point in the history

  2. stripped-down glyph shaders

    @anne-gropler
    anne-gropler committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    b4a834a View commit details
    Browse the repository at this point in the history

  3. fix: precision for float

    @anne-gropler
    anne-gropler committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    634f9b7 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2018

  1. added fontloader; untested

    @anne-gropler
    anne-gropler committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    8485777 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. use fontloader; ToDo: copy source/data to build/data when installing

    @anne-gropler
    anne-gropler committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    61b69ff View commit details
    Browse the repository at this point in the history

  2. load font in onInitialize

    @anne-gropler
    anne-gropler committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    668f679 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. WIP: trying to typeset a label

    @anne-gropler
    anne-gropler committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    aa5a43d View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. Hello Glyph Texture!

    @anne-gropler
    anne-gropler committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    3b5b4c7 View commit details
    Browse the repository at this point in the history

  2. WIPcommit. idea: gather all vertex data in labelgeometry.

    @anne-gropler
    anne-gropler committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    99ed0cb View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. WIP: typesetting seems to work, tex coords don't

    @anne-gropler
    anne-gropler committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    622678c View commit details
    Browse the repository at this point in the history

  2. WIP: changed image loading, still not working (stays black)

    @anne-gropler
    anne-gropler committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    1899fb1 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2018

  1. texture coordinates seem right now.

    @anne-gropler
    anne-gropler committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    fbb905c View commit details
    Browse the repository at this point in the history

  2. removed codes in comments

    @anne-gropler
    anne-gropler committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    549c57b View commit details
    Browse the repository at this point in the history

  3. introduced camera, fixes aspect ratio

    @anne-gropler
    anne-gropler committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    dd7cb94 View commit details
    Browse the repository at this point in the history

  4. Deleted outdated comments. No functional changes.

    @anne-gropler
    anne-gropler committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    57b8270 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2018

  1. build: copy data dir

    @anne-gropler
    anne-gropler committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    0342bf2 View commit details
    Browse the repository at this point in the history

  2. WIP: draw arrays instanced; still not working

    @anne-gropler
    anne-gropler committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    5536ae0 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2018

  1. fixed: draw arrays instanced.

    @anne-gropler
    anne-gropler committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    52ae73d View commit details
    Browse the repository at this point in the history

  2. doc; cleaned up unused / unnecessary code

    @anne-gropler
    anne-gropler committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    d7a343c View commit details
    Browse the repository at this point in the history

  3. avoid division by zero when converting from vec4 to vec3

    @anne-gropler
    anne-gropler committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    6ffbff6 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2018

  1. 3D-label, kind of. usertransform doesn't work yet

    @anne-gropler
    anne-gropler committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    a897ab8 View commit details
    Browse the repository at this point in the history

  2. fix: transform for multiple labels (still seem kind of stretched)

    @anne-gropler
    anne-gropler committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    1851cd0 View commit details
    Browse the repository at this point in the history

  3. deleted unused+duplicated+commented code.

    @anne-gropler
    anne-gropler committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    22b6df3 View commit details
    Browse the repository at this point in the history

  4. font color black, different example transform.

    @anne-gropler
    anne-gropler committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    0d2462a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into openll

    @anne-gropler
    anne-gropler committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    56958a5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into openll

    @anne-gropler
    anne-gropler committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    c250c33 View commit details
    Browse the repository at this point in the history

  7. format new line

    @anne-gropler
    anne-gropler committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    b0fad3a View commit details
    Browse the repository at this point in the history

  8. merge fix: wizard precision byte

    @anne-gropler
    anne-gropler committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    1fe0e06 View commit details
    Browse the repository at this point in the history

  9. another merge fix: bad merged lines (syntax error)

    @anne-gropler
    anne-gropler committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    42f00eb View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2018

  1. Rename LabelGeometry.ts to labelgeometry.ts

    @anne-gropler
    anne-gropler committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    5366de9 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2018

  1. refactoring

    @anne-gropler
    anne-gropler committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    61f80fa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into openll

    @anne-gropler
    anne-gropler committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    8dec555 View commit details
    Browse the repository at this point in the history

  3. refactoring: fetchAsync+Promise instead of raw xmlhttp

    @anne-gropler
    anne-gropler committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    bda4ae4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into openll

    @anne-gropler
    anne-gropler committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    2902ba4 View commit details
    Browse the repository at this point in the history

  5. export labeling classes

    @bwasty
    bwasty authored and Benjamin Wasty committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    197bca6 View commit details
    Browse the repository at this point in the history

  6. updated changes from testrenderer to labelrenderer

    @anne-gropler
    anne-gropler committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    81c4ad8 View commit details
    Browse the repository at this point in the history

  7. comment/doc about frame resizes that affect labels using pt sizes (as… 

    … font size or as threshold for readability)
    @anne-gropler
    anne-gropler committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    5faa581 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1 from bwasty/openll_bw 

    Export labeling classes
    @anne-gropler
    anne-gropler committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    484764f View commit details
    Browse the repository at this point in the history

  9. using Promise less archaic and verbose.

    @anne-gropler
    anne-gropler committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    59dba23 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2018

  1. load fontFace completely asynchronously using Promises

    @anne-gropler
    anne-gropler committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    c3ceaf5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into openll

    @anne-gropler
    anne-gropler committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    232d6e0 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. Merge pull request #2 from cginternals/master 

    update to 0.3.8 from head fork
    @anne-gropler
    anne-gropler committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    8953207 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into openll

    @anne-gropler
    anne-gropler committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    c489bc3 View commit details
    Browse the repository at this point in the history

  3. fix: label scale was bad. plus: navigation!

    @anne-gropler
    anne-gropler committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    509aef6 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2018

  1. userTransform for label

    @anne-gropler
    anne-gropler committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    c22fd5d View commit details
    Browse the repository at this point in the history

  2. fix: line anchor was not applied to the last glyph of each label

    @anne-gropler
    anne-gropler committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    5efe053 View commit details
    Browse the repository at this point in the history

  3. missing return typedefs

    @anne-gropler
    anne-gropler committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    6850c12 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2018

  1. different units possible for font size (world and px)

    @anne-gropler
    anne-gropler committed Aug 20, 2018
    Configuration menu
    Copy the full SHA
    f7c28c5 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2018

  1. label stores its current extent

    @anne-gropler
    anne-gropler committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    d27d99c View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2018

  1. deleted unused code (POLYGON_OFFSET_FILL)

    @anne-gropler
    anne-gropler committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    13c0fe5 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2018

  1. warn if not all required keys were provided by font file

    @anne-gropler
    anne-gropler committed Sep 11, 2018
    Configuration menu
    Copy the full SHA
    d9e30f8 View commit details
    Browse the repository at this point in the history

  2. fix comment

    @anne-gropler
    anne-gropler committed Sep 11, 2018
    Configuration menu
    Copy the full SHA
    7f41f11 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2018

  1. WIP: created new class

    @anne-gropler
    anne-gropler committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    7db0c97 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2018

  1. Position2Dlabel ready to use

    @anne-gropler
    anne-gropler committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    4c5184f View commit details
    Browse the repository at this point in the history

  2. fix: order of applied transforms for 2D label

    @anne-gropler
    anne-gropler committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    850f918 View commit details
    Browse the repository at this point in the history

  3. fix: direction for position2dlabel now uses signed angles; 

    fix: cannot assign SpaceUnit.World to position2dlabel anymore
    @anne-gropler
    anne-gropler committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    abd645b View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2018

  1. typo fix

    @anne-gropler
    anne-gropler committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    600b532 View commit details
    Browse the repository at this point in the history

  2. Label in 3D space implemented, following the example of the OpenLL API

    @anne-gropler
    anne-gropler committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    ef18084 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2018

  1. documentation; removed unused code

    @anne-gropler
    anne-gropler committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    ca2800e View commit details
    Browse the repository at this point in the history

  2. fix: z-coordinate for 3D-Label was ignored

    @anne-gropler
    anne-gropler committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    1cb2cf2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into openll

    @cgcostume
    cgcostume committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    52020da View commit details
    Browse the repository at this point in the history

  4. Update pugconfig.js

    @cgcostume
    cgcostume committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    7e76c93 View commit details
    Browse the repository at this point in the history

  5. Update pugconfig.js

    @cgcostume
    cgcostume committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    9568e0a View commit details
    Browse the repository at this point in the history

  6. Update gl-matrix-extensions.ts

    @cgcostume
    cgcostume committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    848d8e5 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2018

  1. documentation of FontLoader, WIP: refactoring

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    2654bf6 View commit details
    Browse the repository at this point in the history

  2. log instead of console

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    a5dc2ab View commit details
    Browse the repository at this point in the history

  3. rename: setBearing --> bearingFromFontBaseAndOffset

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    8cc2904 View commit details
    Browse the repository at this point in the history

  4. for of --> forEach

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    09ad802 View commit details
    Browse the repository at this point in the history

  5. fix: logIfs had bad condition

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    1cb501a View commit details
    Browse the repository at this point in the history

  6. documentation for idea on how to treat multiple glyph atlas pages

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    f87879b View commit details
    Browse the repository at this point in the history

  7. // --> /* */

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    16afadd View commit details
    Browse the repository at this point in the history

  8. use path module instead of homebrew function

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    f45b10a View commit details
    Browse the repository at this point in the history

  9. error handling for when not all mandatory keys are provided

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    a326c59 View commit details
    Browse the repository at this point in the history

  10. shorter try-catch block and more early-returns for fontloader loading… 

    …-steps
    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    26d5127 View commit details
    Browse the repository at this point in the history

  11. removed unused code

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    cc8e2b9 View commit details
    Browse the repository at this point in the history

  12. template strings for identifier naming

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    97f8fb6 View commit details
    Browse the repository at this point in the history

  13. renaming: tan --> tangent; and alike.

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    a5138ee View commit details
    Browse the repository at this point in the history

  14. renaming: data --> texCoords

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    01b8983 View commit details
    Browse the repository at this point in the history

  15. explicitly todo added

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    443abfe View commit details
    Browse the repository at this point in the history

  16. documentation

    @anne-gropler
    anne-gropler committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    aca8dcc View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2018

  1. useful error handling for fontloader's Promises

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    516c74d View commit details
    Browse the repository at this point in the history

  2. console.warn --> log(LogLevel.Warning, ...)

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    9ed6b96 View commit details
    Browse the repository at this point in the history

  3. doc refinement

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    16bd403 View commit details
    Browse the repository at this point in the history

  4. constructor for GlyphVertices

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    7d8face View commit details
    Browse the repository at this point in the history

  5. doc

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    fcd0cbf View commit details
    Browse the repository at this point in the history

  6. comment line breaks

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    38e6dc7 View commit details
    Browse the repository at this point in the history

  7. doc for label class

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    8d23039 View commit details
    Browse the repository at this point in the history

  8. doc for labelgeometry

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    0c5b0ac View commit details
    Browse the repository at this point in the history

  9. assert for webgl extension requirement

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    6972569 View commit details
    Browse the repository at this point in the history

  10. doc for labelrenderer

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    df919b3 View commit details
    Browse the repository at this point in the history

  11. floating point notation for non integer semantic

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    6404aeb View commit details
    Browse the repository at this point in the history

  12. don't discard invisible glyph fragments

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    c684b4c View commit details
    Browse the repository at this point in the history

  13. format

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    f1a79f4 View commit details
    Browse the repository at this point in the history

  14. doc for typesetter

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    eda05c1 View commit details
    Browse the repository at this point in the history

  15. MAD optimization in shader + doc

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    f3b26b6 View commit details
    Browse the repository at this point in the history

  16. format; remove double-assignment

    @anne-gropler
    anne-gropler committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    8d80773 View commit details
    Browse the repository at this point in the history