Skip to content

Add Proper License to com.jme3.anim files - #1359

Merged
stephengold merged 10 commits into
masterfrom
unknown repository
May 9, 2020
Merged

Add Proper License to com.jme3.anim files#1359
stephengold merged 10 commits into
masterfrom
unknown repository

Conversation

@ghost

@ghost ghost commented Apr 22, 2020

Copy link
Copy Markdown

In order to chip away at this issue, #1001
I've added the proper jME license to the Anim files written by @Nehon (or at least the ones that he committed to, excluding the ones by pspeed which already have the new licenses) .
Now in the previous discussion on that issue, it seemed as if @stephengold was attempting to contact nehon to get his permission. If Nehon replies, then we'll follow from there, but if he doesn't, I say that since he contributed as an engine leader, it would be fine to go ahead and add the licenses.

ItsMike54 added 3 commits April 22, 2020 12:24
ItsMike54
Update Weights.java
c8c7026
ItsMike54
Update SkinningControl.java
28daacb
ItsMike54
Update SeparateJointModelTransform.java (#2)
abba5d4 
* Update SeparateJointModelTransform.java

* Update MorphControl.java

* Update MatrixJointModelTransform.java

* Update Joint.java

* Update ArmatureMask.java

* Update Armature.java

* Update AnimationMask.java

* Update AnimTrack.java

* Update AnimComposer.java

* Update AnimClip.java

* Update Weighted.java

* Update Primitives.java

* Update JointModelTransform.java

* Update HasLocalTransform.java

* Update AnimMigrationUtils.java

* Update ContainsTweens.java

* Update LinearBlendSpace.java

* Update ClipAction.java

* Update BlendableAction.java

* Update BlendSpace.java

* Update BlendAction.java

* Update BaseAction.java

* Update Action.java
stephengold
stephengold reviewed Apr 22, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/SkinningControl.java
stephengold
stephengold reviewed Apr 22, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/AnimTrack.java Outdated
stephengold
stephengold reviewed Apr 22, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/ArmatureMask.java Outdated
stephengold
stephengold reviewed Apr 22, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/MatrixJointModelTransform.java Outdated
stephengold
stephengold reviewed Apr 22, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/SeparateJointModelTransform.java Outdated
@ghost

ghost commented Apr 22, 2020

Copy link
Copy Markdown
Author

@stephengold , simply remove those headers then? Or try to find their author?

stephengold
stephengold reviewed Apr 22, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/Weights.java Outdated
stephengold
stephengold reviewed Apr 22, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/tween/ContainsTweens.java Outdated
stephengold
stephengold reviewed Apr 22, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/tween/action/Action.java Outdated
stephengold
stephengold reviewed Apr 22, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/tween/action/BaseAction.java Outdated
@stephengold

stephengold commented Apr 22, 2020

Copy link
Copy Markdown
Member

@stephengold , simply remove those headers then? Or try to find their author?

I don't know what to do with these files. Their style matches Nehon's, so I'm 90% sure he wrote them. But he's the only person who knows for sure, and as I said, he hasn't responded to my inquiries. Perhaps someone else will have better luck contacting him.

@ghost

ghost commented Apr 22, 2020 •
edited by ghost
Loading

Copy link
Copy Markdown
Author

Well assumptions bite me in the ass, and I'll remove those right now.
Edit: Done

ItsMike54
Update AnimTrack.java (#3)
9f84a13 
* Update AnimTrack.java

* Update ArmatureMask.java

* Update MatrixJointModelTransform.java

* Update SeparateJointModelTransform.java

* Update Weights.java

* Update Action.java

* Update BaseAction.java

* Update ContainsTweens.java

* Update SkinningControl.java
stephengold
stephengold reviewed Apr 24, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/AnimTrack.java
stephengold
stephengold reviewed Apr 24, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/tween/action/BlendAction.java Outdated
stephengold
stephengold reviewed Apr 24, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/tween/action/BlendSpace.java Outdated
stephengold
stephengold reviewed Apr 24, 2020
View reviewed changes
Comment thread jme3-core/src/main/java/com/jme3/anim/tween/action/BlendableAction.java Outdated
ItsMike54 added 2 commits April 24, 2020 12:45
ItsMike54
Update AnimTrack.java (#6)
a2f5c7a 
* Update AnimTrack.java

* Update BlendAction.java

* Update BlendSpace.java

* Update BlendableAction.java
ItsMike54
Update AnimMigrationUtils.java (#7)
936f09d 
* Update AnimMigrationUtils.java

* Update HasLocalTransform.java

* Update JointModelTransform.java

* Update Primitives.java

* Update Weighted.java

* Update ClipAction.java

* Update AnimInterpolator.java

* Update AnimInterpolators.java

* Update FrameInterpolator.java
@ghost

ghost commented Apr 24, 2020

Copy link
Copy Markdown
Author

@stephengold , I went ahead and reviewed the files, removing all that Nehon didn't expressly state his authorship in. I did add licenses to some that I missed previously that he did state authorship of.

@stephengold

stephengold commented Apr 24, 2020

Copy link
Copy Markdown
Member

Please take another look at LinearBlendSpace.java

@ghost

ghost commented Apr 24, 2020

Copy link
Copy Markdown
Author

Obviously I can't seem to make a perfect PR just yet, but LinearBlendSpace.java is fixed.

@stephengold

stephengold commented May 8, 2020

Copy link
Copy Markdown
Member

As far as I can tell, this PR just needs the one-line change to AnimTrack.java and then it will be ready to merge.

@ItsMike54 have you abandoned this PR?

@ghost

ghost commented May 9, 2020 •
edited by ghost
Loading

Copy link
Copy Markdown
Author

@stephengold Over the past week I've been trying to make progress on a game and I don't have much time to do so, so I abandoned this PR for that time.
But since it was brought up again, I reverted the AnimTrack.java interface back to its original state before I modified it.

@stephengold

stephengold commented May 9, 2020

Copy link
Copy Markdown
Member

It's not back to its original state.

@ghost

ghost commented May 9, 2020

Copy link
Copy Markdown
Author

@stephengold , I deleted the AnimTrack.java from my branch and uploaded the AnimTrack.java interface that is currently on Master jME branch. That file is completely unmodified, and I don't know what else to say about it.

@stephengold
stephengold merged commit f808187 into jMonkeyEngine:master May 9, 2020
@stephengold stephengold added this to the v3.4.0 milestone Mar 13, 2021
@stephengold stephengold added the Documentation Issues that affect the Wiki, Javadoc or any other form of documentation label Mar 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Documentation Issues that affect the Wiki, Javadoc or any other form of documentation

Projects

None yet

Milestone

v3.4.0

Development

Successfully merging this pull request may close these issues.

1 participant

@stephengold