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

Reengineering efforts Kristín Fjóla Tómasdóttir & Joop Aué #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reengineering efforts Kristín Fjóla Tómasdóttir & Joop Aué #3

wants to merge 1 commit into from

Conversation

JoopAue
Copy link

@JoopAue JoopAue commented Apr 6, 2016

This PR contains one squashed commit containing our reengineering efforts for SRE.
For historic purposes the entire commit history was preserved.

commit 73e4601
Merge: bab8705 6930ea6
Author: Joop Aué [email protected]
Date: Wed Apr 6 14:50:10 2016 +0200

Merge pull request #6 from JoopAue/gl-render-maintainable

GLRender single responsibility and technical debt

commit 6930ea6
Author: Joop Aué [email protected]
Date: Tue Apr 5 15:16:55 2016 +0200

GLRenderer tests

commit e73b344
Merge: 8280e2b 4a944e5
Author: Joop Aué [email protected]
Date: Tue Apr 5 13:15:44 2016 +0200

Merge branch 'gl-render-maintainable' of github.com:JoopAue/jmonkeyengine into gl-render-maintainable

commit 8280e2b
Author: Joop Aué [email protected]
Date: Tue Apr 5 13:15:04 2016 +0200

Extracted method from the large method LoadCommonCapabilities in GLCapabilities

commit 4a944e5
Author: kristinfjola [email protected]
Date: Tue Apr 5 11:34:03 2016 +0200

Updated tests after GLRenderer and GLCapabilities refactor

commit d093aa8
Merge: f86a574 16c474d
Author: Joop Aué [email protected]
Date: Sun Apr 3 18:08:21 2016 +0200

Merge branch 'gl-render-maintainable' of github.com:JoopAue/jmonkeyengine into gl-render-maintainable

# Conflicts:
#   jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java

commit f86a574
Author: Joop Aué [email protected]
Date: Sun Apr 3 18:04:24 2016 +0200

Extracted capabilities class for renderer

commit 16c474d
Author: kristinfjola [email protected]
Date: Sun Apr 3 17:20:41 2016 +0200

Test loadCommonCapabilities

commit c7dba4b
Merge: 0e2c744 4592bb0
Author: kristinfjola [email protected]
Date: Sun Apr 3 16:22:04 2016 +0200

Merge branch 'gl-render-maintainable' of https://github.com/JoopAue/jmonkeyengine into gl-render-maintainable

commit 0e2c744
Merge: 1eaab97 f8682a3
Author: kristinfjola [email protected]
Date: Sun Apr 3 16:21:58 2016 +0200

More tests after loadCapabilities refactor

commit 4592bb0
Author: Joop Aué [email protected]
Date: Sun Apr 3 16:20:35 2016 +0200

Refactored loading of GLSL capabilities

- Fixed bug where versions below 400 that are not in the hardcoded list were just ignored.
- Applied same approach with mapping as with the loadCapabilities for GL.
- Refactored out the commonalities between the two.
-

commit 1eaab97
Author: kristinfjola [email protected]
Date: Sun Apr 3 15:56:09 2016 +0200

Tests for loadCapabilitiesGL2

commit f8682a3
Author: Joop Aué [email protected]
Date: Sun Apr 3 15:54:51 2016 +0200

Split loadCapabilities method into more useful methods

- Also got rid of an unneccesary complex nested if statement.

commit bab8705
Merge: 0dfeaa5 c17a08a
Author: Joop Aué [email protected]
Date: Sun Apr 3 12:57:14 2016 +0200

Merge pull request #5 from JoopAue/imageraster-cyclic

Imageraster cyclic

commit c17a08a
Author: kristinfjola [email protected]
Date: Sun Apr 3 12:54:16 2016 +0200

Fix comments

commit 1118cdf
Merge: 0495b8b 0dfeaa5
Author: kristinfjola [email protected]
Date: Sun Apr 3 12:14:50 2016 +0200

Merge conflicts

commit 0dfeaa5
Merge: 9873a76 0699d69
Author: Kristín Fjóla Tómasdóttir [email protected]
Date: Sun Apr 3 12:11:10 2016 +0200

Merge pull request #3 from JoopAue/application-input-DIP

Init input Application tests

commit 0699d69
Author: Joop Aué [email protected]
Date: Sun Apr 3 12:07:00 2016 +0200

Refactored to interface call

commit d0f787e
Author: Joop Aué [email protected]
Date: Sun Apr 3 11:00:14 2016 +0200

Application input refactor

