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

PBRT Docker Support #63

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

PBRT Docker Support #63

wants to merge 16 commits into from

Conversation

tlian7
Copy link

@tlian7 tlian7 commented Nov 17, 2015

These changes allow users to specify a dockerFlag and run PBRT in a docker container. A dockerized version for PBRT-spectral can be found here: https://hub.docker.com/r/vistalab/pbrt/. When running the docker version, files must be copied over to a single directory.

tlian7 and others added 9 commits September 11, 2015 11:15
…u run PBRT, 2) Outputs and saves an "oi" object when rendering with PBRT, and 3) Passes parameters needed to make the oi structure to PBRT2OI (doesn't work with conditions right now)


# By Ben Heasly
# Via Ben Heasly
* 'master' of https://github.com/DavidBrainard/RenderToolbox3:
  New example scene renders textures without mappings file.
  PBRT Collada importer supports materials with diffuse and specular textures.
  Revise Collada "clean up" to permit materials with diffuse and specular textures.
  import assets for collada texture demo
  Better reporting of compared vs skipped file pairs.
  Tolerate when compared images have different spectral depths.
  working mexopts.sh for Xcode 6.4 and Matlab 2014b
  Update Mitsuba plugin "bump" now called "bumpmap"
  All example scenes use explicit light spectra to avoid RGB promotion.
  Allow PBRT to read spectral planes up to a limit, instead of all planes.
  Explicit illuminant spectrum for point light. This is necessary because the point light was automatically imported with an RGB spectrum, and Mitsuba changed its default spectral promotion for RGB spectra.
  Utility for viewing exr-image slices.
  PBRT spectral sampling with 32 bands.
  Small typo

Conflicts:
	Admin/mexopts/XCode-6.4-Matlab-2014b/mexopts.sh
	ExampleScenes/ColladaTexture/MakeColladaTexture.m
	Utilities/ReadMultispectralEXR/ReadMultichannelEXR/MakeReadMultichannelEXR.m
@@ -103,7 +103,19 @@
map.right.value = fileInfo.resolvedPath;

if ~fileInfo.isRootFolderMatch
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. I like what you did here. I think copying files to the resource folder could be useful in other cases as well. Would you be interested in making this a separate behavior, independent of the renderer or Docker?

We could define a separate hint like copyResources. Then it could be

if hints.copyResources

instead of

if(hints.dockerFlag == 0 || strcmp(hints.renderer,'Mitsuba'))

A downside would be that docker users would have to remember to set the value of this new flag. But I think it would be worth it to gain a nice, modular behavior.

Nicolas Cottaris and others added 7 commits December 1, 2015 17:55
by adding camera widthToHeightAspectRatio parameter to the generateCameraType method.
…box3

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
Synced with RenderToolbox3/RenderToolbox3
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.

2 participants