mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32 build fixes

metadata
Wenzel Jakob 2011-07-14 16:27:38 +02:00
parent e1682900f1
commit b5e5e6abf7
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
data/tests/test_bsdf.xml
View File

@ -2,22 +2,6 @@
to be tested for consistency. This is done
using the testcase 'test_chisquare' -->
<scene>
<!-- Test a smooth coating over a diffuse base material -->
<bsdf type="coating">
<float name="intIOR" value="1.5"/>
<float name="extIOR" value="1"/>
<rgb name="sigmaA" value="0.1 0.2 0.3"/>
<float name="thickness" value="2"/>
<bsdf type="diffuse"/>
</bsdf>
<!-- Test a smooth coating over a rough metal material -->
<bsdf type="coating">
<float name="intIOR" value="1.5"/>
<float name="extIOR" value="1"/>
<bsdf type="roughconductor"/>
</bsdf>
<!-- Test the smooth diffuse model -->
<bsdf type="diffuse"/>
@ -142,10 +126,30 @@
<bsdf type="ward">
<float name="alphaU" value=".1"/>
<float name="alphaV" value=".3"/>
<spectrum name="diffuseReflectance" value="0.2"/>
<spectrum name="specularReflectance" value="0.4"/>
</bsdf>
<!-- Test the mask model -->
<!-- Test the mask model (with constant 50% opacity) -->
<bsdf type="mask">
<spectrum name="opacity" value="0.5"/>
<bsdf type="diffuse"/>
</bsdf>
<!-- Test the smooth coating over a diffuse base material -->
<bsdf type="coating">
<float name="intIOR" value="1.5"/>
<float name="extIOR" value="1"/>
<rgb name="sigmaA" value="0.1 0.2 0.3"/>
<float name="thickness" value="2"/>
<bsdf type="diffuse"/>
</bsdf>
<!-- Test the smooth coating over a rough metal material -->
<bsdf type="coating">
<float name="intIOR" value="1.5"/>
<float name="extIOR" value="1"/>
<bsdf type="roughconductor"/>
</bsdf>
</scene>

BIN
doc/images/bsdf_conductor_copper.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 225 KiB

After

Width:  |  Height:  |  Size: 204 KiB

4
include/mitsuba/hw/basicshader.h
View File

@ -35,7 +35,7 @@ MTS_NAMESPACE_BEGIN
*
* Includes a \ref Shader implementation for hardware rendering
*/
class MTS_EXPORT_RENDER ConstantSpectrumTexture : public Texture {
class MTS_EXPORT_HW ConstantSpectrumTexture : public Texture {
public:
inline ConstantSpectrumTexture(const Spectrum &value)
: Texture(Properties()), m_value(value) {
@ -83,7 +83,7 @@ protected:
*
* Includes a \ref Shader implementation for hardware rendering
*/
class MTS_EXPORT_RENDER ConstantFloatTexture : public Texture {
class MTS_EXPORT_HW ConstantFloatTexture : public Texture {
public:
inline ConstantFloatTexture(const Float &value)
: Texture(Properties()), m_value(value) {