- JmeContext implementations have a getInputs method. We did cause a duplicate, but solving this would lead to an explosive amount of refactoring, which we considered not useful in the course of this project with regard to our learning curve.
- Application now doesn't have knowledge about specific input types, but rather contains a list of inputs solving the DIP violation.
- initInput and destroyInput of the application were tested before and after refactoring and an additional setter method was created for testing purposes.
- The inputmanager has taken over the responsibility from the application to initialize the inputs as it manages the input.
- It contains a list of the inputs, which is somewhat redundant considering the additional separate fields for the input types like mouse and key. This can be refactored, but it requires a lot of changes to the inputmanager class, which is for another time.
- Updated some test applications to use the static properties of the keyinput, instead of the object properties.
-

commit 0495b8b
Author: kristinfjola [email protected]
Date: Sun Apr 3 10:45:33 2016 +0200

Remove cyclic dependencies between ImageRasters

Moved constructors in ImageRaster to DefaultImageRaster

commit 85ccf35
Author: Joop Aué [email protected]
Date: Thu Mar 24 15:28:57 2016 +0100

Init input Application tests

commit 9873a76
Merge: d770adb 04ac34c
Author: Kristín Fjóla Tómasdóttir [email protected]
Date: Thu Mar 24 15:50:35 2016 +0100

Merge pull request #1 from JoopAue/test-texture

Test texture

commit 04ac34c
Author: Joop Aué [email protected]
Date: Thu Mar 24 15:40:24 2016 +0100

Fix gitignore

commit dd7b7e6
Author: kristinfjola [email protected]
Date: Tue Mar 22 11:28:59 2016 +0100

Refactor for ImageRaster classes

Refactored DefaultImageRaster and MipMapImageRaster, common code moved to superclass ImageRaster

commit cfcf6a1
Author: kristinfjola [email protected]
Date: Mon Mar 21 22:42:41 2016 +0100

Tests for ImageRaster and refactorings for tests

Both DefaultImageRaster and MipMapImageRaster were refactored in order to be able to create tests for each class

commit ec47807
Author: Joop Aué [email protected]
Date: Mon Mar 21 21:29:44 2016 +0100

Texture2D refactor part 2
:

commit a7ce89c
Author: kristinfjola [email protected]
Date: Mon Mar 21 21:22:01 2016 +0100

DefaultImageRaster tests and refactor for tests

commit 71bf298
Author: Joop Aué [email protected]
Date: Mon Mar 21 16:50:47 2016 +0100

Abstracted away 2d Texture

Renamed Texture2D to TextureDefault2D and added an abstraction layer named Texture2D between Texture and TextureDefault2D and TextureArray

Signed-off-by: Joop Aué <[email protected]>

commit 124d53c
Author: Joop Aué [email protected]
Date: Mon Mar 21 16:34:55 2016 +0100

Texture3D abstraction layer

commit 810b58a
Author: Joop Aué [email protected]
Date: Mon Mar 21 16:18:34 2016 +0100

Refactor Texture3D -> TextureDefault3D

As we are adding an abstraction layer

commit f42243f
Author: Joop Aué [email protected]
Date: Mon Mar 21 15:27:11 2016 +0100

Removed duplicates in Texture.write() implementations

commit 79f5b57
Author: kristinfjola [email protected]
Date: Mon Mar 21 15:23:23 2016 +0100

Stop tracking local.properties

commit 766a294
Author: Joop Aué [email protected]
Date: Mon Mar 21 15:18:37 2016 +0100

Write tests for texture implementations

commit e180bfe
Author: Joop Aué [email protected]
Date: Mon Mar 21 12:27:20 2016 +0100

Texture write tests

commit cae204a
Author: kristinfjola [email protected]
Date: Thu Mar 17 23:33:55 2016 +0100

Refactor of equals

commit d3a64e5
Author: kristinfjola [email protected]
Date: Thu Mar 17 23:28:23 2016 +0100

Better refactor of getWrap and tests for equals

commit 2086ae1
Author: kristinfjola [email protected]
Date: Thu Mar 17 22:49:42 2016 +0100

Refactor for Texture.getWrap

commit 2db597c
Author: kristinfjola [email protected]
Date: Thu Mar 17 14:23:53 2016 +0100

Complete refactor of both setWrap methods

commit cab36b5
Author: kristinfjola [email protected]
Date: Thu Mar 17 11:24:11 2016 +0100

Tests for texture and beginning of refactor

commit d770adb
Merge: 10947e8 5e8248d
Author: Joop Aué [email protected]
Date: Thu Mar 24 15:31:23 2016 +0100

Merge pull request #2 from JoopAue/update-gitignore

Added IntelliJ, Eclipse and Sonar files to gitignore

commit 5e8248d
Author: kristinfjola [email protected]
Date: Thu Mar 24 15:29:08 2016 +0100

Added IntelliJ, Eclipse and Sonar files to gitignore

