-
Notifications
You must be signed in to change notification settings - Fork 124
Use Imath bindings from PyIlmBase #672
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
Merged
Merged
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
6925133
BoxAlgo : Add BoxAlgo namespace
johnhaddon c7cab50
BoxAlgo : Add split and contains functions
johnhaddon e77adad
IECore : Move Random.h to RandomAlgo.h and add namespace
johnhaddon 0c54814
IECore : Remove import *
johnhaddon 061ffa1
Remove Color3d/Color4d data types
johnhaddon 877c24c
SConstruct : Add PYTHONPATH argument
johnhaddon 947405b
Remove Imath bindings
johnhaddon 4f30dc8
DataTraits : Remove isMatrixTypeData
johnhaddon b1bbf81
9to10 : Add fixes for IECore->imath transition
johnhaddon ae40e2b
IECore module : Use imath
johnhaddon dbaac40
IECore tests : Use Imath
johnhaddon e09456f
IECoreImage tests : Use imath
johnhaddon 0606ec8
IECoreScene : Remove PointsExpressionOp
johnhaddon 04467e1
IECoreScene : Use imath
johnhaddon 0327cdf
IECoreScene tests : Use imath
johnhaddon cf5e0fd
IECoreMaya tests : Update for imath
johnhaddon a419fa4
IECoreAlembic tests : Update to use imath module
johnhaddon 0e0745c
IECoreGL tests : Use imath
johnhaddon f09122b
SimpleTypedDataBinding : Reorder bindings to fix Color3fData extraction
johnhaddon fa25927
IECoreUSD tests : Update for imath module
johnhaddon 3b844cc
IECoreArnold tests : Update to use imath module
johnhaddon 562052f
IECoreAppleseed tests : Update to use imath module
johnhaddon a640305
IECoreHoudini : Update to use imath module
johnhaddon 4f4813c
IECoreNuke : Update to use imath module
johnhaddon 446b648
IE config : Add path to imath module
johnhaddon f2a4112
Travis : Use prepackaged dependencies from GafferHQ
johnhaddon 2e74d51
IECore module : Bind `repr()`
johnhaddon 15730b0
IECoreBinding : Simplify repr() for empty boxes
johnhaddon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| ########################################################################## | ||
| # | ||
| # Copyright (c) 2017, Image Engine Design Inc. All rights reserved. | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions are | ||
| # met: | ||
| # | ||
| # * Redistributions of source code must retain the above copyright | ||
| # notice, this list of conditions and the following disclaimer. | ||
| # | ||
| # * Redistributions in binary form must reproduce the above copyright | ||
| # notice, this list of conditions and the following disclaimer in the | ||
| # documentation and/or other materials provided with the distribution. | ||
| # | ||
| # * Neither the name of Image Engine Design nor the names of any | ||
| # other contributors to this software may be used to endorse or | ||
| # promote products derived from this software without specific prior | ||
| # written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS | ||
| # IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
| # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
| # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
| # PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
| # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
| # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| # | ||
| ########################################################################## | ||
|
|
||
| import os | ||
| import re | ||
| import sys | ||
| import glob | ||
| import shutil | ||
| import urllib | ||
|
|
||
| # Download and unpack the prebuilt dependency package. We use the packages | ||
| # for Gaffer, since we know they also include everything needed by Cortex, | ||
| # and we don't want to maintain multiple packages (one is enough of a pain | ||
| # already). | ||
|
|
||
| platform = "osx" if sys.platform == "darwin" else "linux" | ||
| downloadURL = "https://github.com/GafferHQ/dependencies/releases/download/0.42.0.0/gafferDependencies-0.42.0.0-" + platform + ".tar.gz" | ||
| dependenciesDir = "dependencies" | ||
|
|
||
| sys.stderr.write( "Downloading dependencies \"%s\"" % downloadURL ) | ||
| tarFileName, headers = urllib.urlretrieve( downloadURL ) | ||
|
|
||
| os.makedirs( dependenciesDir ) | ||
| os.system( "tar xf %s -C %s --strip-components=1" % ( tarFileName, dependenciesDir ) ) | ||
|
|
||
| # Remove all Cortex related files from the package, so there is no conflict | ||
| # with the files generated by our build. | ||
|
|
||
| for pattern in [ | ||
| "include/IECore*", | ||
| "lib/libIECore*", | ||
| "python/IECore*", | ||
| "arnold", | ||
| "renderMan", | ||
| "procedurals", | ||
| ] : | ||
| for f in glob.glob( os.path.join( dependenciesDir, pattern ) ) : | ||
| if os.path.isdir( f ) : | ||
| shutil.rmtree( f ) | ||
| else : | ||
| os.remove( f ) |
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A bit funny that it's named generically but only used for tests. Don't we add
TEST_to other variables like that. Are you thinking of using it outside the tests as well?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wasn't sure which way to go, but it seemed plausible that we'd use it for other things, and I thought having a matching set of CPPPATH, LIBPATH and PYTHONPATH made sense. Not particularly attached to it though if you feel strongly about it.