curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

now torch colour from colourimeter mesurement

Browse Source 
Former-commit-id: 8bd0eb9ef67e2a5c259137ea779b857daac792bc
Former-commit-id: 5aa153a8cd3e94fc663d071f033fe3d5cdafed1b
This commit is contained in:
Song Minjae
2017-01-12 21:02:28 +09:00
parent 301ab8f52e
commit 8e586c6289
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/tileproperties/TilePropCSV.kt
View File

@@ -58,7 +58,7 @@ object TilePropCSV {
"10"; "2";"TILE_PLATFORM_EBONY" ; "8396808"; "1"; "N/A";"wood"; "0"; "0"; "0"; "0"; "10"; "2"; "0"; "0";"16"
"10"; "3";"TILE_PLATFORM_BIRCH" ; "8396808"; "1"; "N/A";"wood"; "0"; "0"; "0"; "0"; "10"; "3"; "0"; "0";"16"
"10"; "4";"TILE_PLATFORM_BLOODROSE" ; "8396808"; "1"; "N/A";"wood"; "0"; "0"; "0"; "0"; "10"; "4"; "0"; "0";"16"
"11"; "0";"TILE_TORCH" ; "8396808"; "0"; "N/A";"fxtr"; "0"; "0"; "0"; "266453040"; "11"; "0"; "0"; "1";"16"
"11"; "0";"TILE_TORCH" ; "8396808"; "0"; "N/A";"fxtr"; "0"; "0"; "0"; "226629701"; "11"; "0"; "0"; "1";"16"
"11"; "1";"TILE_TORCH_FROST" ; "8396808"; "0"; "N/A";"fxtr"; "0"; "0"; "0"; "81916159"; "11"; "1"; "0"; "1";"16"
"12"; "0";"TILE_TORCH" ; "8396808"; "0"; "N/A";"fxtr"; "0"; "0"; "0"; "0"; "11"; "0"; "0"; "0";"16"
"12"; "1";"TILE_TORCH_FROST" ; "8396808"; "0"; "N/A";"fxtr"; "0"; "0"; "0"; "0"; "11"; "1"; "0"; "0";"16"
@@ -159,7 +159,7 @@ object TilePropCSV {
## Illuminators ##
# Illuminator white: RGB(228,238,234), simulation of a halophosphate FL lamp (If you want high CRI lamp, collect a daylight!)
# Defalut torch : L 64 a 51 b 59; real candlelight colour taken from properly configured camera.
# Defalut torch : L 64 a 28 b 48 (Planckian 1 770 K); real candlelight colour taken from Spyder5 colorimeter
# Sunstone: Artificial sunlight, change colour over time in sync with sunlight. The light is set by game's code.
# Sunlight capacitor: daylight at noon. Set by game's code.

17
work_files/candlelight_measurement.txt Normal file
View File

@@ -0,0 +1,17 @@
Result is XYZ: 13.186067 9.766694 0.811010, D50 Lab: 37.420406 27.343440 49.258766
Result is XYZ: 13.421202 9.973600 0.850178, D50 Lab: 37.795008 27.250973 49.225695
Result is XYZ: 12.516982 9.284402 0.753020, D50 Lab: 36.526198 26.764843 48.763588
Result is XYZ: 14.059772 10.432068 0.984819, D50 Lab: 38.606975 27.797272 48.439663
CCT = 1789K (Delta E 5.151260)
Closest Planckian temperature = 1760K (Delta E 2.311918)
Closest Daylight temperature = 2500K (Delta E 71.610860)
Result is XYZ: 13.635438 10.124139 0.977999, D50 Lab: 38.064313 27.461672 47.609786
CCT = 1792K (Delta E 4.057336)
Closest Planckian temperature = 1769K (Delta E 1.822616)
Closest Daylight temperature = 2500K (Delta E 70.617979)
Result is XYZ: 13.878060 10.310479 0.943578, D50 Lab: 38.393993 27.576617 48.719630
CCT = 1791K (Delta E 7.405568)
Closest Planckian temperature = 1749K (Delta E 3.329354)
Closest Daylight temperature = 2500K (Delta E 72.778937)