commit 73e4601
Merge: bab8705 6930ea6
Author: Joop Aué <[email protected]>
Date:   Wed Apr 6 14:50:10 2016 +0200

    Merge pull request #6 from JoopAue/gl-render-maintainable

    GLRender single responsibility and technical debt

commit 6930ea6
Author: Joop Aué <[email protected]>
Date:   Tue Apr 5 15:16:55 2016 +0200

    GLRenderer tests

commit e73b344
Merge: 8280e2b 4a944e5
Author: Joop Aué <[email protected]>
Date:   Tue Apr 5 13:15:44 2016 +0200

    Merge branch 'gl-render-maintainable' of github.com:JoopAue/jmonkeyengine into gl-render-maintainable

commit 8280e2b
Author: Joop Aué <[email protected]>
Date:   Tue Apr 5 13:15:04 2016 +0200

    Extracted method from the large method LoadCommonCapabilities in GLCapabilities

commit 4a944e5
Author: kristinfjola <[email protected]>
Date:   Tue Apr 5 11:34:03 2016 +0200

    Updated tests after GLRenderer and GLCapabilities refactor

commit d093aa8
Merge: f86a574 16c474d
Author: Joop Aué <[email protected]>
Date:   Sun Apr 3 18:08:21 2016 +0200

    Merge branch 'gl-render-maintainable' of github.com:JoopAue/jmonkeyengine into gl-render-maintainable

    # Conflicts:
    #	jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java

commit f86a574
Author: Joop Aué <[email protected]>
Date:   Sun Apr 3 18:04:24 2016 +0200

    Extracted capabilities class for renderer

commit 16c474d
Author: kristinfjola <[email protected]>
Date:   Sun Apr 3 17:20:41 2016 +0200

    Test loadCommonCapabilities

commit c7dba4b
Merge: 0e2c744 4592bb0
Author: kristinfjola <[email protected]>
Date:   Sun Apr 3 16:22:04 2016 +0200

    Merge branch 'gl-render-maintainable' of https://github.com/JoopAue/jmonkeyengine into gl-render-maintainable

commit 0e2c744
Merge: 1eaab97 f8682a3
Author: kristinfjola <[email protected]>
Date:   Sun Apr 3 16:21:58 2016 +0200

    More tests after loadCapabilities refactor

commit 4592bb0
Author: Joop Aué <[email protected]>
Date:   Sun Apr 3 16:20:35 2016 +0200

    Refactored loading of GLSL capabilities

    - Fixed bug where versions below 400 that are not in the hardcoded list were just ignored.
    - Applied same approach with mapping as with the loadCapabilities for GL.
    - Refactored out the commonalities between the two.
    -

commit 1eaab97
Author: kristinfjola <[email protected]>
Date:   Sun Apr 3 15:56:09 2016 +0200

    Tests for loadCapabilitiesGL2

commit f8682a3
Author: Joop Aué <[email protected]>
Date:   Sun Apr 3 15:54:51 2016 +0200

    Split loadCapabilities method into more useful methods

    - Also got rid of an unneccesary complex nested if statement.

commit bab8705
Merge: 0dfeaa5 c17a08a
Author: Joop Aué <[email protected]>
Date:   Sun Apr 3 12:57:14 2016 +0200

    Merge pull request #5 from JoopAue/imageraster-cyclic

    Imageraster cyclic

commit c17a08a
Author: kristinfjola <[email protected]>
Date:   Sun Apr 3 12:54:16 2016 +0200

    Fix comments

commit 1118cdf
Merge: 0495b8b 0dfeaa5
Author: kristinfjola <[email protected]>
Date:   Sun Apr 3 12:14:50 2016 +0200

    Merge conflicts

commit 0dfeaa5
Merge: 9873a76 0699d69
Author: Kristín Fjóla Tómasdóttir <[email protected]>
Date:   Sun Apr 3 12:11:10 2016 +0200

    Merge pull request #3 from JoopAue/application-input-DIP

    Init input Application tests

commit 0699d69
Author: Joop Aué <[email protected]>
Date:   Sun Apr 3 12:07:00 2016 +0200

    Refactored to interface call

commit d0f787e
Author: Joop Aué <[email protected]>
Date:   Sun Apr 3 11:00:14 2016 +0200

    Application input refactor

    - JmeContext implementations have a getInputs method. We did cause a duplicate, but solving this would lead to an explosive amount of refactoring, which we considered not useful in the course of this project with regard to our learning curve.
    - Application now doesn't have knowledge about specific input types, but rather contains a list of inputs solving the DIP violation.
    - initInput and destroyInput of the application were tested before and after refactoring and an additional setter method was created for testing purposes.
    - The inputmanager has taken over the responsibility from the application to initialize the inputs as it manages the input.
    - It contains a list of the inputs, which is somewhat redundant considering the additional separate fields for the input types like mouse and key. This can be refactored, but it requires a lot of changes to the inputmanager class, which is for another time.
    - Updated some test applications to use the static properties of the keyinput, instead of the object properties.
    -

