Revision: 48473
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48473
Author: nazgul
Date: 2012-07-01 20:12:38 +0000 (Sun, 01 Jul 2012)
Log Message:
-----------
Color management: added view transforms form nuke-default and spi-vfx
- Added some extra view transforms to play with. It's not absolutely
correct in terms this views were changed to use aces space as input.
This gives exactly the same result as if using stand-alone spi-vfx
and nuke-default configuration, but for real merge of this configs
it'll be needed to add extra input spaces and transformations between
them.
- Replaced hard-coded aces input color space with default ocio
linear space which makes it easier to play with different
configurations.
- Fixed SCons installation of color management configuration which
used to skip copying LUTs when there was "luts" folder in install
destination.
- Print whether OCIO was enabled when building with CMake.
Could be helpful due to OCIO is being automatically disabled
if needed libraries are missed.
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
Added Paths:
-----------
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/lg10.spi1d
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/rec709.spi1d
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/spi_ocio_srgb_test.spi3d
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-07-01 16:15:48 UTC (rev
48472)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-07-01 20:12:38 UTC (rev
48473)
@@ -1841,6 +1841,7 @@
info_cfg_option(WITH_INTERNATIONAL)
info_cfg_option(WITH_INPUT_NDOF)
info_cfg_option(WITH_CYCLES)
+ info_cfg_option(WITH_OPENCOLORIO)
info_cfg_text("Compiler Options:")
info_cfg_option(WITH_BUILDINFO)
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2012-07-01 16:15:48 UTC (rev 48472)
+++ branches/soc-2011-tomato/SConstruct 2012-07-01 20:12:38 UTC (rev 48473)
@@ -611,13 +611,25 @@
scriptinstall.append(env.Install(dir=dir,source=cubin_file))
if env['WITH_BF_OCIO']:
- dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'datafiles',
'colormanagement')
- source=os.listdir('release/datafiles/colormanagement')
- if '.svn' in source: source.remove('.svn')
- if '_svn' in source: source.remove('_svn')
- source=['release/datafiles/colormanagement/'+s for s in source]
- scriptinstall.append(env.Install(dir=dir,source=source))
+ colormanagement = os.path.join('release', 'datafiles',
'colormanagement')
+ for dp, dn, df in os.walk(colormanagement):
+ if '.svn' in dn:
+ dn.remove('.svn')
+ if '_svn' in dn:
+ dn.remove('_svn')
+
+ dir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'datafiles')
+ dir += os.sep + os.path.basename(colormanagement) +
dp[len(colormanagement):]
+
+ source = [os.path.join(dp, f) for f in df if not
f.endswith(".pyc")]
+
+ # To ensure empty dirs are created too
+ if len(source) == 0:
+ env.Execute(Mkdir(dir))
+
+ scriptinstall.append(env.Install(dir=dir,source=source))
+
if env['WITH_BF_INTERNATIONAL']:
internationalpaths=['release' + os.sep + 'datafiles']
Modified: branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
===================================================================
--- branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
2012-07-01 16:15:48 UTC (rev 48472)
+++ branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
2012-07-01 20:12:38 UTC (rev 48473)
@@ -26,13 +26,16 @@
- !<View> {name: Raw, colorspace: raw}
- !<View> {name: Log, colorspace: adx10}
- !<View> {name: RRT, colorspace: rrt_srgb}
+ - !<View> {name: SPI Film, colorspace: srgb8}
+ - !<View> {name: SPI Log, colorspace: lg10}
+ - !<View> {name: Nuke rec709, colorspace: rec709}
xyz:
- !<View> {name: Raw, colorspace: raw}
- !<View> {name: Log, colorspace: adx10}
- !<View> {name: RRT, colorspace: rrt_xyz}
active_displays: [sRGB, p3dci, xyz]
-active_views: [RRT, Log, Raw]
+active_views: [RRT, Log, SPI Film, SPI Log, Raw]
colorspaces:
- !<ColorSpace>
@@ -241,3 +244,43 @@
- !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
- !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
- !<FileTransform> {src: rrt_ut33_dcdm.spi3d, interpolation:
tetrahedral}
+
+ # spi-vfx
+
+ - !<ColorSpace>
+ name: lg10
+ family: lg
+ equalitygroup:
+ bitdepth: 10ui
+ description: |
+ lg10 : conversion from film log
+ isdata: false
+ allocation: uniform
+ to_reference: !<FileTransform> {src: lg10.spi1d, interpolation: nearest}
+
+ - !<ColorSpace>
+ name: srgb8
+ family: srgb
+ equalitygroup:
+ bitdepth: 8ui
+ description: |
+ srgb8 :rgb display space for the srgb standard.
+ isdata: false
+ allocation: uniform
+ from_reference: !<GroupTransform>
+ children:
+ - !<ColorSpaceTransform> {src: aces, dst: lg10}
+ - !<FileTransform> {src: spi_ocio_srgb_test.spi3d, interpolation:
linear}
+
+ # nuke-default
+ - !<ColorSpace>
+ name: rec709
+ family: ""
+ equalitygroup: ""
+ bitdepth: 32f
+ description: |
+ Rec. 709 (Full Range) Display Space
+ isdata: false
+ allocation: uniform
+ allocationvars: [-0.125, 1.125]
+ to_reference: !<FileTransform> {src: rec709.spi1d, interpolation: linear}
Added:
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/lg10.spi1d
===================================================================
--- branches/soc-2011-tomato/release/datafiles/colormanagement/luts/lg10.spi1d
(rev 0)
+++ branches/soc-2011-tomato/release/datafiles/colormanagement/luts/lg10.spi1d
2012-07-01 20:12:38 UTC (rev 48473)
@@ -0,0 +1,2054 @@
+Version 1
+From 0.0 1.0
+Length 2048
+Components 1
+{
+ 3.0517578125e-05
+ 3.1315700371520417e-05
+ 3.2134420416480743e-05
+ 3.2974260634173945e-05
+ 3.3835756341150887e-05
+ 3.4719456106020991e-05
+ 3.5625922066277402e-05
+ 3.6555730252290222e-05
+ 3.7509470918612837e-05
+ 3.848774888275099e-05
+ 3.9491183871542739e-05
+ 4.0520410875304305e-05
+ 4.157608050989493e-05
+ 4.2658859386858501e-05
+ 4.3769430491801814e-05
+ 4.4908493571171243e-05
+ 4.6076765527590087e-05
+ 4.7274980823925932e-05
+ 4.8503891896253155e-05
+ 4.9764269575883683e-05
+ 5.1056903520636313e-05
+ 5.23826026555226e-05
+ 5.3742195623022875e-05
+ 5.5136531243133402e-05
+ 5.6566478983364575e-05
+ 5.8032929438874994e-05
+ 5.9536794822921754e-05
+ 6.107900946781976e-05
+ 6.266053033659155e-05
+ 6.4282337545503584e-05
+ 6.5945434897675929e-05
+ 6.7650850427961021e-05
+ 6.9399636959284895e-05
+ 7.1192872670646201e-05
+ 7.3031661676970159e-05
+ 7.4917134621015833e-05
+ 7.6850449277533482e-05
+ 7.883279116987421e-05
+ 8.0865374199248159e-05
+ 8.2949441286836304e-05
+ 8.5086265028951372e-05
+ 8.7277148365452273e-05
+ 8.9523425261611709e-05
+ 9.1826461403633804e-05
+ 9.4187654908027248e-05
+ 9.6608437045024988e-05
+ 9.9090272976254585e-05
+ 0.00010163466250685006
+ 0.0001042431408522007
+ 0.00010691727941952996
+ 0.00010965868660449022
+ 0.00011246900860296613
+ 0.00011534993023826097
+ 0.0001183031758038533
+ 0.00012133050992189348
+ 0.00012443373841761641
+ 0.00012761470920982857
+ 0.00013087531321763493
+ 0.00013421748528355998
+ 0.00013764320511319979
+ 0.0001411544982315589
+ 0.00014475343695618813
+ 0.00014844214138725681
+ 0.00015222278041466183
+ 0.0001560975727422808
+ 0.00016006878792946061
+ 0.00016413874744980908
+ 0.00016830982576736611
+ 0.00017258445143019565
+ 0.00017696510818143612
+ 0.00018145433608782391
+ 0.00018605473268569277
+ 0.00019076895414442613
+ 0.00019559971644732675
+ 0.00020054979658982978
+ 0.00020562203379498976
+ 0.00021081933074611453
+ 0.00021614465483641655
+ 0.00022160103943550833
+ 0.00022719158517254615
+ 0.00023291946123579378
+ 0.00023878790668832979
+ 0.00024480023179960483
+ 0.00025095981939249269
+ 0.00025727012620546365
+ 0.0002637346842694291
+ 0.00027035710229879301
+ 0.00027714106709616576
+ 0.00028409034497015891
+ 0.00029120878316561563
+ 0.000298500311305564
+ 0.00030596894284412634
+ 0.0003136187765295311
+ 0.00032145399787631942
+ 0.00032947888064573707
+ 0.00033769778833323775
+ 0.00034611517566191668
+ 0.0003547355900806166
+ 0.00036356367326532106
+ 0.00037260416262237776
+ 0.00038186189279193142
+ 0.00039134179714988296
+ 0.00040104890930650258
+ 0.00041098836459972795
+ 0.00042116540158101636
+ 0.00043158536349146204
+ 0.00044225369972572342
+ 0.00045317596728114239
+ 0.00046435783218921873
+ 0.00047580507092644125
+ 0.00048752357180124038
+ 0.00049951933631358573
+ 0.00051179848048355566
+ 0.00052436723614490309
+ 0.00053723195219939159
+ 0.00055039909582737287
+ 0.00056387525364977179
+ 0.00057766713283631305
+ 0.00059178156215445015
+ 0.00060622549295310071
+ 0.00062100600007489301
+ 0.00063613028269014305
+ 0.00065160566504540631
+ 0.0006674395971188571
+ 0.00068363965517431442
+ 0.00070021354220506848
+ 0.00071716908825816426
+ 0.00073451425062904217
+ 0.00075225711391582815
+ 0.00077040588992174507
+ 0.00078896891739338188
+ 0.00080795466158165138
+ 0.00082737171361133596
+ 0.00084722878964419172
+ 0.00086753472981940575
+ 0.00088829849695413695
+ 0.00090952917498559748
+ 0.00093123596713474738
+ 0.0009534281937703152
+ 0.00097611528995020409
+ 0.00099930680261566722
+ 0.001023012387411876
+ 0.0010472418051064066
+ 0.001072004917575079
+ 0.001097311683322229
+ 0.0011231721524999736
+ 0.0011495964613881453
+ 0.0011765948262937604
+ 0.0012041775368253492
+ 0.0012323549484940901
+ 0.0012611374745895919
+ 0.001290535577273978
+ 0.0013205597578331381
+ 0.0013512205460188484
+ 0.0013825284884097114
+ 0.0014144941357126792
+ 0.0014471280289198988
+ 0.0014804406842279627
+ 0.0015144425766182672
+ 0.0015491441219876794
+ 0.0015845556577083013
+ 0.0016206874214835659
+ 0.0016575495283548652
+ 0.0016951519456985511
+ 0.0017335044660368639
+ 0.0017726166774682699
+ 0.0018124979315022321
+ 0.0018531573080605274
+ 0.0018946035773811235
+ 0.0019368451585313946
+ 0.0019798900742039752
+ 0.0020237459014306996
+ 0.0020684197178066212
+ 0.0021139180427667448
+ 0.0021602467734010145
+ 0.002207411114227815
+ 0.0022554155002704806
+ 0.0023042635126938578
+ 0.0023539577861559388
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
