Parcourir la source

Add scripts folder and update camera position of scenes

Jérôme BUISINE il y a 4 ans
Parent
commit
50d4246830

+ 2 - 0
README.md

@@ -27,6 +27,8 @@ system.
   illuminants, light sources, metals, and the squares of the Macbeth color
   checker.
 
+* [utils/](utils/): usefull scripts for updating `.pbrt` file information quickly.
+
 # Scenes and synthesis images
 
 All synthesis images generated are of size `1000 x 1000` and saved into `.rawls` format for each sample estimated.

+ 2 - 2
bathroom/p3d_bathroom.pbrt

@@ -1,7 +1,7 @@
 # make wood more glossy
 
-LookAt 0 23 30  10.2 5 0   0 1 0
-Camera "perspective" "float fov" 60
+LookAt 0 18 30  10.2 5 0   0 1 0
+Camera "perspective" "float fov" 55
    "float focaldistance" 31 "float lensradius" .15 # .2 # .4
 
 Film "image" 

+ 1 - 1
bedroom/p3d_bedroom.pbrt

@@ -12,7 +12,7 @@ Film "image"
 LookAt 3.4555792808532715 1.2124358415603638 3.2989654541015625
 		0.0942695364356041 1.1369876861572266 0.39623117446899414
 		0.0 1.0 0.0
-Camera "perspective" "float fov" [ 65.0 ]
+Camera "perspective" "float fov" [ 60.0 ]
 
 WorldBegin
 	Texture "Texture01" "spectrum" "imagemap" "string filename" [ "textures/wallpaper-1.tga" ] "bool trilinear" [ "true" ] 

+ 0 - 4
sportscar/p3d_sportscar.pbrt

@@ -1,8 +1,4 @@
-
 ## FullHD
-	"integer yresolution" 1080
-
-## 720p
 Film "image" 
 	"integer xresolution" 1920
 	"integer yresolution" 1080

+ 2 - 2
structuresynth/p3d_arcsphere.pbrt

@@ -5,9 +5,9 @@ Film "image"
     "string filename" "p3d_arcsphere.rawls"
     "float scale" 3
     
-LookAt 10 10 25  4 0 -7  0 1 0
+LookAt 15 35 50  4 0 -7  0 1 0
 
-Camera "perspective" "float fov" [55]
+Camera "perspective" "float fov" [40]
 
 # high quality
 Sampler "random" "integer pixelsamples" [ 64 ]

+ 1 - 1
change_dimensions_all.sh

@@ -30,7 +30,7 @@ do
     # check if filename contains 
     if [[ "$file" == ${prefix}* ]]; then
         echo "Update image extension (xresolution to ${xresolution} and yresolution to ${yresolution}) into ${filename_fixed}"
-        python change_dimensions_pbrt.py --xresolution ${xresolution} --yresolution ${yresolution} --pbrt ${filename_fixed}
+        python utils/change_dimensions_pbrt.py --xresolution ${xresolution} --yresolution ${yresolution} --pbrt ${filename_fixed}
     fi 
   done
 done

change_dimensions_pbrt.py → utils/change_dimensions_pbrt.py


change_ext_all.sh → utils/change_ext_all.sh


change_ext_pbrt.py → utils/change_ext_pbrt.py


change_integrator_all.sh → utils/change_integrator_all.sh


change_integrator_pbrt.py → utils/change_integrator_pbrt.py


+ 1 - 1
change_sampler_all.sh

@@ -13,7 +13,7 @@ do
     # check if filename contains 
     if [[ "$file" == ${prefix}* ]]; then
         echo "Update Sampler into ${filename_fixed}"
-        python change_sampler_pbrt.py --prefix ${prefix} --pbrt ${filename_fixed}
+        python utils/change_sampler_pbrt.py --prefix ${prefix} --pbrt ${filename_fixed}
     fi 
   done
 done

change_sampler_pbrt.py → utils/change_sampler_pbrt.py


reformat_pbrt.py → utils/reformat_pbrt.py


+ 1 - 1
run_reformat_pbrt.sh

@@ -11,6 +11,6 @@ do
     tungsten_subfolder=${tungsten_folder}/${subfolder}
     pbrt_subfolder=${pbrt_folder}/${subfolder}
 
-    python reformat_pbrt.py --tungsten ${tungsten_subfolder}/scene.json --pbrt ${pbrt_subfolder}/scene.pbrt --outfile ${pbrt_subfolder}/${prefix}${subfolder}.pbrt --resolution 1000,1000 --image_name ${prefix}${subfolder}.${ext}
+    python utils/reformat_pbrt.py --tungsten ${tungsten_subfolder}/scene.json --pbrt ${pbrt_subfolder}/scene.pbrt --outfile ${pbrt_subfolder}/${prefix}${subfolder}.pbrt --resolution 1000,1000 --image_name ${prefix}${subfolder}.${ext}
 done