1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/core_regression_tests/tests/materials/bumpmapping/default-geom.lxo	Sat Oct 31 11:42:57 2009 +0100
     1.3 @@ -0,0 +1,47 @@
     1.4 +TransformBegin # Lamp
     1.5 +	Transform [-0.290864646435 0.95517116785 -0.0551890581846 0.0  -0.771100819111 -0.19988335669 0.604524731636 0.0  0.566393196583 0.21839119494 0.794672250748 0.0  -2.11198377609 -4.77572822571 5.90386199951 1.0]
     1.6 +LightGroup "default"
     1.7 +Texture "Lamp:light:L" "color" "blackbody"
     1.8 +   "float temperature" [6500.000000]
     1.9 +LightSource "point" "texture L" ["Lamp:light:L"]
    1.10 +   "float gain" [1.000000]
    1.11 +TransformEnd # Lamp
    1.12 +
    1.13 +AttributeBegin # Plane.001
    1.14 +	Transform [1.0 0.0 0.0 0.0  0.0 1.0 0.0 0.0  0.0 0.0 1.0 0.0  1.00000011921 0.0 0.0 1.0]
    1.15 +	NamedMaterial "mat2"
    1.16 +	Shape "trianglemesh" "integer indices" [
    1.17 +0 1 2
    1.18 +0 2 3
    1.19 +	] "point P" [
    1.20 +63.000000 63.000000 0.000000
    1.21 +-1.000000 63.000000 0.000000
    1.22 +-1.000000 -1.000000 0.000000
    1.23 +63.000000 -1.000000 0.000000
    1.24 +	] "float uv" [
    1.25 +0.000000 0.000000
    1.26 +1.000000 0.000000
    1.27 +1.000000 1.000000
    1.28 +0.000000 1.000000
    1.29 +	]
    1.30 +AttributeEnd
    1.31 +
    1.32 +AttributeBegin # Plane
    1.33 +	Transform [1.0 0.0 0.0 0.0  0.0 1.0 0.0 0.0  0.0 0.0 1.0 0.0  -1.10000002384 0.0 0.0 1.0]
    1.34 +	NamedMaterial "mat1"
    1.35 +	Shape "trianglemesh" "integer indices" [
    1.36 +0 1 2
    1.37 +0 2 3
    1.38 +	] "point P" [
    1.39 +1.000000 1.000000 0.000000
    1.40 +-1.000000 1.000000 0.000000
    1.41 +-1.000000 -1.000000 0.000000
    1.42 +1.000000 -1.000000 0.000000
    1.43 +	] "float uv" [
    1.44 +0.000000 0.000000
    1.45 +1.000000 0.000000
    1.46 +1.000000 1.000000
    1.47 +0.000000 1.000000
    1.48 +	]
    1.49 +AttributeEnd
    1.50 +

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/core_regression_tests/tests/materials/bumpmapping/default-mat.lxm	Sat Oct 31 11:42:57 2009 +0100
     2.3 @@ -0,0 +1,36 @@
     2.4 +	# Material 'mat2'
     2.5 +Texture "mat2::bumpmap" "float" "imagemap"
     2.6 +   "string wrap" ["repeat"]
     2.7 +   "string filename" ["map.png"]
     2.8 +   "float gamma" [2.200000]
     2.9 +   "float gain" [1.000000]
    2.10 +   "string filtertype" ["bilinear"]
    2.11 +   "string mapping" ["uv"]
    2.12 +   "float uscale" [-32.000000]
    2.13 +   "float vscale" [32.000000]
    2.14 +   "float udelta" [0.000000]
    2.15 +   "float vdelta" [0.000000]
    2.16 +Texture "mat2::bumpmap.scale" "float" "scale" "texture tex1" ["mat2::bumpmap"] "float tex2" [0.019999999553]
    2.17 +MakeNamedMaterial "mat2"
    2.18 +   "string type" ["matte"]
    2.19 +   "color Kd" [0.374624 0.374624 0.374624] "texture bumpmap" ["mat2::bumpmap.scale"]
    2.20 +   #"float bumpmapsampledistance" [0.001]
    2.21 +   #"float bumpmapsampledistance" [0.00001]
    2.22 +
    2.23 +	# Material 'mat1'
    2.24 +Texture "mat1::bumpmap" "float" "imagemap"
    2.25 +   "string wrap" ["repeat"]
    2.26 +   "string filename" ["map.png"]
    2.27 +   "float gamma" [2.200000]
    2.28 +   "float gain" [1.000000]
    2.29 +   "string filtertype" ["bilinear"]
    2.30 +   "string mapping" ["uv"]
    2.31 +   "float uscale" [-1.000000]
    2.32 +   "float vscale" [1.000000]
    2.33 +   "float udelta" [0.000000]
    2.34 +   "float vdelta" [0.000000]
    2.35 +Texture "mat1::bumpmap.scale" "float" "scale" "texture tex1" ["mat1::bumpmap"] "float tex2" [0.00999999977648]
    2.36 +MakeNamedMaterial "mat1"
    2.37 +   "string type" ["matte"]
    2.38 +   "color Kd" [0.374624 0.374624 0.374624] "texture bumpmap" ["mat1::bumpmap.scale"]
    2.39 +

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/core_regression_tests/tests/materials/bumpmapping/default.lxs	Sat Oct 31 11:42:57 2009 +0100
     3.3 @@ -0,0 +1,73 @@
     3.4 +# Lux Render v0.6RC6 Scene File
     3.5 +# Exported by LuxBlend Blender Exporter
     3.6 +
     3.7 +LookAt 1.008037 -2.734920 4.386375 
     3.8 +       0.823583 -2.202555 3.560201 
     3.9 +       -0.270462 0.780651 0.563414
    3.10 +
    3.11 +
    3.12 +Camera "perspective"
    3.13 +   "float fov" [49.134342]
    3.14 +   "float screenwindow" [-1.000000 1.000000 -0.750000 0.750000]
    3.15 +
    3.16 +
    3.17 +Film "fleximage"
    3.18 +   "integer xresolution" [640] 
    3.19 +   "integer yresolution" [480]
    3.20 +   "integer haltspp" [8]
    3.21 +   "bool premultiplyalpha" ["false"]
    3.22 +   "string tonemapkernel" ["reinhard"]
    3.23 +   "float reinhard_prescale" [1.000000]
    3.24 +   "float reinhard_postscale" [1.200000]
    3.25 +   "float reinhard_burn" [6.000000]
    3.26 +   "integer displayinterval" [4]
    3.27 +   "integer writeinterval" [120]
    3.28 +   "string ldr_clamp_method" ["lum"]
    3.29 +   "bool write_exr" ["false"]
    3.30 +   "bool write_png" ["true"]
    3.31 +   "string write_png_channels" ["RGB"]
    3.32 +   "bool write_png_16bit" ["false"]
    3.33 +   "bool write_png_gamutclamp" ["true"]
    3.34 +   "bool write_tga" ["false"]
    3.35 +   "string filename" ["default"]
    3.36 +   "bool write_resume_flm" ["true"]
    3.37 +   "bool restart_resume_flm" ["true"]
    3.38 +   "integer reject_warmup" [128]
    3.39 +   "bool debug" ["false"]
    3.40 +   "float colorspace_white" [0.314275 0.329411]
    3.41 +   "float colorspace_red" [0.630000 0.340000]
    3.42 +   "float colorspace_green" [0.310000 0.595000]
    3.43 +   "float colorspace_blue" [0.155000 0.070000]
    3.44 +   "float gamma" [2.200000]
    3.45 +
    3.46 +PixelFilter "mitchell"
    3.47 +   "float B" [0.750000]
    3.48 +   "float C" [0.125000]
    3.49 +
    3.50 +Sampler "lowdiscrepancy"
    3.51 +   "string pixelsampler" ["lowdiscrepancy"]
    3.52 +   "integer pixelsamples" [1]
    3.53 +
    3.54 +SurfaceIntegrator "directlighting"
    3.55 +   "integer maxdepth" [5]
    3.56 +
    3.57 +VolumeIntegrator "single"
    3.58 +   "float stepsize" [1.000000]
    3.59 +
    3.60 +Accelerator "tabreckdtree"
    3.61 +   "integer intersectcost" [80]
    3.62 +   "integer traversalcost" [1]
    3.63 +   "float emptybonus" [0.200000]
    3.64 +   "integer maxprims" [1]
    3.65 +   "integer maxdepth" [-1]
    3.66 +
    3.67 +WorldBegin
    3.68 +
    3.69 +Include "default-mat.lxm"
    3.70 +
    3.71 +Include "default-geom.lxo"
    3.72 +
    3.73 +Include "default-vol.lxv"
    3.74 +
    3.75 +WorldEnd
    3.76 +

     4.1 Binary file core_regression_tests/tests/materials/bumpmapping/map.png has changed

     5.1 Binary file core_regression_tests/tests/materials/bumpmapping/reference.flm has changed

     6.1 Binary file core_regression_tests/tests/materials/bumpmapping/reference.png has changed

     7.1 Binary file core_regression_tests/tests/materials/bumpmapping/uvscale.blend has changed

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/core_regression_tests/tests/materials/bumpmapping/uvscale.cfg	Sat Oct 31 11:42:57 2009 +0100
     8.3 @@ -0,0 +1,5 @@
     8.4 +sceneFile = "default.lxs"
     8.5 +referenceFilm = "reference.flm"
     8.6 +testFilm = "default.flm"
     8.7 +errorTreshold = 12
     8.8 +cleanFiles = "default.png,default.flm"