diff --git a/README.md b/README.md index ff73d90..5091fb8 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# BSDF Viewer +# BSDF Processor ## Overview -BSDF Viewer is an application for interactive visualization of BSDF (bidirectional scattering distribution function). -The target users of BSDF Viewer are engineers and researchers investigating the measured reflection and transmission data. -BSDF Viewer can load data files and provides 3D plots, real-time rendering of 3D models, table view and so on. +BSDF Processor is an application for interactive visualization of BSDF (bidirectional scattering distribution function). +The target users of BSDF Processor are engineers and researchers investigating the measured reflection and transmission data. +BSDF Processor can load data files and provides 3D plots, real-time rendering of 3D models, table view and so on. Basic functions are implemented using [libbsdf][1]. -**BSDF Viewer can load the following formats:** +**BSDF Processor can load the following formats:** Format | Extension | Measured Data | -------|---------------------------------|-----| @@ -16,7 +16,7 @@ LightTools BSDF | .bsdf | | ASTM E1392-96(2002) | .astm | [Cornell University][7] | MERL BRDF | .binary | [MERL][8] | -**BSDF Viewer can export the following formats:** +**BSDF Processor can export the following formats:** Format | Extension -------|--------------------------------- @@ -25,24 +25,24 @@ Integra Diffuse Distribution | .ddr, .ddt ### Gallery #### Screenshots

-  -  - +  +  +

#### Movie [![mov](http://img.youtube.com/vi/AJXpTs0InYc/mqdefault.jpg)](https://youtu.be/AJXpTs0InYc) ### License -BSDF Viewer is licensed under the terms of the Mozilla Public License, version 2.0. +BSDF Processor is licensed under the terms of the Mozilla Public License, version 2.0. See the LICENSE file. ### Download Windows (32bit): -[BSDFViewer-1.0.3-windows-x86.zip][6] +[BSDFProcessor-1.1.2-windows-x86.zip][6] -## Building BSDF Viewer -BSDF Viewer uses the following open source libraries: +## Building BSDF Processor +BSDF Processor uses the following open source libraries: * [libbsdf][1] * [Eigen 3][2] @@ -64,7 +64,7 @@ Search paths for libraries are set through CMake variables: `LIBBSDF_DIR`, `OSG_ [3]: http://www.openscenegraph.org "OpenSceneGraph" [4]: http://www.qt.io "Qt" [5]: http://www.integra.jp/en "Integra" -[6]: https://raw.githubusercontent.com/wiki/KimuraRyo/BSDFViewer/binaries/BSDFViewer-1.0.3-windows-x86.zip +[6]: https://raw.githubusercontent.com/wiki/KimuraRyo/BSDFProcessor/binaries/BSDFProcessor-1.1.2-windows-x86.zip [7]: http://www.graphics.cornell.edu/online/measurements/reflectance/ [8]: http://www.merl.com/brdf [9]: http://www.rpcphotonics.com/bsdf-data-optical-diffusers/ diff --git a/src/RenderingDrawCallback.cpp b/src/RenderingDrawCallback.cpp index 5f6c381..3bd34ca 100644 --- a/src/RenderingDrawCallback.cpp +++ b/src/RenderingDrawCallback.cpp @@ -1,5 +1,5 @@ // =================================================================== // -// Copyright (C) 2014-2015 Kimura Ryo // +// Copyright (C) 2014-2016 Kimura Ryo // // // // This Source Code Form is subject to the terms of the Mozilla Public // // License, v. 2.0. If a copy of the MPL was not distributed with this // @@ -39,7 +39,7 @@ void RenderingDrawCallback::render() const float* renderedData; lb::Vec3 inDir, outDir; int numPixels = inDirImage_->s() * inDirImage_->t(); - #pragma omp parallel for private(inDir, outDir) + #pragma omp parallel for private(inDirPtr, renderedData, inDir, outDir) for (int i = 0; i < numPixels; ++i) { inDirPtr = &inDirData[i * 4]; renderedData = inDirPtr;