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

Elliptic cylinder. #8

Merged
merged 1 commit into from
Feb 13, 2017
Merged

Elliptic cylinder. #8

merged 1 commit into from
Feb 13, 2017

Conversation

dav-m85
Copy link
Contributor

@dav-m85 dav-m85 commented Jan 29, 2017

As requested in joostn/OpenJsCad#89, @kaosat-dev, @z3dev :)

Here's how it goes:

check the PR you want to backport and find out the commits you need, here:

f5a339de9278

Clone the commiters repo (the commit is obviously there), and then run format-patch:

git format-patch -1 f5a339d
# 0001-Elliptic-cylinder.patch

Open your own csg.js fork, checkout a new branch from master and :

# Check you can safely apply the patch
git apply --check 0001-Elliptic-cylinder.patch

If you got an error, you'll need to fiddle with the patch by editing it. I attach the original patch and edited here: Archive.zip.
I basically removed the "-" lines that removes something that is not in the original file, then changes the line number to match the new csg structure.

git apply --check 0002-Elliptic-cylinder.patch
# No errors !
git checkout -b elliptic_cylinder
# --signoff option to register who did the patch adaptation job ;)
git am --signoff < 0002-Elliptic-cylinder.patch
git push origin elliptic_cylinder

There's maybe a better way for doing this, but that's the best I know.

Construct a elliptic cylinder. This new function is a clone of a simple
cylinder with small alterations. It is best to keep this type of
cylinder in separate function. This is my first commit to this
repository so please review this. Hope this new shape can be useful

Signed-off-by: David Moreau <dav.m85@gmail.com>
@kaosat-dev
Copy link
Contributor

awesome , thanks @dav-m85 I am keeping those explanations around, thanks a lot , that will come in handy !

@kaosat-dev kaosat-dev merged commit dd02f9e into jscad:master Feb 13, 2017
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.

3 participants