Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: d3alek/Texample2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Scriptgate/Texample2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 78 files changed
  • 1 contributor

Commits on Jan 25, 2017

  1. Migrated project to gradle

    Scriptgate committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    ab630be View commit details
    Browse the repository at this point in the history
  2. Added the .idea folder to gitignore. Gradle project shouldn't depend …

    …on Intellij's (Android Studios'?) project structure
    Scriptgate committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    fbc62b6 View commit details
    Browse the repository at this point in the history
  3. - General formatting

    - Removed some hungarion notations
    - Added some static imports
    - Simplified some code and removed comments
    - Added braces and made fields private
    Scriptgate committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    f44e686 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2017

  1. General:

     - Converted methods comments into javadoc
     - Removed redundant comments
    BatchTextProgram:
      - Extract vertex and fragment shaders to glsl files
    RawResourceReader:
     - Created a class to read glsl files to String
    Scriptgate committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    05fc9ba View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2017

  1. GLText:

     - Moved null check on program to a static method to instantiate BatchTextProgram
     - Removed redundant comments
     - Made variable names more explicit
     - Changed method comments into javadoc
    Scriptgate committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    abcb82c View commit details
    Browse the repository at this point in the history
  2. Program:

     - Moved methods in Utilities to Program
    GLText:
     - Trying to minimize the load method by extracting code to methods
    SpriteBatch:
     - Created an inner class Vertex to remove some code duplication
    Triangle:
     - The triangle class was unused, removing it to focus on font rendering
    Vertices:
     - Comments to javadoc
    Scriptgate committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    a85d0a7 View commit details
    Browse the repository at this point in the history
  3. GLText: SpriteBatch:

     - Extracted method
    Removed unused Utilities class
    Scriptgate committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    7477597 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2017

  1. Rearranged packages, trying to extract the text domain from the neces…

    …sary Android classes to run the example.
    
    By moving the remaining classes to a separate package and making them package private it is obvious GLText is our main domain class.
    It also contains a lot of code, so next I'll experiment with splitting up instantiation logic from rendering logic etc.
    
    AndroidManifest:
     - Removed debuggable=true as per Android Studio warning
     - Removed uses-sdk, this is defined in the build.gradle
    build.gradle:
     - Incremented API version to 22, git gud scrubs
    Scriptgate committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    15c280f View commit details
    Browse the repository at this point in the history
  2. Reverting last change, seemed to result in some unexplained read exce…

    …ptions, resulting in the AVD crashing.
    
    This change is less intrusive, moving the domain classes into a separate package and making them all package local except GLText
    Scriptgate committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    34c3b71 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2017

  1. GLText:

     - Made CHAR_BATCH_SIZE private, it was used in SpriteBatch to intialize the mvpMatrices array, moved that to the constructor since CHAR_BATCH_SIZE is passed as maxSprites paramter
     - Replaced static factory method with static builder
     - Rearranged some methods
    Texample2:
     - Moved GLSurfaceView implementation to its separate class: Texample2SurfaceView
    Texample2Renderer:
     - Moved division of width and height to the drawTexture method, since it is used inside the method to draw the texture centered
    Scriptgate committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    39a3414 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2017

  1. - Moved some variables around to make the initialisation methods stat…

    …eless. This makes them easier to move to GLTextBuilder.
    
    - Moved fontHeight, fontAscent and fontDescent into a separate FontMetrics class
    - Moved assets to GLTextBuilder, passing Typeface instead
    Scriptgate committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    c61c315 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

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

Commits on Feb 11, 2017

  1. Moved textureId, textureSize and textureRgn, charRgn, rowCnt and colC…

    …nt into a separate FontTexture class
    Scriptgate committed Feb 11, 2017
    Configuration menu
    Copy the full SHA
    782e6dc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6d4259e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1935463 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2017

  1. Font:

     - Removed hungarian notation
     - Removed redundant comments
     - Using StreamSupport to use streams and still have backwards compatibility with lower APIs
     - Rewrote comments to javadoc
     - Inlined redundant variables
    FontTexture:
     - Removed redundant comments
     - Renamed some variables
    Scriptgate committed Feb 13, 2017
    Configuration menu
    Copy the full SHA
    b926d30 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2017

  1. Font:

     - Moved charWidths and charWidthMax into a FontCharacters inner class
     - Removed unused methods
     - Experimenting with a builder pattern for drawing
    Scriptgate committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    12dae4a View commit details
    Browse the repository at this point in the history
  2. Moving some methods around

    Scriptgate committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    c93c9f0 View commit details
    Browse the repository at this point in the history
  3. Removed dependency on Program from domain. Created a new FontProgram …

    …value object to hold the program handles used by Font
    Scriptgate committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    52b9ecf View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2017

  1. FontProgram:

     - Added support for AttributeVariable
    UniformVariable:
     - similar to AttributeVariable, used in conjunction with glGetUniformLocation
    Program:
     - moved logic in init method to constructor
     - removed initialized field variable
    Scriptgate committed Mar 5, 2017
    Configuration menu
    Copy the full SHA
    da41cdc View commit details
    Browse the repository at this point in the history
Loading