commit 0495b8b
Author: kristinfjola <[email protected]>
Date:   Sun Apr 3 10:45:33 2016 +0200

    Remove cyclic dependencies between ImageRasters

    Moved constructors in ImageRaster to DefaultImageRaster

commit 85ccf35
Author: Joop Aué <[email protected]>
Date:   Thu Mar 24 15:28:57 2016 +0100

    Init input Application tests

commit 9873a76
Merge: d770adb 04ac34c
Author: Kristín Fjóla Tómasdóttir <[email protected]>
Date:   Thu Mar 24 15:50:35 2016 +0100

    Merge pull request #1 from JoopAue/test-texture

    Test texture

commit 04ac34c
Author: Joop Aué <[email protected]>
Date:   Thu Mar 24 15:40:24 2016 +0100

    Fix gitignore

commit dd7b7e6
Author: kristinfjola <[email protected]>
Date:   Tue Mar 22 11:28:59 2016 +0100

    Refactor for ImageRaster classes

    Refactored DefaultImageRaster and MipMapImageRaster, common code moved to superclass ImageRaster

commit cfcf6a1
Author: kristinfjola <[email protected]>
Date:   Mon Mar 21 22:42:41 2016 +0100

    Tests for ImageRaster and refactorings for tests

    Both DefaultImageRaster and MipMapImageRaster were refactored in order to be able to create tests for each class

commit ec47807
Author: Joop Aué <[email protected]>
Date:   Mon Mar 21 21:29:44 2016 +0100

    Texture2D refactor part 2
    :

commit a7ce89c
Author: kristinfjola <[email protected]>
Date:   Mon Mar 21 21:22:01 2016 +0100

    DefaultImageRaster tests and refactor for tests

commit 71bf298
Author: Joop Aué <[email protected]>
Date:   Mon Mar 21 16:50:47 2016 +0100

    Abstracted away 2d Texture

    Renamed Texture2D to TextureDefault2D and added an abstraction layer named Texture2D between Texture and TextureDefault2D and TextureArray

    Signed-off-by: Joop Aué <[email protected]>

commit 124d53c
Author: Joop Aué <[email protected]>
Date:   Mon Mar 21 16:34:55 2016 +0100

    Texture3D abstraction layer

commit 810b58a
Author: Joop Aué <[email protected]>
Date:   Mon Mar 21 16:18:34 2016 +0100

    Refactor Texture3D -> TextureDefault3D

    As we are adding an abstraction layer

commit f42243f
Author: Joop Aué <[email protected]>
Date:   Mon Mar 21 15:27:11 2016 +0100

    Removed duplicates in Texture.write() implementations

commit 79f5b57
Author: kristinfjola <[email protected]>
Date:   Mon Mar 21 15:23:23 2016 +0100

    Stop tracking local.properties

commit 766a294
Author: Joop Aué <[email protected]>
Date:   Mon Mar 21 15:18:37 2016 +0100

    Write tests for texture implementations

commit e180bfe
Author: Joop Aué <[email protected]>
Date:   Mon Mar 21 12:27:20 2016 +0100

    Texture write tests

commit cae204a
Author: kristinfjola <[email protected]>
Date:   Thu Mar 17 23:33:55 2016 +0100

    Refactor of equals

commit d3a64e5
Author: kristinfjola <[email protected]>
Date:   Thu Mar 17 23:28:23 2016 +0100

    Better refactor of getWrap and tests for equals

commit 2086ae1
Author: kristinfjola <[email protected]>
Date:   Thu Mar 17 22:49:42 2016 +0100

    Refactor for Texture.getWrap

commit 2db597c
Author: kristinfjola <[email protected]>
Date:   Thu Mar 17 14:23:53 2016 +0100

    Complete refactor of both setWrap methods

commit cab36b5
Author: kristinfjola <[email protected]>
Date:   Thu Mar 17 11:24:11 2016 +0100

    Tests for texture and beginning of refactor

commit d770adb
Merge: 10947e8 5e8248d
Author: Joop Aué <[email protected]>
Date:   Thu Mar 24 15:31:23 2016 +0100

    Merge pull request #2 from JoopAue/update-gitignore

    Added IntelliJ, Eclipse and Sonar files to gitignore

commit 5e8248d
Author: kristinfjola <[email protected]>
Date:   Thu Mar 24 15:29:08 2016 +0100

    Added IntelliJ, Eclipse and Sonar files to gitignore
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant