Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
3e21908
Bring in BL current and history
mattloper Jul 11, 2014
9145ca8
Removed contexts/setup.py
mattloper Jul 12, 2014
b0f0ae4
Added num_channels to renderers. Colored renderer can now have that s…
mattloper Jul 14, 2014
84bc00f
lighting.py: added lambertian spotlight
mattloper Jul 15, 2014
8cc590f
Add generated stuff in contexts to .gitignore
algrs Jul 19, 2014
2c1b0ed
Switch to strict relative imports.
algrs Jul 19, 2014
b291e06
Replaced "assertTrue" with "assertGreater"/"assertLess" so we know ho…
mattloper Jul 19, 2014
9406134
loosened unit tests slightly for linux
mattloper Jul 19, 2014
12b544e
more loosening of unit tests for linux
mattloper Jul 19, 2014
0ff6c80
lighting.py: added camcoord option for lambertian spotlight
mattloper Jul 22, 2014
31bbe1d
topology.py: support non-watertight meshes
mattloper Jul 28, 2014
a2373a8
util_tests.py: fixed for __array_priority__ change
mattloper Jul 29, 2014
90025c0
Added fields to setup (like "description") and added README.txt
mattloper Jul 23, 2014
03df9d1
Makefile: added upload option
mattloper Jul 23, 2014
39667cd
setup.py: require chumpy >= .51
mattloper Jul 23, 2014
a0aa109
Attempt to fix cythonize problems for pip install
mattloper Jul 23, 2014
e47a8a0
Moved tests into main dir, to get rid of relative import madness.
mattloper Jul 23, 2014
cb9d4b7
Incremented version for pipy upload.
mattloper Jul 23, 2014
369d6ab
renderer.py: Added overdraw=True as default for BoundaryRenderer
mattloper Jul 23, 2014
2286686
setup.py: incremented version
mattloper Jul 23, 2014
8963b58
added matplotlib as a req, so that demos will run.
mattloper Jul 25, 2014
15d5a33
setup.py: added more information for pypi
mattloper Jul 26, 2014
a08f98c
README.txt: fixed some markdown
mattloper Jul 26, 2014
b5637e1
Don't compile mesa on mac, add cvwrap in case opencv isn't available,…
mattloper Aug 26, 2014
2880eae
Actually do what I meant to do in last commit
mattloper Aug 26, 2014
fd34422
Updated to make pyramids work with greyscale (ie renderer.num_channel…
mattloper Aug 28, 2014
64bdd86
__init__.py: updated demo('optimization') example
mattloper Aug 28, 2014
d8b15ce
test_renderer.py: fix import
mattloper Aug 28, 2014
2d3b7b2
Merge branch 'ml_master'
algrs Feb 24, 2015
cbf05de
Add double sided rendering to LambertianPointLight.
algrs Feb 24, 2015
7a89ea4
Fix to prev
algrs Feb 24, 2015
2861d82
Leave no pdb unturned
algrs Feb 25, 2015
d803386
Implement ProjectPoints.compute_r without calling cv2.projectPoints w…
Apr 21, 2015
99a126d
fix for tests
Apr 21, 2015
53c6de5
Failing test that changes to ProjectPoints didn't change anything
algrs Apr 21, 2015
b64493e
Return squeezed R for backward compatibility
Apr 27, 2015
7e0961e
Loosened tests slightly for buildbot
algrs May 18, 2015
8c61bdd
Remove monkey patch to setuptools that appears to no longer be necessary
algrs Jul 6, 2015
c521273
removed superflous copy operation in camera.unproject_points
Jul 24, 2015
aedc1e9
Merge mattloper into master
algrs Nov 12, 2015
ee00ad1
Fix bad zip downloads during install PR #1
Mar 17, 2016
c39ccf9
Fix of unit test bug PR #2
Mar 18, 2016
1a37333
Test in CircleCI (#4)
paulmelnikow May 30, 2016
479a143
Fix dependencies in setup.py and keep version consistent and RELEASE …
sonnyhu May 31, 2016
ca23ab6
Don't build until after dependencies are installed (#6)
paulmelnikow Jun 2, 2016
96675e6
Update chumpy (#7)
dlsmith Aug 1, 2016
9fbe867
relax requirement versions
algrs Apr 11, 2017
0785446
update to newest chumpy
algrs Apr 11, 2017
4414aa5
use more recent scipy in chumpy
algrs Apr 11, 2017
f5bf6a7
Fix tests in circle (#9)
algrs Apr 18, 2017
f2f11dc
use pypi chumpy
algrs Apr 26, 2017
270294d
Merge remote-tracking branch 'upstream/master'
algrs May 10, 2017
8eea8ab
Make pip installable
algrs May 10, 2017
ac12251
fix some lint
algrs May 10, 2017
9be7c09
fix more lint
algrs May 10, 2017
e01d7c4
fix more lint
algrs May 11, 2017
0173844
pylint disable in autogened _constants
algrs May 11, 2017
9687106
install chumpy from pypi in travis
algrs May 11, 2017
3ee98db
preinstall numpy and scipy in travis
algrs May 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,14 @@ coverage.xml
# Sphinx documentation
docs/_build/

contexts/OSMesa.Darwin.x86_64.zip
contexts/OSMesa/
contexts/_constants.py
contexts/_functions.pyx
contexts/ctx_mac.c
contexts/ctx_mesa.c
venv
opendr/contexts/OSMesa.Darwin.x86_64.zip
opendr/contexts/OSMesa/
opendr/contexts/_constants.py
opendr/contexts/_functions.pyx
opendr/contexts/ctx_mac.c
opendr/contexts/ctx_mesa.c
venv
/bodylabs-python-style/

.DS_Store

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq python-dev gfortran python-opencv pkg-config liblapack-dev
- pip install --upgrade pip
- pip install Cython
- travis_wait pip install git+git://github.com/mattloper/chumpy.git
- pip install numpy scipy Cython
- pip install chumpy
install:
- pip install -r requirements.txt
script: make test
File renamed without changes.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
global-include . *.py *.c *.h Makefile nasa* *.pyx
prune contexts/OSMesa
prune opendr/contexts/OSMesa
global-exclude . rogrenderer*

19 changes: 16 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
opendr
======
Testing.
The OpenDR (or Open Differentiable Renderer) can be used for rendering and optimisation to image evidence.

- Rendering is achieved by constructing and initialising one of the renderers available in OpenDR.
- Optimization is achieved by minimising an objective that includes a renderer.

OpenDR is useful even without optimisation: if you just wish to animate meshes over time without performing optimisation, OpenDR may still be a good choice for rendering those meshes to images offscreen, for later compilation into a movie.

OpenDR is also designed to be concise: it should not take many lines of code to construct a scene. Although it will not replace dedicated commercial platforms (such as Maya) for some tasks, it is flexible enough for many tasks, and in some cases goes beyond what Maya can offer.

OpenDR comes with its own demos, which can be seen by typing the following::

>> import opendr
>> opendr.demo() # prints out a list of possible demos

Licensing is specified in the attached LICENSE.txt.

16 changes: 0 additions & 16 deletions README.txt

This file was deleted.

70 changes: 70 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
$style_config_version = '2.1.0'

desc "Install style config"
task :install_style_config do
FileUtils.rm_rf "bodylabs-python-style" if Dir.exists? "bodylabs-python-style"
raise unless system "git clone https://github.com/bodylabs/bodylabs-python-style.git"
Dir.chdir 'bodylabs-python-style' do
raise unless system "git checkout tags/#{$style_config_version}"
end
end

task :require_style_config do
Rake::Task[:install_style_config].invoke unless File.executable? 'bodylabs-python-style/bin/pylint_test'
end

$mac_os = `uname -s`.strip == 'Darwin'

desc "Install dependencies for distribution"
task :install_dist do
if $mac_os
raise unless system "brew update"
raise unless system "brew install pandoc"
raise unless system "pip install pypandoc"
else
puts
puts "You must install:"
puts
puts " - pandoc"
puts " - pypandoc"
puts
raise
end
end

def command_is_in_path?(command)
system("which #{ command} > /dev/null 2>&1")
end

task :test do
raise unless system "nose2"
end

task :lint => :require_style_config do
raise unless system "bodylabs-python-style/bin/pylint_test opendr --min_rating 10.0"
end

desc "Remove .pyc files"
task :clean do
system "find . -name '*.pyc' -delete"
end

task :sdist do
unless command_is_in_path? 'pandoc'
puts
puts "Please install pandoc."
puts
raise
end
raise unless system "python setup.py sdist"
end

task :upload do
unless command_is_in_path?('pandoc')
puts
puts "Please install pandoc."
puts
raise
end
raise unless system "python setup.py sdist upload"
end
22 changes: 22 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
general:
branches:
ignore:
- /zz.*/ # Don't run tests on deprecated branches.

machine:
environment:
PYTHONPATH: /usr/local/lib/python2.7/dist-packages

dependencies:
pre:
- sudo apt-get update
# Is gfortran needed? This was copied from `.travis.yml` which included it.
- sudo apt-get install -qq python-dev gfortran pkg-config liblapack-dev
- pip install numpy scipy cython
- pip install -r requirements_dev.txt
- pip install -e .

test:
override:
- rake test
- rake lint
84 changes: 0 additions & 84 deletions contexts/draw_triangle_shaders_2_1.py

This file was deleted.

17 changes: 0 additions & 17 deletions contexts/fix_warnings.py

This file was deleted.

29 changes: 0 additions & 29 deletions everything.py

This file was deleted.

Loading