-
Notifications
You must be signed in to change notification settings - Fork 7
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
v0.7 #19
Open
cmalmstr
wants to merge
73
commits into
omimo:v0.7
Choose a base branch
from
mysunnytime:v0.7
base: v0.7
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
v0.7 #19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
php-file changed to HTML, no code change
Enables animation
Finish the interface of Movement Clip Selection Panel (layout).
Started work on a script to convert the positional data to angle data for the joints in the body part. Not finished
about angleData.js
Added more joints in the input, needed for calculating coordinate system
Put everything in it's correct functions and created the main function calculate which converts position data arrays to angle data arrays. Added comments throughout
extract user option from guy and get the takeAPosition&takeBPosition.
# Conflicts: # js/angleData.js
pass testing
Added div id=visCont that is placed on top of other divs in content
Added new motion tracks in html and folders. The joint indexes from these tracks are updated in the mocom for the left arm. Also some minor debugging in angle calculations
Now the calculations of angles should be correct. Made the code more efficient by placing some redundant code in new functions. Also changed the input so that each joint is just a simple array instead of an object with x, y and z properties. It just made it more difficult when using the vector calculations.
1. add loader when enter, remove loader when loaded successful; 2. change loader into gif; 3. add closer to close the window; 4. change visCont (htlm) to make visCont paralleled to canCont.
Finished the structure for the visualization window
# Conflicts: # css/style.css # index.html
…al css for styling the visualization elements The original styles.css was getting quite large so I figured a separate one might be nice. Maybe move the d3 script somewhere else later? Still need to connect to the real data and add function for determining the color
…ctures in createvisOverview Still a bit to go. Need to add calculations for speed and acceleration along with y-scales for this data
# Conflicts: # js/mocom.js
1. delete the border of overview skeleton; 2. add highlighted joint when hover; 3. add labels to visualizations 4. debug overview
1. add titles 2. change colors
move labels of multiples upwards
Removed ../ at beginning of img source links and removed unneccesary files
Removed copyright and changed name to MoComp
1. get back copyright info; 2. trigger mocomp tab when enter
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Test