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.

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

Proposed update to ofRectangle::scaleTo - now with more scaling modes. #1513

Merged
merged 26 commits into from Oct 1, 2012

Commits on Aug 27, 2012

  1. Updates to ofRectangle::ScaleIntoMe.

    Now ofRectangle::ScaleToMe.  
    More scaling options via ofRectScaleMode.
    bakercp committed Aug 27, 2012
    Copy the full SHA
    ff269ed View commit details
    Browse the repository at this point in the history
  2. Added the missing offset.

    bakercp committed Aug 27, 2012
    Copy the full SHA
    424c914 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2012

  1. Copy the full SHA
    75157db View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2012

  1. Copy the full SHA
    f495e81 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2012

  1. Merge branch 'develop' of git://github.com/openframeworks/openFramewo…

    …rks into ofRectangle_Additions
    bakercp committed Sep 3, 2012
    Copy the full SHA
    27116e7 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2012

  1. Copy the full SHA
    c6fedd3 View commit details
    Browse the repository at this point in the history
  2. Added alignment enums, both vert and horz. The alignment enum values …

    …are based on Qt and could, if desired, be combined into a single bit-wise combined alignment flag.
    bakercp committed Sep 5, 2012
    Copy the full SHA
    c4ca2c8 View commit details
    Browse the repository at this point in the history
  3. Updates / Additions:

    - x/y are now references to an underlying ofPoint
      for easier ofPoint/ofVec manipulations of an ofRectangl.
      (addresses issue openframeworks#821 by @danomatika)
    - Added setters for x/y/width/height/position (vec)
    - Changed the variable names on translateXXX to dx/dy (delta x/y)
    - Added translateX, translateY
    - Added scaleWidth / scaleHeight for independent control.
    - changed scaleToMe to simply be scaleTo.
      + remove personal pronoun.
      + Scales itself, rather than returning the scaled version of another ofRectangle.
    - Added scaleTo functions that are more generic, using the new ofAspectRatioMode.
      + This allows more flexible scaling with alternate alignments.
      + Overridden functions provide easier access w/o changing defaults.
    - Added alignTo functions that now work with the new ofAlignHorz and ofAlignVert enums.
      + contain functions for aligning to other rects, points, and a single value,
        based on a the anchor.
    - Moved the overridden operators to the bottom of the implementation file / header.
    - Added getLeft()/getRight()/getTop()/getBottom().
      + since our ofRectangle class supports negative width/height, these offer
        more intuitive interaction with known edges.
    - Added getHorzAnchor() / getVertAnchor() to get edges by using the new alignment enums.  Throws errors if the alignment enums are invalid.
    - getPosition and getPositionRef added.
    - Moved getCenter() to live with the other getters.
    bakercp committed Sep 5, 2012
    Copy the full SHA
    0b8e7a0 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    52fdb59 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'develop' of git://github.com/openframeworks/openFramewo…

    …rks into ofRectangle_Additions
    bakercp committed Sep 5, 2012
    Copy the full SHA
    a3809a7 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2012

  1. Added -

        ofPoint getTopLeft() const;
        ofPoint getTopRight() const;
        ofPoint getBottomLeft() const;
        ofPoint getBottomRight() const;
    bakercp committed Sep 6, 2012
    Copy the full SHA
    6fa4c05 View commit details
    Browse the repository at this point in the history
  2. Added `intersects()/inside()/growToInclude() functions for lines. Add…

    …resses openframeworks#1568.  To do much more with lines, we need a `ofLine` - or `ofLineSegment` to make returns easier.  For instances, `ofLineSegment ofRectangle::getIntersection(const ofLineSegment& line);`
    bakercp committed Sep 6, 2012
    Copy the full SHA
    e858e9b View commit details
    Browse the repository at this point in the history
  3. Minor formatting cleanup.

    bakercp committed Sep 6, 2012
    Copy the full SHA
    2f38970 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2012

  1. Merge branch 'develop' of git://github.com/openframeworks/openFramewo…

    …rks into ofRectangle_Additions
    bakercp committed Sep 10, 2012
    Copy the full SHA
    3ffd7fc View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2012

  1. Merge branch 'develop' of git://github.com/openframeworks/openFramewo…

    …rks into ofRectangle_Additions
    bakercp committed Sep 13, 2012
    Copy the full SHA
    a2de58f View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2012

  1. Merge branch 'develop' of git://github.com/openframeworks/openFramewo…

    …rks into ofRectangle_Additions
    bakercp committed Sep 25, 2012
    Copy the full SHA
    6bae362 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2012

  1. Copy the full SHA
    b1bf170 View commit details
    Browse the repository at this point in the history
  2. All references to OF_RECTSCALEMODE… now OF_SCALEMODE… Variables in th…

    …e example are changed to match.
    bakercp committed Sep 26, 2012
    Copy the full SHA
    d368320 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    0f97801 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2012

  1. Copy the full SHA
    46ef0be View commit details
    Browse the repository at this point in the history
  2. Removing all auto-standardization. Rectangle origin x/y and the signs…

    … of the dimensions width/height will never be implicitly modified during member method execution, with the single exception of the explicit `standardize` methods.
    bakercp committed Oct 1, 2012
    Copy the full SHA
    09e0a8a View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    241fc50 View commit details
    Browse the repository at this point in the history
  4. Typo fix in the note.

    bakercp committed Oct 1, 2012
    Copy the full SHA
    763b5b8 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    8e25e4b View commit details
    Browse the repository at this point in the history
  6. More typo fixes.

    bakercp committed Oct 1, 2012
    Copy the full SHA
    2b05526 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    e1b00be View commit details
    Browse the repository at this point in the history