Merge branch 'rc/1.9.13' into release

This will improve parity between the GitHub repo and its sister codebase
within Google.

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.9.12'
+    implementation 'com.google.android.filament:filament-android:1.9.13'
 }
 ```
 
@@ -63,7 +63,7 @@ A much smaller alternative to `filamat-android` that can only generate OpenGL sh
 iOS projects can use CocoaPods to install the latest release:
 
 ```
-pod 'Filament', '~> 1.9.12'
+pod 'Filament', '~> 1.9.13'
 ```
 
 ### Snapshots

RELEASE_NOTES.md

@@ -7,6 +7,11 @@ A new header is inserted each time a *tag* is created.
 
 ## v1.9.13
 
+- Android: fix "No implementation found" error.
+- Android: fix compilation error in UbershaderLoader.
+- engine: computeDataSize now returns correct value for USHORT_565.
+- Vulkan: various internal improvements.
+
 ## v1.9.12
 
 - engine: Fixed GL errors seen with MSAA on WebGL.

android/filament-android/src/main/cpp/nativewindow/Win32.cpp

@@ -1,67 +1,67 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-
-#include <jawt.h>
-#include <win32/jawt_md.h>
-#include <windows.h>
-
-#include <utils/unwindows.h>
-
-#include "JAWTUtils.h"
-#include <filament/Engine.h>
-
-extern "C" {
-
-void* getNativeWindow(JNIEnv* env, jclass, jobject surface) {
-    JAWT_DrawingSurface* ds = nullptr;
-    JAWT_DrawingSurfaceInfo* dsi = nullptr;
-
-    if (!acquireDrawingSurface(env, surface, &ds, &dsi)) {
-        return nullptr;
-    }
-
-    JAWT_Win32DrawingSurfaceInfo* dsi_win32 = (JAWT_Win32DrawingSurfaceInfo*) dsi->platformInfo;
-    HWND hWnd = dsi_win32->hwnd;
-
-    releaseDrawingSurface(ds, dsi);
-
-    return (void*) hWnd;
-}
-
-
-jlong createNativeSurface(jint width, jint height) {
-    // We need to adjust the window size so the "client area" matches width and height requested.
-    // Otherwise, the window itself will be of dimension width-height but the "client area" and the
-    // resulting surface will be smaller than requested.
-    RECT dimension = {0, 0, width, height};
-    AdjustWindowRect(&dimension, WS_OVERLAPPEDWINDOW, FALSE);
-    width = dimension.right - dimension.left;
-    height = dimension.bottom - dimension.top;
-
-    HWND window = CreateWindowA("STATIC", "dummy", 0, 0, 0, width, height, NULL, NULL, NULL, NULL);
-    SetWindowLong(window, GWL_STYLE, 0); //remove all window styles
-
-    return (jlong) window;
-}
-
-void destroyNativeSurface(jlong surface) {
-    HWND window = (HWND) surface;
-    DestroyWindow(window);
-}
-
-}
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+
+#include <jawt.h>
+#include <win32/jawt_md.h>
+#include <windows.h>
+
+#include <utils/unwindows.h>
+
+#include "JAWTUtils.h"
+#include <filament/Engine.h>
+
+extern "C" {
+
+void* getNativeWindow(JNIEnv* env, jclass, jobject surface) {
+    JAWT_DrawingSurface* ds = nullptr;
+    JAWT_DrawingSurfaceInfo* dsi = nullptr;
+
+    if (!acquireDrawingSurface(env, surface, &ds, &dsi)) {
+        return nullptr;
+    }
+
+    JAWT_Win32DrawingSurfaceInfo* dsi_win32 = (JAWT_Win32DrawingSurfaceInfo*) dsi->platformInfo;
+    HWND hWnd = dsi_win32->hwnd;
+
+    releaseDrawingSurface(ds, dsi);
+
+    return (void*) hWnd;
+}
+
+
+jlong createNativeSurface(jint width, jint height) {
+    // We need to adjust the window size so the "client area" matches width and height requested.
+    // Otherwise, the window itself will be of dimension width-height but the "client area" and the
+    // resulting surface will be smaller than requested.
+    RECT dimension = {0, 0, width, height};
+    AdjustWindowRect(&dimension, WS_OVERLAPPEDWINDOW, FALSE);
+    width = dimension.right - dimension.left;
+    height = dimension.bottom - dimension.top;
+
+    HWND window = CreateWindowA("STATIC", "dummy", 0, 0, 0, width, height, NULL, NULL, NULL, NULL);
+    SetWindowLong(window, GWL_STYLE, 0); //remove all window styles
+
+    return (jlong) window;
+}
+
+void destroyNativeSurface(jlong surface) {
+    HWND window = (HWND) surface;
+    DestroyWindow(window);
+}
+
+}

android/gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.9.12
+VERSION_NAME=1.9.13
 
 POM_DESCRIPTION=Real-time physically based rendering engine for Android.
 

filament/backend/CMakeLists.txt

@@ -143,6 +143,7 @@ if (FILAMENT_SUPPORTS_VULKAN)
             src/vulkan/VulkanFboCache.h
             src/vulkan/VulkanHandles.cpp
             src/vulkan/VulkanHandles.h
+            src/vulkan/VulkanMemory.cpp
             src/vulkan/VulkanPlatform.cpp
             src/vulkan/VulkanPlatform.h
             src/vulkan/VulkanSamplerCache.cpp

filament/backend/src/opengl/PlatformWGL.cpp

@@ -1,272 +1,272 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "PlatformWGL.h"
-
-#include <Wingdi.h>
-
-#include "OpenGLDriverFactory.h"
-
-#ifdef _MSC_VER
-    // this variable is checked in BlueGL.h (included from "gl_headers.h" right after this), 
-    // and prevents duplicate definition of OpenGL apis when building this file. 
-    // However, GL_GLEXT_PROTOTYPES need to be defined in BlueGL.h when included from other files.
-    #define FILAMENT_PLATFORM_WGL
-#endif
-
-#include "gl_headers.h"
-
-#include "Windows.h"
-#include <GL/gl.h>
-#include "GL/glext.h"
-#include "GL/wglext.h"
-
-#include <utils/Log.h>
-#include <utils/Panic.h>
-
-namespace {
-
-void reportLastWindowsError() {
-    LPSTR lpMessageBuffer = nullptr;
-    DWORD dwError = GetLastError();
-
-    if (dwError == 0) {
-        return;
-    }
-
-    FormatMessage(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER |
-        FORMAT_MESSAGE_FROM_SYSTEM |
-        FORMAT_MESSAGE_IGNORE_INSERTS,
-        nullptr,
-        dwError,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        lpMessageBuffer,
-        0, nullptr
-	);
-
-    utils::slog.e << "Windows error code: " << dwError << ". " << lpMessageBuffer
-            << utils::io::endl;
-
-    LocalFree(lpMessageBuffer);
-}
-
-} // namespace
-
-namespace filament {
-
-using namespace backend;
-
-struct WGLSwapChain {
-    HDC hDc = NULL;
-    HWND hWnd = NULL;
-    bool isHeadless = false;
-};
-
-Driver* PlatformWGL::createDriver(void* const sharedGLContext) noexcept {
-    int result = 0;
-    PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribs = nullptr;
-    int pixelFormat = 0;
-
-    mPfd = {
-        sizeof(PIXELFORMATDESCRIPTOR),
-        1,
-        PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER,    // Flags
-        PFD_TYPE_RGBA,        // The kind of framebuffer. RGBA or palette.
-        32,                   // Colordepth of the framebuffer.
-        0, 0, 0, 0, 0, 0,
-        0,
-        0,
-        0,
-        0, 0, 0, 0,
-        24,                   // Number of bits for the depthbuffer
-        0,                    // Number of bits for the stencilbuffer
-        0,                    // Number of Aux buffers in the framebuffer.
-        PFD_MAIN_PLANE,
-        0,
-        0, 0, 0
-    };
-
-    int attribs[] = {
-        WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 1,
-        WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_PROFILE_MASK_ARB,
-        0
-    };
-
-    HGLRC tempContext = NULL;
-
-    mHWnd = CreateWindowA("STATIC", "dummy", 0, 0, 0, 1, 1, NULL, NULL, NULL, NULL);
-    HDC whdc = mWhdc = GetDC(mHWnd);
-    if (whdc == NULL) {
-        utils::slog.e << "CreateWindowA() failed" << utils::io::endl;
-        goto error;
-    }
-
-    pixelFormat = ChoosePixelFormat(whdc, &mPfd);
-    SetPixelFormat(whdc, pixelFormat, &mPfd);
-
-    // We need a tmp context to retrieve and call wglCreateContextAttribsARB.
-    tempContext = wglCreateContext(whdc);
-    if (!wglMakeCurrent(whdc, tempContext)) {
-        utils::slog.e << "wglMakeCurrent() failed, whdc=" << whdc << ", tempContext=" <<
-                tempContext << utils::io::endl;
-        goto error;
-    }
-
-    wglCreateContextAttribs =
-            (PFNWGLCREATECONTEXTATTRIBSARBPROC) wglGetProcAddress("wglCreateContextAttribsARB");
-    mContext = wglCreateContextAttribs(whdc, (HGLRC) sharedGLContext, attribs);
-    if (!mContext) {
-        utils::slog.e << "wglCreateContextAttribs() failed, whdc=" << whdc << utils::io::endl;
-        goto error;
-    }
-
-    wglMakeCurrent(NULL, NULL);
-    wglDeleteContext(tempContext);
-    tempContext = NULL;
-
-    if (!wglMakeCurrent(whdc, mContext)) {
-        utils::slog.e << "wglMakeCurrent() failed, whdc=" << whdc << ", mContext=" <<
-                mContext << utils::io::endl;
-        goto error;
-    }
-
-    result = bluegl::bind();
-    ASSERT_POSTCONDITION(!result, "Unable to load OpenGL entry points.");
-    return OpenGLDriverFactory::create(this, sharedGLContext);
-
-error:
-    if (tempContext) {
-        wglDeleteContext(tempContext);
-    }
-    reportLastWindowsError();
-    terminate();
-    return NULL;
-}
-
-void PlatformWGL::terminate() noexcept {
-    wglMakeCurrent(NULL, NULL);
-    if (mContext) {
-        wglDeleteContext(mContext);
-        mContext = NULL;
-    }
-    if (mHWnd && mWhdc) {
-        ReleaseDC(mHWnd, mWhdc);
-        DestroyWindow(mHWnd);
-        mHWnd = NULL;
-        mWhdc = NULL;
-    } else if (mHWnd) {
-        DestroyWindow(mHWnd);
-        mHWnd = NULL;
-    }
-    bluegl::unbind();
-}
-
-Platform::SwapChain* PlatformWGL::createSwapChain(void* nativeWindow, uint64_t& flags) noexcept {
-    auto* swapChain = new WGLSwapChain();
-    swapChain->isHeadless = false;
-
-    // on Windows, the nativeWindow maps to a HWND
-    swapChain->hWnd = (HWND) nativeWindow;
-    swapChain->hDc = GetDC(swapChain->hWnd);
-    if (!ASSERT_POSTCONDITION_NON_FATAL(swapChain->hDc,
-            "Unable to create the SwapChain (nativeWindow = %p)", nativeWindow)) {
-        reportLastWindowsError();
-    }
-
-	// We have to match pixel formats across the HDC and HGLRC (mContext)
-    int pixelFormat = ChoosePixelFormat(swapChain->hDc, &mPfd);
-    SetPixelFormat(swapChain->hDc, pixelFormat, &mPfd);
-
-    return (Platform::SwapChain*) swapChain;
-}
-
-Platform::SwapChain* PlatformWGL::createSwapChain(uint32_t width, uint32_t height, uint64_t& flags) noexcept {
-    auto* swapChain = new WGLSwapChain();
-    swapChain->isHeadless = true;
-
-    // WS_POPUP was chosen for the window style here after some experimentation.
-    // For some reason, using other window styles resulted in corrupted pixel buffers when using
-    // readPixels.
-    RECT rect = {0, 0, width, height};
-    AdjustWindowRect(&rect, WS_POPUP, FALSE);
-    width = rect.right - rect.left;
-    height = rect.bottom - rect.top;
-
-    swapChain->hWnd = CreateWindowA("STATIC", "headless", WS_POPUP, 0, 0,
-            width, height, NULL, NULL, NULL, NULL);
-    swapChain->hDc = GetDC(swapChain->hWnd);
-    int pixelFormat = ChoosePixelFormat(swapChain->hDc, &mPfd);
-    SetPixelFormat(swapChain->hDc, pixelFormat, &mPfd);
-
-    return (Platform::SwapChain*) swapChain;
-}
-
-void PlatformWGL::destroySwapChain(Platform::SwapChain* swapChain) noexcept {
-    auto* wglSwapChain = (WGLSwapChain*) swapChain;
-
-    HDC dc = wglSwapChain->hDc;
-    HWND window = wglSwapChain->hWnd;
-    ReleaseDC(window, dc);
-
-    if (wglSwapChain->isHeadless) {
-        DestroyWindow(window);
-    }
-
-    delete wglSwapChain;
-
-    // make this swapChain not current (by making a dummy one current)
-    wglMakeCurrent(mWhdc, mContext);
-}
-
-void PlatformWGL::makeCurrent(Platform::SwapChain* drawSwapChain,
-                              Platform::SwapChain* readSwapChain) noexcept {
-    ASSERT_PRECONDITION_NON_FATAL(drawSwapChain == readSwapChain,
-                                  "PlatformWGL does not support distinct draw/read swap chains.");
-
-    auto* wglSwapChain = (WGLSwapChain*) drawSwapChain;
-    HDC hdc = wglSwapChain->hDc;
-    if (hdc != NULL) {
-        BOOL success = wglMakeCurrent(hdc, mContext);
-        if (!ASSERT_POSTCONDITION_NON_FATAL(success, "wglMakeCurrent() failed. hdc = %p", hdc)) {
-            reportLastWindowsError();
-            wglMakeCurrent(0, NULL);
-        }
-    }
-}
-
-void PlatformWGL::commit(Platform::SwapChain* swapChain) noexcept {
-    auto* wglSwapChain = (WGLSwapChain*) swapChain;
-    HDC hdc = wglSwapChain->hDc;
-    if (hdc != NULL) {
-        SwapBuffers(hdc);
-    }
-}
-
-//TODO Implement WGL fences
-Platform::Fence* PlatformWGL::createFence() noexcept {
-    return nullptr;
-}
-
-void PlatformWGL::destroyFence(Fence* fence) noexcept {
-}
-
-backend::FenceStatus PlatformWGL::waitFence(Fence* fence, uint64_t timeout) noexcept {
-    return backend::FenceStatus::ERROR;
-}
-
-} // namespace filament
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "PlatformWGL.h"
+
+#include <Wingdi.h>
+
+#include "OpenGLDriverFactory.h"
+
+#ifdef _MSC_VER
+    // this variable is checked in BlueGL.h (included from "gl_headers.h" right after this), 
+    // and prevents duplicate definition of OpenGL apis when building this file. 
+    // However, GL_GLEXT_PROTOTYPES need to be defined in BlueGL.h when included from other files.
+    #define FILAMENT_PLATFORM_WGL
+#endif
+
+#include "gl_headers.h"
+
+#include "Windows.h"
+#include <GL/gl.h>
+#include "GL/glext.h"
+#include "GL/wglext.h"
+
+#include <utils/Log.h>
+#include <utils/Panic.h>
+
+namespace {
+
+void reportLastWindowsError() {
+    LPSTR lpMessageBuffer = nullptr;
+    DWORD dwError = GetLastError();
+
+    if (dwError == 0) {
+        return;
+    }
+
+    FormatMessage(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER |
+        FORMAT_MESSAGE_FROM_SYSTEM |
+        FORMAT_MESSAGE_IGNORE_INSERTS,
+        nullptr,
+        dwError,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        lpMessageBuffer,
+        0, nullptr
+	);
+
+    utils::slog.e << "Windows error code: " << dwError << ". " << lpMessageBuffer
+            << utils::io::endl;
+
+    LocalFree(lpMessageBuffer);
+}
+
+} // namespace
+
+namespace filament {
+
+using namespace backend;
+
+struct WGLSwapChain {
+    HDC hDc = NULL;
+    HWND hWnd = NULL;
+    bool isHeadless = false;
+};
+
+Driver* PlatformWGL::createDriver(void* const sharedGLContext) noexcept {
+    int result = 0;
+    PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribs = nullptr;
+    int pixelFormat = 0;
+
+    mPfd = {
+        sizeof(PIXELFORMATDESCRIPTOR),
+        1,
+        PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER,    // Flags
+        PFD_TYPE_RGBA,        // The kind of framebuffer. RGBA or palette.
+        32,                   // Colordepth of the framebuffer.
+        0, 0, 0, 0, 0, 0,
+        0,
+        0,
+        0,
+        0, 0, 0, 0,
+        24,                   // Number of bits for the depthbuffer
+        0,                    // Number of bits for the stencilbuffer
+        0,                    // Number of Aux buffers in the framebuffer.
+        PFD_MAIN_PLANE,
+        0,
+        0, 0, 0
+    };
+
+    int attribs[] = {
+        WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
+        WGL_CONTEXT_MINOR_VERSION_ARB, 1,
+        WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_PROFILE_MASK_ARB,
+        0
+    };
+
+    HGLRC tempContext = NULL;
+
+    mHWnd = CreateWindowA("STATIC", "dummy", 0, 0, 0, 1, 1, NULL, NULL, NULL, NULL);
+    HDC whdc = mWhdc = GetDC(mHWnd);
+    if (whdc == NULL) {
+        utils::slog.e << "CreateWindowA() failed" << utils::io::endl;
+        goto error;
+    }
+
+    pixelFormat = ChoosePixelFormat(whdc, &mPfd);
+    SetPixelFormat(whdc, pixelFormat, &mPfd);
+
+    // We need a tmp context to retrieve and call wglCreateContextAttribsARB.
+    tempContext = wglCreateContext(whdc);
+    if (!wglMakeCurrent(whdc, tempContext)) {
+        utils::slog.e << "wglMakeCurrent() failed, whdc=" << whdc << ", tempContext=" <<
+                tempContext << utils::io::endl;
+        goto error;
+    }
+
+    wglCreateContextAttribs =
+            (PFNWGLCREATECONTEXTATTRIBSARBPROC) wglGetProcAddress("wglCreateContextAttribsARB");
+    mContext = wglCreateContextAttribs(whdc, (HGLRC) sharedGLContext, attribs);
+    if (!mContext) {
+        utils::slog.e << "wglCreateContextAttribs() failed, whdc=" << whdc << utils::io::endl;
+        goto error;
+    }
+
+    wglMakeCurrent(NULL, NULL);
+    wglDeleteContext(tempContext);
+    tempContext = NULL;
+
+    if (!wglMakeCurrent(whdc, mContext)) {
+        utils::slog.e << "wglMakeCurrent() failed, whdc=" << whdc << ", mContext=" <<
+                mContext << utils::io::endl;
+        goto error;
+    }
+
+    result = bluegl::bind();
+    ASSERT_POSTCONDITION(!result, "Unable to load OpenGL entry points.");
+    return OpenGLDriverFactory::create(this, sharedGLContext);
+
+error:
+    if (tempContext) {
+        wglDeleteContext(tempContext);
+    }
+    reportLastWindowsError();
+    terminate();
+    return NULL;
+}
+
+void PlatformWGL::terminate() noexcept {
+    wglMakeCurrent(NULL, NULL);
+    if (mContext) {
+        wglDeleteContext(mContext);
+        mContext = NULL;
+    }
+    if (mHWnd && mWhdc) {
+        ReleaseDC(mHWnd, mWhdc);
+        DestroyWindow(mHWnd);
+        mHWnd = NULL;
+        mWhdc = NULL;
+    } else if (mHWnd) {
+        DestroyWindow(mHWnd);
+        mHWnd = NULL;
+    }
+    bluegl::unbind();
+}
+
+Platform::SwapChain* PlatformWGL::createSwapChain(void* nativeWindow, uint64_t& flags) noexcept {
+    auto* swapChain = new WGLSwapChain();
+    swapChain->isHeadless = false;
+
+    // on Windows, the nativeWindow maps to a HWND
+    swapChain->hWnd = (HWND) nativeWindow;
+    swapChain->hDc = GetDC(swapChain->hWnd);
+    if (!ASSERT_POSTCONDITION_NON_FATAL(swapChain->hDc,
+            "Unable to create the SwapChain (nativeWindow = %p)", nativeWindow)) {
+        reportLastWindowsError();
+    }
+
+	// We have to match pixel formats across the HDC and HGLRC (mContext)
+    int pixelFormat = ChoosePixelFormat(swapChain->hDc, &mPfd);
+    SetPixelFormat(swapChain->hDc, pixelFormat, &mPfd);
+
+    return (Platform::SwapChain*) swapChain;
+}
+
+Platform::SwapChain* PlatformWGL::createSwapChain(uint32_t width, uint32_t height, uint64_t& flags) noexcept {
+    auto* swapChain = new WGLSwapChain();
+    swapChain->isHeadless = true;
+
+    // WS_POPUP was chosen for the window style here after some experimentation.
+    // For some reason, using other window styles resulted in corrupted pixel buffers when using
+    // readPixels.
+    RECT rect = {0, 0, width, height};
+    AdjustWindowRect(&rect, WS_POPUP, FALSE);
+    width = rect.right - rect.left;
+    height = rect.bottom - rect.top;
+
+    swapChain->hWnd = CreateWindowA("STATIC", "headless", WS_POPUP, 0, 0,
+            width, height, NULL, NULL, NULL, NULL);
+    swapChain->hDc = GetDC(swapChain->hWnd);
+    int pixelFormat = ChoosePixelFormat(swapChain->hDc, &mPfd);
+    SetPixelFormat(swapChain->hDc, pixelFormat, &mPfd);
+
+    return (Platform::SwapChain*) swapChain;
+}
+
+void PlatformWGL::destroySwapChain(Platform::SwapChain* swapChain) noexcept {
+    auto* wglSwapChain = (WGLSwapChain*) swapChain;
+
+    HDC dc = wglSwapChain->hDc;
+    HWND window = wglSwapChain->hWnd;
+    ReleaseDC(window, dc);
+
+    if (wglSwapChain->isHeadless) {
+        DestroyWindow(window);
+    }
+
+    delete wglSwapChain;
+
+    // make this swapChain not current (by making a dummy one current)
+    wglMakeCurrent(mWhdc, mContext);
+}
+
+void PlatformWGL::makeCurrent(Platform::SwapChain* drawSwapChain,
+                              Platform::SwapChain* readSwapChain) noexcept {
+    ASSERT_PRECONDITION_NON_FATAL(drawSwapChain == readSwapChain,
+                                  "PlatformWGL does not support distinct draw/read swap chains.");
+
+    auto* wglSwapChain = (WGLSwapChain*) drawSwapChain;
+    HDC hdc = wglSwapChain->hDc;
+    if (hdc != NULL) {
+        BOOL success = wglMakeCurrent(hdc, mContext);
+        if (!ASSERT_POSTCONDITION_NON_FATAL(success, "wglMakeCurrent() failed. hdc = %p", hdc)) {
+            reportLastWindowsError();
+            wglMakeCurrent(0, NULL);
+        }
+    }
+}
+
+void PlatformWGL::commit(Platform::SwapChain* swapChain) noexcept {
+    auto* wglSwapChain = (WGLSwapChain*) swapChain;
+    HDC hdc = wglSwapChain->hDc;
+    if (hdc != NULL) {
+        SwapBuffers(hdc);
+    }
+}
+
+//TODO Implement WGL fences
+Platform::Fence* PlatformWGL::createFence() noexcept {
+    return nullptr;
+}
+
+void PlatformWGL::destroyFence(Fence* fence) noexcept {
+}
+
+backend::FenceStatus PlatformWGL::waitFence(Fence* fence, uint64_t timeout) noexcept {
+    return backend::FenceStatus::ERROR;
+}
+
+} // namespace filament

filament/backend/src/opengl/PlatformWGL.h

@@ -1,70 +1,70 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_WGL_H
-#define TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_WGL_H
-
-#include <stdint.h>
-
-#include <windows.h>
-#include <utils/unwindows.h>
-
-#include <backend/DriverEnums.h>
-
-#include "private/backend/OpenGLPlatform.h"
-
-namespace filament {
-
-class PlatformWGL final : public backend::OpenGLPlatform {
-public:
-    backend::Driver* createDriver(void* const sharedGLContext) noexcept override;
-    void terminate() noexcept override;
-
-    SwapChain* createSwapChain(void* nativewindow, uint64_t& flags) noexcept override;
-    SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t& flags) noexcept override;
-    void destroySwapChain(SwapChain* swapChain) noexcept override;
-    void makeCurrent(SwapChain* drawSwapChain, SwapChain* readSwapChain) noexcept override;
-    void commit(SwapChain* swapChain) noexcept override;
-
-    Fence* createFence() noexcept override;
-    void destroyFence(Fence* fence) noexcept override;
-    backend::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept override;
-
-    void setPresentationTime(int64_t time) noexcept final override {}
-
-    Stream* createStream(void* nativeStream) noexcept final override { return nullptr; }
-    void destroyStream(Stream* stream) noexcept final override {}
-    void attach(Stream* stream, intptr_t tname) noexcept final override {}
-    void detach(Stream* stream) noexcept final override {}
-    void updateTexImage(Stream* stream, int64_t* timestamp) noexcept final override {}
-
-    ExternalTexture* createExternalTextureStorage() noexcept final override { return nullptr; }
-    void reallocateExternalStorage(ExternalTexture* ets,
-            uint32_t w, uint32_t h, backend::TextureFormat format) noexcept final override { }
-    void destroyExternalTextureStorage(ExternalTexture* ets) noexcept final override { }
-
-    int getOSVersion() const noexcept final override { return 0; }
-
-private:
-    HGLRC mContext = NULL;
-    HWND mHWnd = NULL;
-    HDC mWhdc = NULL;
-    PIXELFORMATDESCRIPTOR mPfd = {};
-};
-
-} // namespace filament
-
-#endif // TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_GLX_H
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_WGL_H
+#define TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_WGL_H
+
+#include <stdint.h>
+
+#include <windows.h>
+#include <utils/unwindows.h>
+
+#include <backend/DriverEnums.h>
+
+#include "private/backend/OpenGLPlatform.h"
+
+namespace filament {
+
+class PlatformWGL final : public backend::OpenGLPlatform {
+public:
+    backend::Driver* createDriver(void* const sharedGLContext) noexcept override;
+    void terminate() noexcept override;
+
+    SwapChain* createSwapChain(void* nativewindow, uint64_t& flags) noexcept override;
+    SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t& flags) noexcept override;
+    void destroySwapChain(SwapChain* swapChain) noexcept override;
+    void makeCurrent(SwapChain* drawSwapChain, SwapChain* readSwapChain) noexcept override;
+    void commit(SwapChain* swapChain) noexcept override;
+
+    Fence* createFence() noexcept override;
+    void destroyFence(Fence* fence) noexcept override;
+    backend::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept override;
+
+    void setPresentationTime(int64_t time) noexcept final override {}
+
+    Stream* createStream(void* nativeStream) noexcept final override { return nullptr; }
+    void destroyStream(Stream* stream) noexcept final override {}
+    void attach(Stream* stream, intptr_t tname) noexcept final override {}
+    void detach(Stream* stream) noexcept final override {}
+    void updateTexImage(Stream* stream, int64_t* timestamp) noexcept final override {}
+
+    ExternalTexture* createExternalTextureStorage() noexcept final override { return nullptr; }
+    void reallocateExternalStorage(ExternalTexture* ets,
+            uint32_t w, uint32_t h, backend::TextureFormat format) noexcept final override { }
+    void destroyExternalTextureStorage(ExternalTexture* ets) noexcept final override { }
+
+    int getOSVersion() const noexcept final override { return 0; }
+
+private:
+    HGLRC mContext = NULL;
+    HWND mHWnd = NULL;
+    HDC mWhdc = NULL;
+    PIXELFORMATDESCRIPTOR mPfd = {};
+};
+
+} // namespace filament
+
+#endif // TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_GLX_H

filament/backend/src/vulkan/VulkanContext.cpp

@@ -17,21 +17,8 @@
 #include <bluevk/BlueVK.h> // must be included before vk_mem_alloc
 
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated"
 #pragma clang diagnostic ignored "-Wundef"
 #pragma clang diagnostic ignored "-Wunused-variable"
-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
-#pragma clang diagnostic ignored "-Wtautological-compare"
-#pragma clang diagnostic ignored "-Wnullability-completeness"
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-
-static const PFN_vkGetInstanceProcAddr& vkGetInstanceProcAddr = bluevk::vkGetInstanceProcAddr;
-static const PFN_vkGetDeviceProcAddr& vkGetDeviceProcAddr = bluevk::vkGetDeviceProcAddr;
-
-#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
-#define VMA_IMPLEMENTATION
-#include <cstdio>
 #include "vk_mem_alloc.h"
 #pragma clang diagnostic pop
 

filament/backend/src/vulkan/VulkanMemory.cpp

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <bluevk/BlueVK.h> // must be included before vk_mem_alloc
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
+#pragma clang diagnostic ignored "-Wundef"
+#pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#pragma clang diagnostic ignored "-Wnullability-completeness"
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
+
+static const PFN_vkGetInstanceProcAddr& vkGetInstanceProcAddr = bluevk::vkGetInstanceProcAddr;
+static const PFN_vkGetDeviceProcAddr& vkGetDeviceProcAddr = bluevk::vkGetDeviceProcAddr;
+
+#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
+#define VMA_IMPLEMENTATION
+#include <cstdio>
+#include "vk_mem_alloc.h"
+#pragma clang diagnostic pop

filament/src/Scene.cpp

@@ -167,6 +167,16 @@ void FScene::prepare(const mat4f& worldOriginTransform) {
     for (size_t i = lightData.size(), e = (lightData.size() + 3u) & ~3u; i < e; i++) {
         new(lightData.data<POSITION_RADIUS>() + i) float4{ 0, 0, 0, 1 };
     }
+
+    // Purely for the benefit of MSAN, we can avoid uninitialized reads by zeroing out the
+    // unused scene elements between the end of the array and the rounded-up count.
+    if (UTILS_HAS_SANITIZE_MEMORY) {
+        for (size_t i = sceneData.size(), e = (sceneData.size() + 0xFu) & ~0xFu; i < e; i++) {
+            sceneData.data<LAYERS>()[i] = 0;
+            sceneData.data<VISIBLE_MASK>()[i] = 0;
+            sceneData.data<VISIBILITY_STATE>()[i] = {};
+        }
+    }
 }
 
 void FScene::updateUBOs(utils::Range<uint32_t> visibleRenderables, backend::Handle<backend::HwUniformBuffer> renderableUbh) noexcept {

ios/CocoaPods/Filament.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "Filament"
-  spec.version = "1.9.12"
+  spec.version = "1.9.13"
   spec.license = { :type => "Apache 2.0", :file => "LICENSE" }
   spec.homepage = "https://google.github.io/filament"
   spec.authors = "Google LLC."
   spec.summary = "Filament is a real-time physically based rendering engine for Android, iOS, Windows, Linux, macOS, and WASM/WebGL."
   spec.platform = :ios, "11.0"
-  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.9.12/filament-v1.9.12-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.9.13/filament-v1.9.13-ios.tgz" }
 
   # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
   spec.pod_target_xcconfig = {

java/filament/src/java/com/google/android/filament/FilamentTarget.java

@@ -1,25 +1,25 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.filament;
-
-import androidx.annotation.NonNull;
-
-public interface FilamentTarget {
-    boolean beginFrame(Engine engine, Renderer renderer);
-    void endFrame(@NonNull Renderer renderer);
-    void destroy(@NonNull Engine engine);
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.filament;
+
+import androidx.annotation.NonNull;
+
+public interface FilamentTarget {
+    boolean beginFrame(Engine engine, Renderer renderer);
+    void endFrame(@NonNull Renderer renderer);
+    void destroy(@NonNull Engine engine);
 }

libs/bluegl/bluegl-gen.py

@@ -28,10 +28,10 @@ from datetime import datetime
 
 def printApis(gl_apis):
     for api in gl_apis:
-        print '%s\t%s' % (api['api'], api['name'])
+        print('%s\t%s' % (api['api'], api['name']))
 
 def parseFunctions(include_file, matcher):
-    print 'Parsing header %s...' % include_file
+    print('Parsing header %s...' % include_file)
     regex = re.compile(matcher)
 
     functions = []
@@ -49,7 +49,7 @@ def generateHeader(api, functions, include_dir, output_dir):
     gl_suffix = '_gl_' + suffix.lower() if len(suffix) > 0 else ''
     src_file = os.path.join(include_dir, 'bluegl', 'BlueGL%s.h' % suffix)
 
-    print 'Generating public header %s...' % src_file
+    print('Generating public header %s...' % src_file)
 
     headers = ''
     if len(api['defines']) > 0:
@@ -277,7 +277,7 @@ extrn __blue_gl%(suffix)s_%(function)s: qword
 
     for platform in platforms:
         src_file = os.path.join(output_dir, 'BlueGL%s%sImpl.S' % (suffix, platform))
-        print 'Generating proxy %s...' % src_file
+        print('Generating proxy %s...' % src_file)
 
         with open(src_file, 'w') as file:
             file.write(osSpecificHeader[platform])
@@ -291,7 +291,7 @@ def generateSource(api, functions, output_dir):
     gl_suffix = '_gl_' + suffix.lower() if len(suffix) > 0 else ''
     src_file = os.path.join(output_dir, 'private_BlueGL%s.h' % suffix)
 
-    print 'Generating source %s...' % src_file
+    print('Generating source %s...' % src_file)
 
     header = '''/*
  * Copyright (C) %(year)d The Android Open Source Project
@@ -360,7 +360,7 @@ def generateApis(apis, include_dir, output_dir):
 
         # remove duplicates
         functions = list(set(functions))
-        print 'Found %s functions' % len(functions)
+        print('Found %s functions' % len(functions))
 
         generateHeader(api, functions, include_dir, output_dir)
         generateProxies(api, functions, output_dir, platforms)

libs/bluegl/src/BlueGLDarwin.cpp

@@ -1,38 +1,38 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <dlfcn.h>
-
-namespace bluegl {
-
-static void* library = nullptr;
-
-bool initBinder() {
-    const char* library_name = "/System/Library/Frameworks/OpenGL.framework/OpenGL";
-    library = dlopen(library_name, RTLD_GLOBAL | RTLD_NOW);
-    return library != nullptr;
-}
-
-void* loadFunction(const char* name) {
-    return dlsym(library, name);
-}
-
-void shutdownBinder() {
-    dlclose(library);
-    library = nullptr;
-}
-
-} // namespace bluegl
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dlfcn.h>
+
+namespace bluegl {
+
+static void* library = nullptr;
+
+bool initBinder() {
+    const char* library_name = "/System/Library/Frameworks/OpenGL.framework/OpenGL";
+    library = dlopen(library_name, RTLD_GLOBAL | RTLD_NOW);
+    return library != nullptr;
+}
+
+void* loadFunction(const char* name) {
+    return dlsym(library, name);
+}
+
+void shutdownBinder() {
+    dlclose(library);
+    library = nullptr;
+}
+
+} // namespace bluegl

libs/bluegl/src/BlueGLLinux.cpp

@@ -1,51 +1,51 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <GL/gl.h>
-#include <dlfcn.h>
-#include <string.h>
-
-namespace bluegl {
-
-struct Driver {
-    void* (*glXGetProcAddress)(const GLubyte*);
-    void* library;
-} g_driver = {nullptr, nullptr};
-
-bool initBinder() {
-    const char* library_name = "libGL.so.1";
-    g_driver.library = dlopen(library_name, RTLD_GLOBAL | RTLD_NOW);
-
-    if (!g_driver.library) {
-        return false;
-    }
-
-    g_driver.glXGetProcAddress = (void *(*)(const GLubyte *))
-            dlsym(g_driver.library, "glXGetProcAddressARB");
-
-    return g_driver.glXGetProcAddress;
-}
-
-void* loadFunction(const char* name) {
-    return (void*) g_driver.glXGetProcAddress((const GLubyte*) name);
-}
-
-void shutdownBinder() {
-    dlclose(g_driver.library);
-    memset(&g_driver, 0, sizeof(g_driver));
-}
-
-} // namespace bluegl
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <GL/gl.h>
+#include <dlfcn.h>
+#include <string.h>
+
+namespace bluegl {
+
+struct Driver {
+    void* (*glXGetProcAddress)(const GLubyte*);
+    void* library;
+} g_driver = {nullptr, nullptr};
+
+bool initBinder() {
+    const char* library_name = "libGL.so.1";
+    g_driver.library = dlopen(library_name, RTLD_GLOBAL | RTLD_NOW);
+
+    if (!g_driver.library) {
+        return false;
+    }
+
+    g_driver.glXGetProcAddress = (void *(*)(const GLubyte *))
+            dlsym(g_driver.library, "glXGetProcAddressARB");
+
+    return g_driver.glXGetProcAddress;
+}
+
+void* loadFunction(const char* name) {
+    return (void*) g_driver.glXGetProcAddress((const GLubyte*) name);
+}
+
+void shutdownBinder() {
+    dlclose(g_driver.library);
+    memset(&g_driver, 0, sizeof(g_driver));
+}
+
+} // namespace bluegl

libs/bluegl/src/BlueGLWindows.cpp

@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <windows.h>
-
-namespace bluegl {
-
-static HMODULE module = nullptr;
-
-bool initBinder() {
-    module = LoadLibraryA("opengl32.dll");
-    return module != nullptr;
-}
-
-void* loadFunction(const char* name) {
-    void *p = (void *) wglGetProcAddress(name);
-    if (p == 0 || (p == (void*) 0x1) || (p == (void*) 0x2)
-            || (p == (void*) 0x3) || (p == (void*) -1)) {
-        p = (void *) GetProcAddress(module, name);
-    }
-    return p;
-}
-
-void shutdownBinder() {
-}
-
-} // namespace bluegl
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <windows.h>
+
+namespace bluegl {
+
+static HMODULE module = nullptr;
+
+bool initBinder() {
+    module = LoadLibraryA("opengl32.dll");
+    return module != nullptr;
+}
+
+void* loadFunction(const char* name) {
+    void *p = (void *) wglGetProcAddress(name);
+    if (p == 0 || (p == (void*) 0x1) || (p == (void*) 0x2)
+            || (p == (void*) 0x3) || (p == (void*) -1)) {
+        p = (void *) GetProcAddress(module, name);
+    }
+    return p;
+}
+
+void shutdownBinder() {
+}
+
+} // namespace bluegl

libs/filagui/src/ImGuiExtensions.cpp

@@ -271,7 +271,7 @@ bool ArrowWidget::draw() {
                 qrot = quatf::fromAxisAngle(axis, angle);
                 float nqorig = sqrt(origQuat.x * origQuat.x + origQuat.y * origQuat.y +
                         origQuat.z * origQuat.z + origQuat.w * origQuat.w);
-                if (abs(nqorig) > FLT_EPSILON * FLT_EPSILON) {
+                if (std::abs(nqorig) > FLT_EPSILON * FLT_EPSILON) {
                     qorig = origQuat / nqorig;
                     qres = qrot * qorig;
                     mDirectionQuat = qres;
@@ -315,7 +315,7 @@ bool ArrowWidget::draw() {
             norm = quat * norm;
             s_ArrowTriProj[j][i] = ImVec2(quatPX(coord.x, w, h), quatPY(coord.y, w, h));
             ImU32 col = (DirColor | 0xff000000) & alpha;
-            s_ArrowColLight[j][i] = blendColor(0xff000000, col, abs(clamp(norm.z, -1.0f, 1.0f)));
+            s_ArrowColLight[j][i] = blendColor(0xff000000, col, std::abs(clamp(norm.z, -1.0f, 1.0f)));
         }
         drawTriangles(draw_list, inner_pos, s_ArrowTriProj[j], s_ArrowColLight[j], ntri);
     }

libs/utils/include/utils/compiler.h

@@ -72,6 +72,14 @@
 #    endif
 #endif
 
+#define UTILS_HAS_SANITIZE_MEMORY 0
+#if defined(__has_feature)
+#    if __has_feature(memory_sanitizer)
+#        undef UTILS_HAS_SANITIZE_MEMORY
+#        define UTILS_HAS_SANITIZE_MEMORY 1
+#    endif
+#endif
+
 /*
  * helps the compiler's optimizer predicting branches
  */

libs/utils/include/utils/unwindows.h

@@ -1,51 +1,51 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#if defined (WIN32)
-
-#ifdef max
-#undef max
-#endif
-
-#ifdef min
-#undef min
-#endif
-
-#ifdef far
-#undef far
-#endif
-
-#ifdef near
-#undef near
-#endif
-
-#ifdef ERROR
-#undef ERROR
-#endif
-
-#ifdef OPAQUE
-#undef OPAQUE
-#endif
-
-#ifdef TRANSPARENT
-#undef TRANSPARENT
-#endif
-
-#ifdef PURE
-#undef PURE
-#endif
-
-#endif
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if defined (WIN32)
+
+#ifdef max
+#undef max
+#endif
+
+#ifdef min
+#undef min
+#endif
+
+#ifdef far
+#undef far
+#endif
+
+#ifdef near
+#undef near
+#endif
+
+#ifdef ERROR
+#undef ERROR
+#endif
+
+#ifdef OPAQUE
+#undef OPAQUE
+#endif
+
+#ifdef TRANSPARENT
+#undef TRANSPARENT
+#endif
+
+#ifdef PURE
+#undef PURE
+#endif
+
+#endif

tools/cmgen/tests/Footballfield/Footballfield.txt

@@ -1,13 +1,13 @@
-Author
-======
-
-This is the work of Emil Persson, aka Humus.
-http://www.humus.name
-
-
-
-License
-=======
-
-This work is licensed under a Creative Commons Attribution 3.0 Unported License.
-http://creativecommons.org/licenses/by/3.0/
+Author
+======
+
+This is the work of Emil Persson, aka Humus.
+http://www.humus.name
+
+
+
+License
+=======
+
+This work is licensed under a Creative Commons Attribution 3.0 Unported License.
+http://creativecommons.org/licenses/by/3.0/

tools/specular-color/data/aluminium.txt

@@ -1,403 +1,403 @@
-wl	n
-6.1992e-02	6.6415e-01
-6.4630e-02	6.2647e-01
-6.7381e-02	5.8276e-01
-7.0249e-02	5.3121e-01
-7.3239e-02	4.6884e-01
-7.6355e-02	3.9013e-01
-7.9605e-02	2.8200e-01
-8.2993e-02	1.1588e-01
-8.6525e-02	5.5295e-02
-9.0208e-02	4.4408e-02
-9.4047e-02	4.0584e-02
-9.8049e-02	3.9232e-02
-1.0222e-01	3.9141e-02
-1.0657e-01	3.9857e-02
-1.1111e-01	4.1181e-02
-1.1584e-01	4.3024e-02
-1.2077e-01	4.5350e-02
-1.2591e-01	4.8158e-02
-1.3127e-01	5.1461e-02
-1.3685e-01	5.5281e-02
-1.4268e-01	5.9640e-02
-1.4875e-01	6.4557e-02
-1.5508e-01	7.0040e-02
-1.6168e-01	7.6091e-02
-1.6856e-01	8.2703e-02
-1.7573e-01	8.9866e-02
-1.8321e-01	9.7571e-02
-1.9101e-01	1.0582e-01
-1.9914e-01	1.1461e-01
-2.0762e-01	1.2398e-01
-2.1645e-01	1.3398e-01
-2.2566e-01	1.4468e-01
-2.3527e-01	1.5617e-01
-2.4528e-01	1.6860e-01
-2.5572e-01	1.8210e-01
-2.6660e-01	1.9687e-01
-2.7795e-01	2.1312e-01
-2.8978e-01	2.3109e-01
-3.0211e-01	2.5107e-01
-3.1497e-01	2.7336e-01
-3.2837e-01	2.9832e-01
-3.4235e-01	3.2634e-01
-3.5692e-01	3.5785e-01
-3.7211e-01	3.9330e-01
-3.8795e-01	4.3317e-01
-4.0446e-01	4.7790e-01
-4.2167e-01	5.2788e-01
-4.3962e-01	5.8336e-01
-4.5833e-01	6.4439e-01
-4.7783e-01	7.1074e-01
-4.9817e-01	7.8186e-01
-5.1937e-01	8.5697e-01
-5.4147e-01	9.3525e-01
-5.6452e-01	1.0162e+00
-5.8855e-01	1.1005e+00
-6.1359e-01	1.1911e+00
-6.3971e-01	1.2952e+00
-6.6693e-01	1.4286e+00
-6.9532e-01	1.6203e+00
-7.2491e-01	1.9115e+00
-7.5576e-01	2.3052e+00
-7.8793e-01	2.6523e+00
-8.2146e-01	2.7061e+00
-8.5642e-01	2.4465e+00
-8.9287e-01	2.0948e+00
-9.3087e-01	1.8089e+00
-9.7049e-01	1.6120e+00
-1.0118e+00	1.4821e+00
-1.0549e+00	1.3974e+00
-1.0997e+00	1.3440e+00
-1.1465e+00	1.3136e+00
-1.1953e+00	1.3012e+00
-1.2462e+00	1.3039e+00
-1.2993e+00	1.3197e+00
-1.3546e+00	1.3476e+00
-1.4122e+00	1.3868e+00
-1.4723e+00	1.4370e+00
-1.5350e+00	1.4979e+00
-1.6003e+00	1.5694e+00
-1.6684e+00	1.6518e+00
-1.7394e+00	1.7451e+00
-1.8134e+00	1.8497e+00
-1.8906e+00	1.9659e+00
-1.9711e+00	2.0942e+00
-2.0550e+00	2.2349e+00
-2.1424e+00	2.3887e+00
-2.2336e+00	2.5562e+00
-2.3287e+00	2.7379e+00
-2.4278e+00	2.9346e+00
-2.5311e+00	3.1468e+00
-2.6388e+00	3.3754e+00
-2.7511e+00	3.6209e+00
-2.8682e+00	3.8841e+00
-2.9903e+00	4.1657e+00
-3.1175e+00	4.4664e+00
-3.2502e+00	4.7867e+00
-3.3885e+00	5.1273e+00
-3.5328e+00	5.4887e+00
-3.6831e+00	5.8714e+00
-3.8399e+00	6.2757e+00
-4.0033e+00	6.7019e+00
-4.1737e+00	7.1501e+00
-4.3513e+00	7.6206e+00
-4.5365e+00	8.1133e+00
-4.7296e+00	8.6281e+00
-4.9308e+00	9.1649e+00
-5.1407e+00	9.7236e+00
-5.3595e+00	1.0304e+01
-5.5876e+00	1.0906e+01
-5.8254e+00	1.1530e+01
-6.0733e+00	1.2175e+01
-6.3318e+00	1.2843e+01
-6.6013e+00	1.3534e+01
-6.8822e+00	1.4250e+01
-7.1751e+00	1.4991e+01
-7.4805e+00	1.5760e+01
-7.7988e+00	1.6560e+01
-8.1307e+00	1.7394e+01
-8.4768e+00	1.8266e+01
-8.8376e+00	1.9179e+01
-9.2137e+00	2.0140e+01
-9.6058e+00	2.1153e+01
-1.0015e+01	2.2224e+01
-1.0441e+01	2.3359e+01
-1.0885e+01	2.4565e+01
-1.1348e+01	2.5849e+01
-1.1831e+01	2.7217e+01
-1.2335e+01	2.8677e+01
-1.2860e+01	3.0235e+01
-1.3407e+01	3.1898e+01
-1.3978e+01	3.3672e+01
-1.4573e+01	3.5565e+01
-1.5193e+01	3.7582e+01
-1.5840e+01	3.9728e+01
-1.6514e+01	4.2010e+01
-1.7216e+01	4.4432e+01
-1.7949e+01	4.6998e+01
-1.8713e+01	4.9712e+01
-1.9510e+01	5.2578e+01
-2.0340e+01	5.5597e+01
-2.1206e+01	5.8773e+01
-2.2108e+01	6.2105e+01
-2.3049e+01	6.5596e+01
-2.4030e+01	6.9244e+01
-2.5053e+01	7.3050e+01
-2.6119e+01	7.7013e+01
-2.7230e+01	8.1130e+01
-2.8389e+01	8.5400e+01
-2.9598e+01	8.9820e+01
-3.0857e+01	9.4387e+01
-3.2170e+01	9.9098e+01
-3.3540e+01	1.0395e+02
-3.4967e+01	1.0894e+02
-3.6455e+01	1.1406e+02
-3.8007e+01	1.1931e+02
-3.9624e+01	1.2469e+02
-4.1311e+01	1.3018e+02
-4.3069e+01	1.3580e+02
-4.4902e+01	1.4153e+02
-4.6813e+01	1.4737e+02
-4.8805e+01	1.5332e+02
-5.0882e+01	1.5938e+02
-5.3048e+01	1.6554e+02
-5.5305e+01	1.7180e+02
-5.7659e+01	1.7817e+02
-6.0113e+01	1.8463e+02
-6.2671e+01	1.9119e+02
-6.5339e+01	1.9785e+02
-6.8119e+01	2.0461e+02
-7.1019e+01	2.1147e+02
-7.4041e+01	2.1842e+02
-7.7192e+01	2.2547e+02
-8.0478e+01	2.3263e+02
-8.3903e+01	2.3988e+02
-8.7473e+01	2.4724e+02
-9.1196e+01	2.5471e+02
-9.5078e+01	2.6228e+02
-9.9124e+01	2.6996e+02
-1.0334e+02	2.7776e+02
-1.0774e+02	2.8567e+02
-1.1233e+02	2.9370e+02
-1.1711e+02	3.0185e+02
-1.2209e+02	3.1012e+02
-1.2729e+02	3.1852e+02
-1.3270e+02	3.2705e+02
-1.3835e+02	3.3572e+02
-1.4424e+02	3.4453e+02
-1.5038e+02	3.5348e+02
-1.5678e+02	3.6257e+02
-1.6345e+02	3.7182e+02
-1.7041e+02	3.8122e+02
-1.7766e+02	3.9078e+02
-1.8522e+02	4.0050e+02
-1.9310e+02	4.1039e+02
-2.0132e+02	4.2045e+02
-2.0989e+02	4.3068e+02
-2.1882e+02	4.4110e+02
-2.2814e+02	4.5171e+02
-2.3785e+02	4.6250e+02
-2.4797e+02	4.7349e+02
-
-wl	k
-6.1992e-02	9.2039e-03
-6.4630e-02	1.1074e-02
-6.7381e-02	1.3512e-02
-7.0249e-02	1.6828e-02
-7.3239e-02	2.1649e-02
-7.6355e-02	2.9549e-02
-7.9605e-02	4.6438e-02
-8.2993e-02	1.2841e-01
-8.6525e-02	3.0590e-01
-9.0208e-02	4.3313e-01
-9.4047e-02	5.3919e-01
-9.8049e-02	6.3492e-01
-1.0222e-01	7.2492e-01
-1.0657e-01	8.1159e-01
-1.1111e-01	8.9644e-01
-1.1584e-01	9.8045e-01
-1.2077e-01	1.0643e+00
-1.2591e-01	1.1487e+00
-1.3127e-01	1.2338e+00
-1.3685e-01	1.3202e+00
-1.4268e-01	1.4080e+00
-1.4875e-01	1.4975e+00
-1.5508e-01	1.5890e+00
-1.6168e-01	1.6826e+00
-1.6856e-01	1.7786e+00
-1.7573e-01	1.8771e+00
-1.8321e-01	1.9783e+00
-1.9101e-01	2.0826e+00
-1.9914e-01	2.1901e+00
-2.0762e-01	2.3011e+00
-2.1645e-01	2.4159e+00
-2.2566e-01	2.5347e+00
-2.3527e-01	2.6578e+00
-2.4528e-01	2.7856e+00
-2.5572e-01	2.9182e+00
-2.6660e-01	3.0560e+00
-2.7795e-01	3.1992e+00
-2.8978e-01	3.3482e+00
-3.0211e-01	3.5030e+00
-3.1497e-01	3.6640e+00
-3.2837e-01	3.8313e+00
-3.4235e-01	4.0052e+00
-3.5692e-01	4.1856e+00
-3.7211e-01	4.3726e+00
-3.8795e-01	4.5661e+00
-4.0446e-01	4.7659e+00
-4.2167e-01	4.9717e+00
-4.3962e-01	5.1830e+00
-4.5833e-01	5.3994e+00
-4.7783e-01	5.6203e+00
-4.9817e-01	5.8455e+00
-5.1937e-01	6.0750e+00
-5.4147e-01	6.3099e+00
-5.6452e-01	6.5519e+00
-5.8855e-01	6.8042e+00
-6.1359e-01	7.0711e+00
-6.3971e-01	7.3576e+00
-6.6693e-01	7.6672e+00
-6.9532e-01	7.9931e+00
-7.2491e-01	8.2933e+00
-7.5576e-01	8.4555e+00
-7.8793e-01	8.3611e+00
-8.2146e-01	8.1106e+00
-8.5642e-01	7.9982e+00
-8.9287e-01	8.1553e+00
-9.3087e-01	8.4990e+00
-9.7049e-01	8.9296e+00
-1.0118e+00	9.3982e+00
-1.0549e+00	9.8877e+00
-1.0997e+00	1.0393e+01
-1.1465e+00	1.0915e+01
-1.1953e+00	1.1452e+01
-1.2462e+00	1.2007e+01
-1.2993e+00	1.2581e+01
-1.3546e+00	1.3173e+01
-1.4122e+00	1.3786e+01
-1.4723e+00	1.4421e+01
-1.5350e+00	1.5077e+01
-1.6003e+00	1.5757e+01
-1.6684e+00	1.6460e+01
-1.7394e+00	1.7188e+01
-1.8134e+00	1.7942e+01
-1.8906e+00	1.8723e+01
-1.9711e+00	1.9531e+01
-2.0550e+00	2.0367e+01
-2.1424e+00	2.1233e+01
-2.2336e+00	2.2128e+01
-2.3287e+00	2.3054e+01
-2.4278e+00	2.4012e+01
-2.5311e+00	2.5002e+01
-2.6388e+00	2.6025e+01
-2.7511e+00	2.7082e+01
-2.8682e+00	2.8173e+01
-2.9903e+00	2.9300e+01
-3.1175e+00	3.0463e+01
-3.2502e+00	3.1662e+01
-3.3885e+00	3.2898e+01
-3.5328e+00	3.4172e+01
-3.6831e+00	3.5484e+01
-3.8399e+00	3.6836e+01
-4.0033e+00	3.8228e+01
-4.1737e+00	3.9660e+01
-4.3513e+00	4.1135e+01
-4.5365e+00	4.2652e+01
-4.7296e+00	4.4214e+01
-4.9308e+00	4.5821e+01
-5.1407e+00	4.7476e+01
-5.3595e+00	4.9180e+01
-5.5876e+00	5.0936e+01
-5.8254e+00	5.2747e+01
-6.0733e+00	5.4615e+01
-6.3318e+00	5.6545e+01
-6.6013e+00	5.8539e+01
-6.8822e+00	6.0601e+01
-7.1751e+00	6.2736e+01
-7.4805e+00	6.4948e+01
-7.7988e+00	6.7242e+01
-8.1307e+00	6.9620e+01
-8.4768e+00	7.2089e+01
-8.8376e+00	7.4651e+01
-9.2137e+00	7.7311e+01
-9.6058e+00	8.0072e+01
-1.0015e+01	8.2936e+01
-1.0441e+01	8.5906e+01
-1.0885e+01	8.8985e+01
-1.1348e+01	9.2173e+01
-1.1831e+01	9.5470e+01
-1.2335e+01	9.8878e+01
-1.2860e+01	1.0239e+02
-1.3407e+01	1.0602e+02
-1.3978e+01	1.0975e+02
-1.4573e+01	1.1359e+02
-1.5193e+01	1.1752e+02
-1.5840e+01	1.2156e+02
-1.6514e+01	1.2568e+02
-1.7216e+01	1.2990e+02
-1.7949e+01	1.3420e+02
-1.8713e+01	1.3858e+02
-1.9510e+01	1.4304e+02
-2.0340e+01	1.4757e+02
-2.1206e+01	1.5216e+02
-2.2108e+01	1.5681e+02
-2.3049e+01	1.6151e+02
-2.4030e+01	1.6626e+02
-2.5053e+01	1.7106e+02
-2.6119e+01	1.7589e+02
-2.7230e+01	1.8076e+02
-2.8389e+01	1.8565e+02
-2.9598e+01	1.9058e+02
-3.0857e+01	1.9553e+02
-3.2170e+01	2.0050e+02
-3.3540e+01	2.0549e+02
-3.4967e+01	2.1050e+02
-3.6455e+01	2.1553e+02
-3.8007e+01	2.2057e+02
-3.9624e+01	2.2563e+02
-4.1311e+01	2.3071e+02
-4.3069e+01	2.3582e+02
-4.4902e+01	2.4094e+02
-4.6813e+01	2.4609e+02
-4.8805e+01	2.5127e+02
-5.0882e+01	2.5648e+02
-5.3048e+01	2.6173e+02
-5.5305e+01	2.6701e+02
-5.7659e+01	2.7234e+02
-6.0113e+01	2.7772e+02
-6.2671e+01	2.8315e+02
-6.5339e+01	2.8863e+02
-6.8119e+01	2.9418e+02
-7.1019e+01	2.9980e+02
-7.4041e+01	3.0549e+02
-7.7192e+01	3.1126e+02
-8.0478e+01	3.1711e+02
-8.3903e+01	3.2305e+02
-8.7473e+01	3.2908e+02
-9.1196e+01	3.3521e+02
-9.5078e+01	3.4145e+02
-9.9124e+01	3.4779e+02
-1.0334e+02	3.5425e+02
-1.0774e+02	3.6082e+02
-1.1233e+02	3.6752e+02
-1.1711e+02	3.7434e+02
-1.2209e+02	3.8130e+02
-1.2729e+02	3.8840e+02
-1.3270e+02	3.9564e+02
-1.3835e+02	4.0303e+02
-1.4424e+02	4.1057e+02
-1.5038e+02	4.1826e+02
-1.5678e+02	4.2612e+02
-1.6345e+02	4.3415e+02
-1.7041e+02	4.4234e+02
-1.7766e+02	4.5071e+02
-1.8522e+02	4.5926e+02
-1.9310e+02	4.6800e+02
-2.0132e+02	4.7693e+02
-2.0989e+02	4.8605e+02
-2.1882e+02	4.9537e+02
-2.2814e+02	5.0490e+02
-2.3785e+02	5.1463e+02
-2.4797e+02	5.2458e+02
+wl	n
+6.1992e-02	6.6415e-01
+6.4630e-02	6.2647e-01
+6.7381e-02	5.8276e-01
+7.0249e-02	5.3121e-01
+7.3239e-02	4.6884e-01
+7.6355e-02	3.9013e-01
+7.9605e-02	2.8200e-01
+8.2993e-02	1.1588e-01
+8.6525e-02	5.5295e-02
+9.0208e-02	4.4408e-02
+9.4047e-02	4.0584e-02
+9.8049e-02	3.9232e-02
+1.0222e-01	3.9141e-02
+1.0657e-01	3.9857e-02
+1.1111e-01	4.1181e-02
+1.1584e-01	4.3024e-02
+1.2077e-01	4.5350e-02
+1.2591e-01	4.8158e-02
+1.3127e-01	5.1461e-02
+1.3685e-01	5.5281e-02
+1.4268e-01	5.9640e-02
+1.4875e-01	6.4557e-02
+1.5508e-01	7.0040e-02
+1.6168e-01	7.6091e-02
+1.6856e-01	8.2703e-02
+1.7573e-01	8.9866e-02
+1.8321e-01	9.7571e-02
+1.9101e-01	1.0582e-01
+1.9914e-01	1.1461e-01
+2.0762e-01	1.2398e-01
+2.1645e-01	1.3398e-01
+2.2566e-01	1.4468e-01
+2.3527e-01	1.5617e-01
+2.4528e-01	1.6860e-01
+2.5572e-01	1.8210e-01
+2.6660e-01	1.9687e-01
+2.7795e-01	2.1312e-01
+2.8978e-01	2.3109e-01
+3.0211e-01	2.5107e-01
+3.1497e-01	2.7336e-01
+3.2837e-01	2.9832e-01
+3.4235e-01	3.2634e-01
+3.5692e-01	3.5785e-01
+3.7211e-01	3.9330e-01
+3.8795e-01	4.3317e-01
+4.0446e-01	4.7790e-01
+4.2167e-01	5.2788e-01
+4.3962e-01	5.8336e-01
+4.5833e-01	6.4439e-01
+4.7783e-01	7.1074e-01
+4.9817e-01	7.8186e-01
+5.1937e-01	8.5697e-01
+5.4147e-01	9.3525e-01
+5.6452e-01	1.0162e+00
+5.8855e-01	1.1005e+00
+6.1359e-01	1.1911e+00
+6.3971e-01	1.2952e+00
+6.6693e-01	1.4286e+00
+6.9532e-01	1.6203e+00
+7.2491e-01	1.9115e+00
+7.5576e-01	2.3052e+00
+7.8793e-01	2.6523e+00
+8.2146e-01	2.7061e+00
+8.5642e-01	2.4465e+00
+8.9287e-01	2.0948e+00
+9.3087e-01	1.8089e+00
+9.7049e-01	1.6120e+00
+1.0118e+00	1.4821e+00
+1.0549e+00	1.3974e+00
+1.0997e+00	1.3440e+00
+1.1465e+00	1.3136e+00
+1.1953e+00	1.3012e+00
+1.2462e+00	1.3039e+00
+1.2993e+00	1.3197e+00
+1.3546e+00	1.3476e+00
+1.4122e+00	1.3868e+00
+1.4723e+00	1.4370e+00
+1.5350e+00	1.4979e+00
+1.6003e+00	1.5694e+00
+1.6684e+00	1.6518e+00
+1.7394e+00	1.7451e+00
+1.8134e+00	1.8497e+00
+1.8906e+00	1.9659e+00
+1.9711e+00	2.0942e+00
+2.0550e+00	2.2349e+00
+2.1424e+00	2.3887e+00
+2.2336e+00	2.5562e+00
+2.3287e+00	2.7379e+00
+2.4278e+00	2.9346e+00
+2.5311e+00	3.1468e+00
+2.6388e+00	3.3754e+00
+2.7511e+00	3.6209e+00
+2.8682e+00	3.8841e+00
+2.9903e+00	4.1657e+00
+3.1175e+00	4.4664e+00
+3.2502e+00	4.7867e+00
+3.3885e+00	5.1273e+00
+3.5328e+00	5.4887e+00
+3.6831e+00	5.8714e+00
+3.8399e+00	6.2757e+00
+4.0033e+00	6.7019e+00
+4.1737e+00	7.1501e+00
+4.3513e+00	7.6206e+00
+4.5365e+00	8.1133e+00
+4.7296e+00	8.6281e+00
+4.9308e+00	9.1649e+00
+5.1407e+00	9.7236e+00
+5.3595e+00	1.0304e+01
+5.5876e+00	1.0906e+01
+5.8254e+00	1.1530e+01
+6.0733e+00	1.2175e+01
+6.3318e+00	1.2843e+01
+6.6013e+00	1.3534e+01
+6.8822e+00	1.4250e+01
+7.1751e+00	1.4991e+01
+7.4805e+00	1.5760e+01
+7.7988e+00	1.6560e+01
+8.1307e+00	1.7394e+01
+8.4768e+00	1.8266e+01
+8.8376e+00	1.9179e+01
+9.2137e+00	2.0140e+01
+9.6058e+00	2.1153e+01
+1.0015e+01	2.2224e+01
+1.0441e+01	2.3359e+01
+1.0885e+01	2.4565e+01
+1.1348e+01	2.5849e+01
+1.1831e+01	2.7217e+01
+1.2335e+01	2.8677e+01
+1.2860e+01	3.0235e+01
+1.3407e+01	3.1898e+01
+1.3978e+01	3.3672e+01
+1.4573e+01	3.5565e+01
+1.5193e+01	3.7582e+01
+1.5840e+01	3.9728e+01
+1.6514e+01	4.2010e+01
+1.7216e+01	4.4432e+01
+1.7949e+01	4.6998e+01
+1.8713e+01	4.9712e+01
+1.9510e+01	5.2578e+01
+2.0340e+01	5.5597e+01
+2.1206e+01	5.8773e+01
+2.2108e+01	6.2105e+01
+2.3049e+01	6.5596e+01
+2.4030e+01	6.9244e+01
+2.5053e+01	7.3050e+01
+2.6119e+01	7.7013e+01
+2.7230e+01	8.1130e+01
+2.8389e+01	8.5400e+01
+2.9598e+01	8.9820e+01
+3.0857e+01	9.4387e+01
+3.2170e+01	9.9098e+01
+3.3540e+01	1.0395e+02
+3.4967e+01	1.0894e+02
+3.6455e+01	1.1406e+02
+3.8007e+01	1.1931e+02
+3.9624e+01	1.2469e+02
+4.1311e+01	1.3018e+02
+4.3069e+01	1.3580e+02
+4.4902e+01	1.4153e+02
+4.6813e+01	1.4737e+02
+4.8805e+01	1.5332e+02
+5.0882e+01	1.5938e+02
+5.3048e+01	1.6554e+02
+5.5305e+01	1.7180e+02
+5.7659e+01	1.7817e+02
+6.0113e+01	1.8463e+02
+6.2671e+01	1.9119e+02
+6.5339e+01	1.9785e+02
+6.8119e+01	2.0461e+02
+7.1019e+01	2.1147e+02
+7.4041e+01	2.1842e+02
+7.7192e+01	2.2547e+02
+8.0478e+01	2.3263e+02
+8.3903e+01	2.3988e+02
+8.7473e+01	2.4724e+02
+9.1196e+01	2.5471e+02
+9.5078e+01	2.6228e+02
+9.9124e+01	2.6996e+02
+1.0334e+02	2.7776e+02
+1.0774e+02	2.8567e+02
+1.1233e+02	2.9370e+02
+1.1711e+02	3.0185e+02
+1.2209e+02	3.1012e+02
+1.2729e+02	3.1852e+02
+1.3270e+02	3.2705e+02
+1.3835e+02	3.3572e+02
+1.4424e+02	3.4453e+02
+1.5038e+02	3.5348e+02
+1.5678e+02	3.6257e+02
+1.6345e+02	3.7182e+02
+1.7041e+02	3.8122e+02
+1.7766e+02	3.9078e+02
+1.8522e+02	4.0050e+02
+1.9310e+02	4.1039e+02
+2.0132e+02	4.2045e+02
+2.0989e+02	4.3068e+02
+2.1882e+02	4.4110e+02
+2.2814e+02	4.5171e+02
+2.3785e+02	4.6250e+02
+2.4797e+02	4.7349e+02
+
+wl	k
+6.1992e-02	9.2039e-03
+6.4630e-02	1.1074e-02
+6.7381e-02	1.3512e-02
+7.0249e-02	1.6828e-02
+7.3239e-02	2.1649e-02
+7.6355e-02	2.9549e-02
+7.9605e-02	4.6438e-02
+8.2993e-02	1.2841e-01
+8.6525e-02	3.0590e-01
+9.0208e-02	4.3313e-01
+9.4047e-02	5.3919e-01
+9.8049e-02	6.3492e-01
+1.0222e-01	7.2492e-01
+1.0657e-01	8.1159e-01
+1.1111e-01	8.9644e-01
+1.1584e-01	9.8045e-01
+1.2077e-01	1.0643e+00
+1.2591e-01	1.1487e+00
+1.3127e-01	1.2338e+00
+1.3685e-01	1.3202e+00
+1.4268e-01	1.4080e+00
+1.4875e-01	1.4975e+00
+1.5508e-01	1.5890e+00
+1.6168e-01	1.6826e+00
+1.6856e-01	1.7786e+00
+1.7573e-01	1.8771e+00
+1.8321e-01	1.9783e+00
+1.9101e-01	2.0826e+00
+1.9914e-01	2.1901e+00
+2.0762e-01	2.3011e+00
+2.1645e-01	2.4159e+00
+2.2566e-01	2.5347e+00
+2.3527e-01	2.6578e+00
+2.4528e-01	2.7856e+00
+2.5572e-01	2.9182e+00
+2.6660e-01	3.0560e+00
+2.7795e-01	3.1992e+00
+2.8978e-01	3.3482e+00
+3.0211e-01	3.5030e+00
+3.1497e-01	3.6640e+00
+3.2837e-01	3.8313e+00
+3.4235e-01	4.0052e+00
+3.5692e-01	4.1856e+00
+3.7211e-01	4.3726e+00
+3.8795e-01	4.5661e+00
+4.0446e-01	4.7659e+00
+4.2167e-01	4.9717e+00
+4.3962e-01	5.1830e+00
+4.5833e-01	5.3994e+00
+4.7783e-01	5.6203e+00
+4.9817e-01	5.8455e+00
+5.1937e-01	6.0750e+00
+5.4147e-01	6.3099e+00
+5.6452e-01	6.5519e+00
+5.8855e-01	6.8042e+00
+6.1359e-01	7.0711e+00
+6.3971e-01	7.3576e+00
+6.6693e-01	7.6672e+00
+6.9532e-01	7.9931e+00
+7.2491e-01	8.2933e+00
+7.5576e-01	8.4555e+00
+7.8793e-01	8.3611e+00
+8.2146e-01	8.1106e+00
+8.5642e-01	7.9982e+00
+8.9287e-01	8.1553e+00
+9.3087e-01	8.4990e+00
+9.7049e-01	8.9296e+00
+1.0118e+00	9.3982e+00
+1.0549e+00	9.8877e+00
+1.0997e+00	1.0393e+01
+1.1465e+00	1.0915e+01
+1.1953e+00	1.1452e+01
+1.2462e+00	1.2007e+01
+1.2993e+00	1.2581e+01
+1.3546e+00	1.3173e+01
+1.4122e+00	1.3786e+01
+1.4723e+00	1.4421e+01
+1.5350e+00	1.5077e+01
+1.6003e+00	1.5757e+01
+1.6684e+00	1.6460e+01
+1.7394e+00	1.7188e+01
+1.8134e+00	1.7942e+01
+1.8906e+00	1.8723e+01
+1.9711e+00	1.9531e+01
+2.0550e+00	2.0367e+01
+2.1424e+00	2.1233e+01
+2.2336e+00	2.2128e+01
+2.3287e+00	2.3054e+01
+2.4278e+00	2.4012e+01
+2.5311e+00	2.5002e+01
+2.6388e+00	2.6025e+01
+2.7511e+00	2.7082e+01
+2.8682e+00	2.8173e+01
+2.9903e+00	2.9300e+01
+3.1175e+00	3.0463e+01
+3.2502e+00	3.1662e+01
+3.3885e+00	3.2898e+01
+3.5328e+00	3.4172e+01
+3.6831e+00	3.5484e+01
+3.8399e+00	3.6836e+01
+4.0033e+00	3.8228e+01
+4.1737e+00	3.9660e+01
+4.3513e+00	4.1135e+01
+4.5365e+00	4.2652e+01
+4.7296e+00	4.4214e+01
+4.9308e+00	4.5821e+01
+5.1407e+00	4.7476e+01
+5.3595e+00	4.9180e+01
+5.5876e+00	5.0936e+01
+5.8254e+00	5.2747e+01
+6.0733e+00	5.4615e+01
+6.3318e+00	5.6545e+01
+6.6013e+00	5.8539e+01
+6.8822e+00	6.0601e+01
+7.1751e+00	6.2736e+01
+7.4805e+00	6.4948e+01
+7.7988e+00	6.7242e+01
+8.1307e+00	6.9620e+01
+8.4768e+00	7.2089e+01
+8.8376e+00	7.4651e+01
+9.2137e+00	7.7311e+01
+9.6058e+00	8.0072e+01
+1.0015e+01	8.2936e+01
+1.0441e+01	8.5906e+01
+1.0885e+01	8.8985e+01
+1.1348e+01	9.2173e+01
+1.1831e+01	9.5470e+01
+1.2335e+01	9.8878e+01
+1.2860e+01	1.0239e+02
+1.3407e+01	1.0602e+02
+1.3978e+01	1.0975e+02
+1.4573e+01	1.1359e+02
+1.5193e+01	1.1752e+02
+1.5840e+01	1.2156e+02
+1.6514e+01	1.2568e+02
+1.7216e+01	1.2990e+02
+1.7949e+01	1.3420e+02
+1.8713e+01	1.3858e+02
+1.9510e+01	1.4304e+02
+2.0340e+01	1.4757e+02
+2.1206e+01	1.5216e+02
+2.2108e+01	1.5681e+02
+2.3049e+01	1.6151e+02
+2.4030e+01	1.6626e+02
+2.5053e+01	1.7106e+02
+2.6119e+01	1.7589e+02
+2.7230e+01	1.8076e+02
+2.8389e+01	1.8565e+02
+2.9598e+01	1.9058e+02
+3.0857e+01	1.9553e+02
+3.2170e+01	2.0050e+02
+3.3540e+01	2.0549e+02
+3.4967e+01	2.1050e+02
+3.6455e+01	2.1553e+02
+3.8007e+01	2.2057e+02
+3.9624e+01	2.2563e+02
+4.1311e+01	2.3071e+02
+4.3069e+01	2.3582e+02
+4.4902e+01	2.4094e+02
+4.6813e+01	2.4609e+02
+4.8805e+01	2.5127e+02
+5.0882e+01	2.5648e+02
+5.3048e+01	2.6173e+02
+5.5305e+01	2.6701e+02
+5.7659e+01	2.7234e+02
+6.0113e+01	2.7772e+02
+6.2671e+01	2.8315e+02
+6.5339e+01	2.8863e+02
+6.8119e+01	2.9418e+02
+7.1019e+01	2.9980e+02
+7.4041e+01	3.0549e+02
+7.7192e+01	3.1126e+02
+8.0478e+01	3.1711e+02
+8.3903e+01	3.2305e+02
+8.7473e+01	3.2908e+02
+9.1196e+01	3.3521e+02
+9.5078e+01	3.4145e+02
+9.9124e+01	3.4779e+02
+1.0334e+02	3.5425e+02
+1.0774e+02	3.6082e+02
+1.1233e+02	3.6752e+02
+1.1711e+02	3.7434e+02
+1.2209e+02	3.8130e+02
+1.2729e+02	3.8840e+02
+1.3270e+02	3.9564e+02
+1.3835e+02	4.0303e+02
+1.4424e+02	4.1057e+02
+1.5038e+02	4.1826e+02
+1.5678e+02	4.2612e+02
+1.6345e+02	4.3415e+02
+1.7041e+02	4.4234e+02
+1.7766e+02	4.5071e+02
+1.8522e+02	4.5926e+02
+1.9310e+02	4.6800e+02
+2.0132e+02	4.7693e+02
+2.0989e+02	4.8605e+02
+2.1882e+02	4.9537e+02
+2.2814e+02	5.0490e+02
+2.3785e+02	5.1463e+02
+2.4797e+02	5.2458e+02

tools/specular-color/data/chromium.txt

@@ -1,101 +1,101 @@
-wl	n
-0.188	1.28
-0.192	1.31
-0.195	1.35
-0.199	1.39
-0.203	1.43
-0.207	1.46
-0.212	1.46
-0.216	1.47
-0.221	1.45
-0.226	1.43
-0.231	1.40
-0.237	1.38
-0.243	1.36
-0.249	1.36
-0.255	1.37
-0.262	1.38
-0.269	1.39
-0.276	1.43
-0.284	1.45
-0.292	1.48
-0.301	1.53
-0.311	1.58
-0.320	1.65
-0.332	1.69
-0.342	1.76
-0.354	1.84
-0.368	1.87
-0.381	1.92
-0.397	2.00
-0.413	2.08
-0.431	2.19
-0.451	2.33
-0.471	2.51
-0.496	2.75
-0.521	2.94
-0.549	3.18
-0.582	3.22
-0.617	3.17
-0.659	3.09
-0.704	3.05
-0.756	3.08
-0.821	3.20
-0.892	3.30
-0.984	3.41
-1.088	3.58
-1.216	3.67
-1.393	3.69
-1.610	3.66
-1.937	3.71
-
-wl	k
-0.188	1.64
-0.192	1.65
-0.195	1.68
-0.199	1.70
-0.203	1.70
-0.207	1.71
-0.212	1.72
-0.216	1.72
-0.221	1.73
-0.226	1.74
-0.231	1.77
-0.237	1.80
-0.243	1.85
-0.249	1.91
-0.255	1.97
-0.262	2.03
-0.269	2.08
-0.276	2.15
-0.284	2.21
-0.292	2.28
-0.301	2.34
-0.311	2.40
-0.320	2.47
-0.332	2.53
-0.342	2.58
-0.354	2.64
-0.368	2.69
-0.381	2.74
-0.397	2.83
-0.413	2.93
-0.431	3.04
-0.451	3.14
-0.471	3.24
-0.496	3.30
-0.521	3.33
-0.549	3.33
-0.582	3.30
-0.617	3.30
-0.659	3.34
-0.704	3.39
-0.756	3.42
-0.821	3.48
-0.892	3.52
-0.984	3.57
-1.088	3.58
-1.216	3.60
-1.393	3.84
-1.610	4.31
-1.937	5.04
+wl	n
+0.188	1.28
+0.192	1.31
+0.195	1.35
+0.199	1.39
+0.203	1.43
+0.207	1.46
+0.212	1.46
+0.216	1.47
+0.221	1.45
+0.226	1.43
+0.231	1.40
+0.237	1.38
+0.243	1.36
+0.249	1.36
+0.255	1.37
+0.262	1.38
+0.269	1.39
+0.276	1.43
+0.284	1.45
+0.292	1.48
+0.301	1.53
+0.311	1.58
+0.320	1.65
+0.332	1.69
+0.342	1.76
+0.354	1.84
+0.368	1.87
+0.381	1.92
+0.397	2.00
+0.413	2.08
+0.431	2.19
+0.451	2.33
+0.471	2.51
+0.496	2.75
+0.521	2.94
+0.549	3.18
+0.582	3.22
+0.617	3.17
+0.659	3.09
+0.704	3.05
+0.756	3.08
+0.821	3.20
+0.892	3.30
+0.984	3.41
+1.088	3.58
+1.216	3.67
+1.393	3.69
+1.610	3.66
+1.937	3.71
+
+wl	k
+0.188	1.64
+0.192	1.65
+0.195	1.68
+0.199	1.70
+0.203	1.70
+0.207	1.71
+0.212	1.72
+0.216	1.72
+0.221	1.73
+0.226	1.74
+0.231	1.77
+0.237	1.80
+0.243	1.85
+0.249	1.91
+0.255	1.97
+0.262	2.03
+0.269	2.08
+0.276	2.15
+0.284	2.21
+0.292	2.28
+0.301	2.34
+0.311	2.40
+0.320	2.47
+0.332	2.53
+0.342	2.58
+0.354	2.64
+0.368	2.69
+0.381	2.74
+0.397	2.83
+0.413	2.93
+0.431	3.04
+0.451	3.14
+0.471	3.24
+0.496	3.30
+0.521	3.33
+0.549	3.33
+0.582	3.30
+0.617	3.30
+0.659	3.34
+0.704	3.39
+0.756	3.42
+0.821	3.48
+0.892	3.52
+0.984	3.57
+1.088	3.58
+1.216	3.60
+1.393	3.84
+1.610	4.31
+1.937	5.04

tools/specular-color/data/copper.txt

@@ -1,403 +1,403 @@
-wl	n
-2.0664e-01	1.3031e+00
-2.1094e-01	1.3220e+00
-2.1532e-01	1.3435e+00
-2.1980e-01	1.3669e+00
-2.2437e-01	1.3916e+00
-2.2903e-01	1.4167e+00
-2.3379e-01	1.4414e+00
-2.3865e-01	1.4648e+00
-2.4361e-01	1.4861e+00
-2.4868e-01	1.5045e+00
-2.5385e-01	1.5194e+00
-2.5912e-01	1.5299e+00
-2.6451e-01	1.5355e+00
-2.7001e-01	1.5356e+00
-2.7562e-01	1.5297e+00
-2.8135e-01	1.5175e+00
-2.8720e-01	1.4987e+00
-2.9317e-01	1.4736e+00
-2.9926e-01	1.4425e+00
-3.0548e-01	1.4064e+00
-3.1183e-01	1.3668e+00
-3.1832e-01	1.3258e+00
-3.2493e-01	1.2862e+00
-3.3169e-01	1.2507e+00
-3.3858e-01	1.2220e+00
-3.4562e-01	1.2020e+00
-3.5281e-01	1.1918e+00
-3.6014e-01	1.1915e+00
-3.6763e-01	1.2001e+00
-3.7527e-01	1.2161e+00
-3.8307e-01	1.2373e+00
-3.9103e-01	1.2613e+00
-3.9916e-01	1.2856e+00
-4.0746e-01	1.3077e+00
-4.1593e-01	1.3253e+00
-4.2458e-01	1.3363e+00
-4.3340e-01	1.3389e+00
-4.4241e-01	1.3316e+00
-4.5161e-01	1.3132e+00
-4.6100e-01	1.2832e+00
-4.7058e-01	1.2413e+00
-4.8036e-01	1.1879e+00
-4.9035e-01	1.1240e+00
-5.0054e-01	1.0512e+00
-5.1094e-01	9.7185e-01
-5.2157e-01	8.8859e-01
-5.3241e-01	8.0438e-01
-5.4348e-01	7.2204e-01
-5.5477e-01	6.4392e-01
-5.6631e-01	5.7177e-01
-5.7808e-01	5.0663e-01
-5.9010e-01	4.4894e-01
-6.0236e-01	3.9868e-01
-6.1488e-01	3.5554e-01
-6.2767e-01	3.1902e-01
-6.4071e-01	2.8853e-01
-6.5403e-01	2.6347e-01
-6.6763e-01	2.4324e-01
-6.8151e-01	2.2732e-01
-6.9567e-01	2.1520e-01
-7.1014e-01	2.0645e-01
-7.2490e-01	2.0067e-01
-7.3997e-01	1.9753e-01
-7.5535e-01	1.9675e-01
-7.7105e-01	1.9806e-01
-7.8708e-01	2.0124e-01
-8.0344e-01	2.0610e-01
-8.2014e-01	2.1249e-01
-8.3719e-01	2.2024e-01
-8.5459e-01	2.2924e-01
-8.7236e-01	2.3937e-01
-8.9049e-01	2.5052e-01
-9.0900e-01	2.6262e-01
-9.2790e-01	2.7557e-01
-9.4719e-01	2.8931e-01
-9.6688e-01	3.0376e-01
-9.8698e-01	3.1885e-01
-1.0075e+00	3.3454e-01
-1.0284e+00	3.5076e-01
-1.0498e+00	3.6747e-01
-1.0716e+00	3.8461e-01
-1.0939e+00	4.0215e-01
-1.1167e+00	4.2004e-01
-1.1399e+00	4.3824e-01
-1.1636e+00	4.5673e-01
-1.1878e+00	4.7546e-01
-1.2124e+00	4.9440e-01
-1.2376e+00	5.1354e-01
-1.2634e+00	5.3284e-01
-1.2896e+00	5.5229e-01
-1.3164e+00	5.7187e-01
-1.3438e+00	5.9155e-01
-1.3717e+00	6.1134e-01
-1.4003e+00	6.3121e-01
-1.4294e+00	6.5116e-01
-1.4591e+00	6.7118e-01
-1.4894e+00	6.9127e-01
-1.5204e+00	7.1142e-01
-1.5520e+00	7.3165e-01
-1.5842e+00	7.5195e-01
-1.6172e+00	7.7232e-01
-1.6508e+00	7.9277e-01
-1.6851e+00	8.1332e-01
-1.7201e+00	8.3397e-01
-1.7559e+00	8.5474e-01
-1.7924e+00	8.7563e-01
-1.8297e+00	8.9667e-01
-1.8677e+00	9.1787e-01
-1.9065e+00	9.3926e-01
-1.9462e+00	9.6085e-01
-1.9866e+00	9.8266e-01
-2.0279e+00	1.0047e+00
-2.0701e+00	1.0271e+00
-2.1131e+00	1.0497e+00
-2.1570e+00	1.0726e+00
-2.2019e+00	1.0960e+00
-2.2476e+00	1.1197e+00
-2.2944e+00	1.1438e+00
-2.3421e+00	1.1684e+00
-2.3907e+00	1.1934e+00
-2.4404e+00	1.2190e+00
-2.4912e+00	1.2451e+00
-2.5430e+00	1.2719e+00
-2.5958e+00	1.2993e+00
-2.6498e+00	1.3273e+00
-2.7049e+00	1.3561e+00
-2.7611e+00	1.3856e+00
-2.8185e+00	1.4160e+00
-2.8771e+00	1.4472e+00
-2.9369e+00	1.4793e+00
-2.9979e+00	1.5124e+00
-3.0602e+00	1.5465e+00
-3.1239e+00	1.5817e+00
-3.1888e+00	1.6179e+00
-3.2551e+00	1.6554e+00
-3.3228e+00	1.6941e+00
-3.3918e+00	1.7341e+00
-3.4623e+00	1.7755e+00
-3.5343e+00	1.8183e+00
-3.6078e+00	1.8627e+00
-3.6828e+00	1.9086e+00
-3.7593e+00	1.9561e+00
-3.8375e+00	2.0054e+00
-3.9173e+00	2.0565e+00
-3.9987e+00	2.1095e+00
-4.0818e+00	2.1645e+00
-4.1667e+00	2.2215e+00
-4.2533e+00	2.2807e+00
-4.3417e+00	2.3422e+00
-4.4319e+00	2.4060e+00
-4.5241e+00	2.4723e+00
-4.6181e+00	2.5412e+00
-4.7141e+00	2.6127e+00
-4.8121e+00	2.6870e+00
-4.9122e+00	2.7643e+00
-5.0143e+00	2.8446e+00
-5.1185e+00	2.9280e+00
-5.2249e+00	3.0148e+00
-5.3335e+00	3.1050e+00
-5.4444e+00	3.1988e+00
-5.5576e+00	3.2963e+00
-5.6731e+00	3.3977e+00
-5.7910e+00	3.5031e+00
-5.9114e+00	3.6128e+00
-6.0343e+00	3.7269e+00
-6.1597e+00	3.8455e+00
-6.2878e+00	3.9689e+00
-6.4185e+00	4.0972e+00
-6.5519e+00	4.2306e+00
-6.6881e+00	4.3695e+00
-6.8271e+00	4.5138e+00
-6.9691e+00	4.6640e+00
-7.1139e+00	4.8202e+00
-7.2618e+00	4.9826e+00
-7.4128e+00	5.1515e+00
-7.5669e+00	5.3272e+00
-7.7242e+00	5.5099e+00
-7.8847e+00	5.6999e+00
-8.0486e+00	5.8974e+00
-8.2159e+00	6.1028e+00
-8.3867e+00	6.3164e+00
-8.5611e+00	6.5385e+00
-8.7390e+00	6.7693e+00
-8.9207e+00	7.0093e+00
-9.1061e+00	7.2588e+00
-9.2954e+00	7.5181e+00
-9.4887e+00	7.7876e+00
-9.6859e+00	8.0676e+00
-9.8873e+00	8.3586e+00
-1.0093e+01	8.6610e+00
-1.0303e+01	8.9752e+00
-1.0517e+01	9.3015e+00
-1.0735e+01	9.6405e+00
-1.0959e+01	9.9926e+00
-1.1186e+01	1.0358e+01
-1.1419e+01	1.0738e+01
-1.1656e+01	1.1132e+01
-1.1899e+01	1.1541e+01
-1.2146e+01	1.1966e+01
-1.2398e+01	1.2406e+01
-
-wl	k
-2.0664e-01	1.6826e+00
-2.1094e-01	1.7001e+00
-2.1532e-01	1.7160e+00
-2.1980e-01	1.7294e+00
-2.2437e-01	1.7398e+00
-2.2903e-01	1.7469e+00
-2.3379e-01	1.7505e+00
-2.3865e-01	1.7507e+00
-2.4361e-01	1.7474e+00
-2.4868e-01	1.7411e+00
-2.5385e-01	1.7321e+00
-2.5912e-01	1.7210e+00
-2.6451e-01	1.7083e+00
-2.7001e-01	1.6950e+00
-2.7562e-01	1.6818e+00
-2.8135e-01	1.6700e+00
-2.8720e-01	1.6607e+00
-2.9317e-01	1.6554e+00
-2.9926e-01	1.6557e+00
-3.0548e-01	1.6633e+00
-3.1183e-01	1.6796e+00
-3.1832e-01	1.7058e+00
-3.2493e-01	1.7422e+00
-3.3169e-01	1.7884e+00
-3.3858e-01	1.8427e+00
-3.4562e-01	1.9028e+00
-3.5281e-01	1.9658e+00
-3.6014e-01	2.0285e+00
-3.6763e-01	2.0881e+00
-3.7527e-01	2.1422e+00
-3.8307e-01	2.1891e+00
-3.9103e-01	2.2277e+00
-3.9916e-01	2.2575e+00
-4.0746e-01	2.2785e+00
-4.1593e-01	2.2916e+00
-4.2458e-01	2.2977e+00
-4.3340e-01	2.2984e+00
-4.4241e-01	2.2956e+00
-4.5161e-01	2.2913e+00
-4.6100e-01	2.2880e+00
-4.7058e-01	2.2880e+00
-4.8036e-01	2.2941e+00
-4.9035e-01	2.3088e+00
-5.0054e-01	2.3343e+00
-5.1094e-01	2.3725e+00
-5.2157e-01	2.4247e+00
-5.3241e-01	2.4911e+00
-5.4348e-01	2.5713e+00
-5.5477e-01	2.6639e+00
-5.6631e-01	2.7672e+00
-5.7808e-01	2.8793e+00
-5.9010e-01	2.9983e+00
-6.0236e-01	3.1227e+00
-6.1488e-01	3.2509e+00
-6.2767e-01	3.3821e+00
-6.4071e-01	3.5153e+00
-6.5403e-01	3.6500e+00
-6.6763e-01	3.7857e+00
-6.8151e-01	3.9221e+00
-6.9567e-01	4.0592e+00
-7.1014e-01	4.1967e+00
-7.2490e-01	4.3347e+00
-7.3997e-01	4.4732e+00
-7.5535e-01	4.6121e+00
-7.7105e-01	4.7516e+00
-7.8708e-01	4.8917e+00
-8.0344e-01	5.0325e+00
-8.2014e-01	5.1740e+00
-8.3719e-01	5.3164e+00
-8.5459e-01	5.4597e+00
-8.7236e-01	5.6040e+00
-8.9049e-01	5.7494e+00
-9.0900e-01	5.8960e+00
-9.2790e-01	6.0439e+00
-9.4719e-01	6.1931e+00
-9.6688e-01	6.3438e+00
-9.8698e-01	6.4959e+00
-1.0075e+00	6.6497e+00
-1.0284e+00	6.8052e+00
-1.0498e+00	6.9624e+00
-1.0716e+00	7.1215e+00
-1.0939e+00	7.2825e+00
-1.1167e+00	7.4456e+00
-1.1399e+00	7.6108e+00
-1.1636e+00	7.7782e+00
-1.1878e+00	7.9480e+00
-1.2124e+00	8.1202e+00
-1.2376e+00	8.2949e+00
-1.2634e+00	8.4722e+00
-1.2896e+00	8.6522e+00
-1.3164e+00	8.8350e+00
-1.3438e+00	9.0208e+00
-1.3717e+00	9.2095e+00
-1.4003e+00	9.4014e+00
-1.4294e+00	9.5966e+00
-1.4591e+00	9.7951e+00
-1.4894e+00	9.9970e+00
-1.5204e+00	1.0203e+01
-1.5520e+00	1.0412e+01
-1.5842e+00	1.0625e+01
-1.6172e+00	1.0842e+01
-1.6508e+00	1.1063e+01
-1.6851e+00	1.1288e+01
-1.7201e+00	1.1517e+01
-1.7559e+00	1.1751e+01
-1.7924e+00	1.1989e+01
-1.8297e+00	1.2232e+01
-1.8677e+00	1.2479e+01
-1.9065e+00	1.2732e+01
-1.9462e+00	1.2989e+01
-1.9866e+00	1.3252e+01
-2.0279e+00	1.3520e+01
-2.0701e+00	1.3793e+01
-2.1131e+00	1.4072e+01
-2.1570e+00	1.4356e+01
-2.2019e+00	1.4646e+01
-2.2476e+00	1.4942e+01
-2.2944e+00	1.5244e+01
-2.3421e+00	1.5552e+01
-2.3907e+00	1.5866e+01
-2.4404e+00	1.6187e+01
-2.4912e+00	1.6515e+01
-2.5430e+00	1.6849e+01
-2.5958e+00	1.7190e+01
-2.6498e+00	1.7539e+01
-2.7049e+00	1.7894e+01
-2.7611e+00	1.8257e+01
-2.8185e+00	1.8627e+01
-2.8771e+00	1.9005e+01
-2.9369e+00	1.9390e+01
-2.9979e+00	1.9784e+01
-3.0602e+00	2.0186e+01
-3.1239e+00	2.0596e+01
-3.1888e+00	2.1014e+01
-3.2551e+00	2.1442e+01
-3.3228e+00	2.1878e+01
-3.3918e+00	2.2323e+01
-3.4623e+00	2.2777e+01
-3.5343e+00	2.3241e+01
-3.6078e+00	2.3714e+01
-3.6828e+00	2.4197e+01
-3.7593e+00	2.4690e+01
-3.8375e+00	2.5193e+01
-3.9173e+00	2.5706e+01
-3.9987e+00	2.6230e+01
-4.0818e+00	2.6765e+01
-4.1667e+00	2.7311e+01
-4.2533e+00	2.7868e+01
-4.3417e+00	2.8436e+01
-4.4319e+00	2.9016e+01
-4.5241e+00	2.9608e+01
-4.6181e+00	3.0211e+01
-4.7141e+00	3.0828e+01
-4.8121e+00	3.1456e+01
-4.9122e+00	3.2098e+01
-5.0143e+00	3.2752e+01
-5.1185e+00	3.3420e+01
-5.2249e+00	3.4101e+01
-5.3335e+00	3.4796e+01
-5.4444e+00	3.5505e+01
-5.5576e+00	3.6228e+01
-5.6731e+00	3.6966e+01
-5.7910e+00	3.7718e+01
-5.9114e+00	3.8486e+01
-6.0343e+00	3.9269e+01
-6.1597e+00	4.0067e+01
-6.2878e+00	4.0881e+01
-6.4185e+00	4.1712e+01
-6.5519e+00	4.2559e+01
-6.6881e+00	4.3423e+01
-6.8271e+00	4.4303e+01
-6.9691e+00	4.5201e+01
-7.1139e+00	4.6117e+01
-7.2618e+00	4.7050e+01
-7.4128e+00	4.8002e+01
-7.5669e+00	4.8972e+01
-7.7242e+00	4.9961e+01
-7.8847e+00	5.0969e+01
-8.0486e+00	5.1996e+01
-8.2159e+00	5.3043e+01
-8.3867e+00	5.4110e+01
-8.5611e+00	5.5198e+01
-8.7390e+00	5.6306e+01
-8.9207e+00	5.7434e+01
-9.1061e+00	5.8584e+01
-9.2954e+00	5.9756e+01
-9.4887e+00	6.0949e+01
-9.6859e+00	6.2165e+01
-9.8873e+00	6.3403e+01
-1.0093e+01	6.4663e+01
-1.0303e+01	6.5947e+01
-1.0517e+01	6.7254e+01
-1.0735e+01	6.8584e+01
-1.0959e+01	6.9938e+01
-1.1186e+01	7.1317e+01
-1.1419e+01	7.2719e+01
-1.1656e+01	7.4147e+01
-1.1899e+01	7.5599e+01
-1.2146e+01	7.7077e+01
-1.2398e+01	7.8579e+01
+wl	n
+2.0664e-01	1.3031e+00
+2.1094e-01	1.3220e+00
+2.1532e-01	1.3435e+00
+2.1980e-01	1.3669e+00
+2.2437e-01	1.3916e+00
+2.2903e-01	1.4167e+00
+2.3379e-01	1.4414e+00
+2.3865e-01	1.4648e+00
+2.4361e-01	1.4861e+00
+2.4868e-01	1.5045e+00
+2.5385e-01	1.5194e+00
+2.5912e-01	1.5299e+00
+2.6451e-01	1.5355e+00
+2.7001e-01	1.5356e+00
+2.7562e-01	1.5297e+00
+2.8135e-01	1.5175e+00
+2.8720e-01	1.4987e+00
+2.9317e-01	1.4736e+00
+2.9926e-01	1.4425e+00
+3.0548e-01	1.4064e+00
+3.1183e-01	1.3668e+00
+3.1832e-01	1.3258e+00
+3.2493e-01	1.2862e+00
+3.3169e-01	1.2507e+00
+3.3858e-01	1.2220e+00
+3.4562e-01	1.2020e+00
+3.5281e-01	1.1918e+00
+3.6014e-01	1.1915e+00
+3.6763e-01	1.2001e+00
+3.7527e-01	1.2161e+00
+3.8307e-01	1.2373e+00
+3.9103e-01	1.2613e+00
+3.9916e-01	1.2856e+00
+4.0746e-01	1.3077e+00
+4.1593e-01	1.3253e+00
+4.2458e-01	1.3363e+00
+4.3340e-01	1.3389e+00
+4.4241e-01	1.3316e+00
+4.5161e-01	1.3132e+00
+4.6100e-01	1.2832e+00
+4.7058e-01	1.2413e+00
+4.8036e-01	1.1879e+00
+4.9035e-01	1.1240e+00
+5.0054e-01	1.0512e+00
+5.1094e-01	9.7185e-01
+5.2157e-01	8.8859e-01
+5.3241e-01	8.0438e-01
+5.4348e-01	7.2204e-01
+5.5477e-01	6.4392e-01
+5.6631e-01	5.7177e-01
+5.7808e-01	5.0663e-01
+5.9010e-01	4.4894e-01
+6.0236e-01	3.9868e-01
+6.1488e-01	3.5554e-01
+6.2767e-01	3.1902e-01
+6.4071e-01	2.8853e-01
+6.5403e-01	2.6347e-01
+6.6763e-01	2.4324e-01
+6.8151e-01	2.2732e-01
+6.9567e-01	2.1520e-01
+7.1014e-01	2.0645e-01
+7.2490e-01	2.0067e-01
+7.3997e-01	1.9753e-01
+7.5535e-01	1.9675e-01
+7.7105e-01	1.9806e-01
+7.8708e-01	2.0124e-01
+8.0344e-01	2.0610e-01
+8.2014e-01	2.1249e-01
+8.3719e-01	2.2024e-01
+8.5459e-01	2.2924e-01
+8.7236e-01	2.3937e-01
+8.9049e-01	2.5052e-01
+9.0900e-01	2.6262e-01
+9.2790e-01	2.7557e-01
+9.4719e-01	2.8931e-01
+9.6688e-01	3.0376e-01
+9.8698e-01	3.1885e-01
+1.0075e+00	3.3454e-01
+1.0284e+00	3.5076e-01
+1.0498e+00	3.6747e-01
+1.0716e+00	3.8461e-01
+1.0939e+00	4.0215e-01
+1.1167e+00	4.2004e-01
+1.1399e+00	4.3824e-01
+1.1636e+00	4.5673e-01
+1.1878e+00	4.7546e-01
+1.2124e+00	4.9440e-01
+1.2376e+00	5.1354e-01
+1.2634e+00	5.3284e-01
+1.2896e+00	5.5229e-01
+1.3164e+00	5.7187e-01
+1.3438e+00	5.9155e-01
+1.3717e+00	6.1134e-01
+1.4003e+00	6.3121e-01
+1.4294e+00	6.5116e-01
+1.4591e+00	6.7118e-01
+1.4894e+00	6.9127e-01
+1.5204e+00	7.1142e-01
+1.5520e+00	7.3165e-01
+1.5842e+00	7.5195e-01
+1.6172e+00	7.7232e-01
+1.6508e+00	7.9277e-01
+1.6851e+00	8.1332e-01
+1.7201e+00	8.3397e-01
+1.7559e+00	8.5474e-01
+1.7924e+00	8.7563e-01
+1.8297e+00	8.9667e-01
+1.8677e+00	9.1787e-01
+1.9065e+00	9.3926e-01
+1.9462e+00	9.6085e-01
+1.9866e+00	9.8266e-01
+2.0279e+00	1.0047e+00
+2.0701e+00	1.0271e+00
+2.1131e+00	1.0497e+00
+2.1570e+00	1.0726e+00
+2.2019e+00	1.0960e+00
+2.2476e+00	1.1197e+00
+2.2944e+00	1.1438e+00
+2.3421e+00	1.1684e+00
+2.3907e+00	1.1934e+00
+2.4404e+00	1.2190e+00
+2.4912e+00	1.2451e+00
+2.5430e+00	1.2719e+00
+2.5958e+00	1.2993e+00
+2.6498e+00	1.3273e+00
+2.7049e+00	1.3561e+00
+2.7611e+00	1.3856e+00
+2.8185e+00	1.4160e+00
+2.8771e+00	1.4472e+00
+2.9369e+00	1.4793e+00
+2.9979e+00	1.5124e+00
+3.0602e+00	1.5465e+00
+3.1239e+00	1.5817e+00
+3.1888e+00	1.6179e+00
+3.2551e+00	1.6554e+00
+3.3228e+00	1.6941e+00
+3.3918e+00	1.7341e+00
+3.4623e+00	1.7755e+00
+3.5343e+00	1.8183e+00
+3.6078e+00	1.8627e+00
+3.6828e+00	1.9086e+00
+3.7593e+00	1.9561e+00
+3.8375e+00	2.0054e+00
+3.9173e+00	2.0565e+00
+3.9987e+00	2.1095e+00
+4.0818e+00	2.1645e+00
+4.1667e+00	2.2215e+00
+4.2533e+00	2.2807e+00
+4.3417e+00	2.3422e+00
+4.4319e+00	2.4060e+00
+4.5241e+00	2.4723e+00
+4.6181e+00	2.5412e+00
+4.7141e+00	2.6127e+00
+4.8121e+00	2.6870e+00
+4.9122e+00	2.7643e+00
+5.0143e+00	2.8446e+00
+5.1185e+00	2.9280e+00
+5.2249e+00	3.0148e+00
+5.3335e+00	3.1050e+00
+5.4444e+00	3.1988e+00
+5.5576e+00	3.2963e+00
+5.6731e+00	3.3977e+00
+5.7910e+00	3.5031e+00
+5.9114e+00	3.6128e+00
+6.0343e+00	3.7269e+00
+6.1597e+00	3.8455e+00
+6.2878e+00	3.9689e+00
+6.4185e+00	4.0972e+00
+6.5519e+00	4.2306e+00
+6.6881e+00	4.3695e+00
+6.8271e+00	4.5138e+00
+6.9691e+00	4.6640e+00
+7.1139e+00	4.8202e+00
+7.2618e+00	4.9826e+00
+7.4128e+00	5.1515e+00
+7.5669e+00	5.3272e+00
+7.7242e+00	5.5099e+00
+7.8847e+00	5.6999e+00
+8.0486e+00	5.8974e+00
+8.2159e+00	6.1028e+00
+8.3867e+00	6.3164e+00
+8.5611e+00	6.5385e+00
+8.7390e+00	6.7693e+00
+8.9207e+00	7.0093e+00
+9.1061e+00	7.2588e+00
+9.2954e+00	7.5181e+00
+9.4887e+00	7.7876e+00
+9.6859e+00	8.0676e+00
+9.8873e+00	8.3586e+00
+1.0093e+01	8.6610e+00
+1.0303e+01	8.9752e+00
+1.0517e+01	9.3015e+00
+1.0735e+01	9.6405e+00
+1.0959e+01	9.9926e+00
+1.1186e+01	1.0358e+01
+1.1419e+01	1.0738e+01
+1.1656e+01	1.1132e+01
+1.1899e+01	1.1541e+01
+1.2146e+01	1.1966e+01
+1.2398e+01	1.2406e+01
+
+wl	k
+2.0664e-01	1.6826e+00
+2.1094e-01	1.7001e+00
+2.1532e-01	1.7160e+00
+2.1980e-01	1.7294e+00
+2.2437e-01	1.7398e+00
+2.2903e-01	1.7469e+00
+2.3379e-01	1.7505e+00
+2.3865e-01	1.7507e+00
+2.4361e-01	1.7474e+00
+2.4868e-01	1.7411e+00
+2.5385e-01	1.7321e+00
+2.5912e-01	1.7210e+00
+2.6451e-01	1.7083e+00
+2.7001e-01	1.6950e+00
+2.7562e-01	1.6818e+00
+2.8135e-01	1.6700e+00
+2.8720e-01	1.6607e+00
+2.9317e-01	1.6554e+00
+2.9926e-01	1.6557e+00
+3.0548e-01	1.6633e+00
+3.1183e-01	1.6796e+00
+3.1832e-01	1.7058e+00
+3.2493e-01	1.7422e+00
+3.3169e-01	1.7884e+00
+3.3858e-01	1.8427e+00
+3.4562e-01	1.9028e+00
+3.5281e-01	1.9658e+00
+3.6014e-01	2.0285e+00
+3.6763e-01	2.0881e+00
+3.7527e-01	2.1422e+00
+3.8307e-01	2.1891e+00
+3.9103e-01	2.2277e+00
+3.9916e-01	2.2575e+00
+4.0746e-01	2.2785e+00
+4.1593e-01	2.2916e+00
+4.2458e-01	2.2977e+00
+4.3340e-01	2.2984e+00
+4.4241e-01	2.2956e+00
+4.5161e-01	2.2913e+00
+4.6100e-01	2.2880e+00
+4.7058e-01	2.2880e+00
+4.8036e-01	2.2941e+00
+4.9035e-01	2.3088e+00
+5.0054e-01	2.3343e+00
+5.1094e-01	2.3725e+00
+5.2157e-01	2.4247e+00
+5.3241e-01	2.4911e+00
+5.4348e-01	2.5713e+00
+5.5477e-01	2.6639e+00
+5.6631e-01	2.7672e+00
+5.7808e-01	2.8793e+00
+5.9010e-01	2.9983e+00
+6.0236e-01	3.1227e+00
+6.1488e-01	3.2509e+00
+6.2767e-01	3.3821e+00
+6.4071e-01	3.5153e+00
+6.5403e-01	3.6500e+00
+6.6763e-01	3.7857e+00
+6.8151e-01	3.9221e+00
+6.9567e-01	4.0592e+00
+7.1014e-01	4.1967e+00
+7.2490e-01	4.3347e+00
+7.3997e-01	4.4732e+00
+7.5535e-01	4.6121e+00
+7.7105e-01	4.7516e+00
+7.8708e-01	4.8917e+00
+8.0344e-01	5.0325e+00
+8.2014e-01	5.1740e+00
+8.3719e-01	5.3164e+00
+8.5459e-01	5.4597e+00
+8.7236e-01	5.6040e+00
+8.9049e-01	5.7494e+00
+9.0900e-01	5.8960e+00
+9.2790e-01	6.0439e+00
+9.4719e-01	6.1931e+00
+9.6688e-01	6.3438e+00
+9.8698e-01	6.4959e+00
+1.0075e+00	6.6497e+00
+1.0284e+00	6.8052e+00
+1.0498e+00	6.9624e+00
+1.0716e+00	7.1215e+00
+1.0939e+00	7.2825e+00
+1.1167e+00	7.4456e+00
+1.1399e+00	7.6108e+00
+1.1636e+00	7.7782e+00
+1.1878e+00	7.9480e+00
+1.2124e+00	8.1202e+00
+1.2376e+00	8.2949e+00
+1.2634e+00	8.4722e+00
+1.2896e+00	8.6522e+00
+1.3164e+00	8.8350e+00
+1.3438e+00	9.0208e+00
+1.3717e+00	9.2095e+00
+1.4003e+00	9.4014e+00
+1.4294e+00	9.5966e+00
+1.4591e+00	9.7951e+00
+1.4894e+00	9.9970e+00
+1.5204e+00	1.0203e+01
+1.5520e+00	1.0412e+01
+1.5842e+00	1.0625e+01
+1.6172e+00	1.0842e+01
+1.6508e+00	1.1063e+01
+1.6851e+00	1.1288e+01
+1.7201e+00	1.1517e+01
+1.7559e+00	1.1751e+01
+1.7924e+00	1.1989e+01
+1.8297e+00	1.2232e+01
+1.8677e+00	1.2479e+01
+1.9065e+00	1.2732e+01
+1.9462e+00	1.2989e+01
+1.9866e+00	1.3252e+01
+2.0279e+00	1.3520e+01
+2.0701e+00	1.3793e+01
+2.1131e+00	1.4072e+01
+2.1570e+00	1.4356e+01
+2.2019e+00	1.4646e+01
+2.2476e+00	1.4942e+01
+2.2944e+00	1.5244e+01
+2.3421e+00	1.5552e+01
+2.3907e+00	1.5866e+01
+2.4404e+00	1.6187e+01
+2.4912e+00	1.6515e+01
+2.5430e+00	1.6849e+01
+2.5958e+00	1.7190e+01
+2.6498e+00	1.7539e+01
+2.7049e+00	1.7894e+01
+2.7611e+00	1.8257e+01
+2.8185e+00	1.8627e+01
+2.8771e+00	1.9005e+01
+2.9369e+00	1.9390e+01
+2.9979e+00	1.9784e+01
+3.0602e+00	2.0186e+01
+3.1239e+00	2.0596e+01
+3.1888e+00	2.1014e+01
+3.2551e+00	2.1442e+01
+3.3228e+00	2.1878e+01
+3.3918e+00	2.2323e+01
+3.4623e+00	2.2777e+01
+3.5343e+00	2.3241e+01
+3.6078e+00	2.3714e+01
+3.6828e+00	2.4197e+01
+3.7593e+00	2.4690e+01
+3.8375e+00	2.5193e+01
+3.9173e+00	2.5706e+01
+3.9987e+00	2.6230e+01
+4.0818e+00	2.6765e+01
+4.1667e+00	2.7311e+01
+4.2533e+00	2.7868e+01
+4.3417e+00	2.8436e+01
+4.4319e+00	2.9016e+01
+4.5241e+00	2.9608e+01
+4.6181e+00	3.0211e+01
+4.7141e+00	3.0828e+01
+4.8121e+00	3.1456e+01
+4.9122e+00	3.2098e+01
+5.0143e+00	3.2752e+01
+5.1185e+00	3.3420e+01
+5.2249e+00	3.4101e+01
+5.3335e+00	3.4796e+01
+5.4444e+00	3.5505e+01
+5.5576e+00	3.6228e+01
+5.6731e+00	3.6966e+01
+5.7910e+00	3.7718e+01
+5.9114e+00	3.8486e+01
+6.0343e+00	3.9269e+01
+6.1597e+00	4.0067e+01
+6.2878e+00	4.0881e+01
+6.4185e+00	4.1712e+01
+6.5519e+00	4.2559e+01
+6.6881e+00	4.3423e+01
+6.8271e+00	4.4303e+01
+6.9691e+00	4.5201e+01
+7.1139e+00	4.6117e+01
+7.2618e+00	4.7050e+01
+7.4128e+00	4.8002e+01
+7.5669e+00	4.8972e+01
+7.7242e+00	4.9961e+01
+7.8847e+00	5.0969e+01
+8.0486e+00	5.1996e+01
+8.2159e+00	5.3043e+01
+8.3867e+00	5.4110e+01
+8.5611e+00	5.5198e+01
+8.7390e+00	5.6306e+01
+8.9207e+00	5.7434e+01
+9.1061e+00	5.8584e+01
+9.2954e+00	5.9756e+01
+9.4887e+00	6.0949e+01
+9.6859e+00	6.2165e+01
+9.8873e+00	6.3403e+01
+1.0093e+01	6.4663e+01
+1.0303e+01	6.5947e+01
+1.0517e+01	6.7254e+01
+1.0735e+01	6.8584e+01
+1.0959e+01	6.9938e+01
+1.1186e+01	7.1317e+01
+1.1419e+01	7.2719e+01
+1.1656e+01	7.4147e+01
+1.1899e+01	7.5599e+01
+1.2146e+01	7.7077e+01
+1.2398e+01	7.8579e+01

tools/specular-color/data/gold.txt

@@ -1,403 +1,403 @@
-wl	n
-2.4797e-01	1.4943e+00
-2.5201e-01	1.5158e+00
-2.5612e-01	1.5382e+00
-2.6030e-01	1.5611e+00
-2.6454e-01	1.5844e+00
-2.6886e-01	1.6078e+00
-2.7324e-01	1.6306e+00
-2.7770e-01	1.6527e+00
-2.8222e-01	1.6733e+00
-2.8683e-01	1.6921e+00
-2.9150e-01	1.7085e+00
-2.9626e-01	1.7220e+00
-3.0109e-01	1.7322e+00
-3.0600e-01	1.7387e+00
-3.1099e-01	1.7411e+00
-3.1606e-01	1.7391e+00
-3.2121e-01	1.7327e+00
-3.2645e-01	1.7219e+00
-3.3177e-01	1.7071e+00
-3.3718e-01	1.6887e+00
-3.4268e-01	1.6677e+00
-3.4827e-01	1.6452e+00
-3.5395e-01	1.6224e+00
-3.5972e-01	1.6006e+00
-3.6559e-01	1.5810e+00
-3.7155e-01	1.5645e+00
-3.7761e-01	1.5515e+00
-3.8377e-01	1.5419e+00
-3.9002e-01	1.5351e+00
-3.9638e-01	1.5301e+00
-4.0285e-01	1.5255e+00
-4.0942e-01	1.5196e+00
-4.1609e-01	1.5107e+00
-4.2288e-01	1.4971e+00
-4.2977e-01	1.4771e+00
-4.3678e-01	1.4493e+00
-4.4390e-01	1.4126e+00
-4.5114e-01	1.3661e+00
-4.5850e-01	1.3095e+00
-4.6598e-01	1.2427e+00
-4.7358e-01	1.1664e+00
-4.8130e-01	1.0821e+00
-4.8915e-01	9.9182e-01
-4.9712e-01	8.9849e-01
-5.0523e-01	8.0543e-01
-5.1347e-01	7.1590e-01
-5.2184e-01	6.3260e-01
-5.3035e-01	5.5731e-01
-5.3900e-01	4.9085e-01
-5.4779e-01	4.3326e-01
-5.5672e-01	3.8405e-01
-5.6580e-01	3.4242e-01
-5.7503e-01	3.0751e-01
-5.8440e-01	2.7843e-01
-5.9393e-01	2.5437e-01
-6.0362e-01	2.3457e-01
-6.1346e-01	2.1841e-01
-6.2346e-01	2.0533e-01
-6.3363e-01	1.9487e-01
-6.4396e-01	1.8664e-01
-6.5446e-01	1.8030e-01
-6.6514e-01	1.7558e-01
-6.7598e-01	1.7227e-01
-6.8701e-01	1.7016e-01
-6.9821e-01	1.6911e-01
-7.0959e-01	1.6897e-01
-7.2117e-01	1.6966e-01
-7.3292e-01	1.7107e-01
-7.4488e-01	1.7313e-01
-7.5702e-01	1.7577e-01
-7.6937e-01	1.7895e-01
-7.8191e-01	1.8262e-01
-7.9466e-01	1.8675e-01
-8.0762e-01	1.9129e-01
-8.2079e-01	1.9621e-01
-8.3418e-01	2.0151e-01
-8.4778e-01	2.0715e-01
-8.6160e-01	2.1311e-01
-8.7565e-01	2.1938e-01
-8.8993e-01	2.2594e-01
-9.0445e-01	2.3278e-01
-9.1919e-01	2.3989e-01
-9.3418e-01	2.4725e-01
-9.4942e-01	2.5486e-01
-9.6490e-01	2.6271e-01
-9.8063e-01	2.7079e-01
-9.9662e-01	2.7909e-01
-1.0129e+00	2.8761e-01
-1.0294e+00	2.9634e-01
-1.0462e+00	3.0528e-01
-1.0632e+00	3.1442e-01
-1.0806e+00	3.2376e-01
-1.0982e+00	3.3329e-01
-1.1161e+00	3.4302e-01
-1.1343e+00	3.5293e-01
-1.1528e+00	3.6304e-01
-1.1716e+00	3.7334e-01
-1.1907e+00	3.8382e-01
-1.2101e+00	3.9449e-01
-1.2299e+00	4.0535e-01
-1.2499e+00	4.1641e-01
-1.2703e+00	4.2765e-01
-1.2910e+00	4.3909e-01
-1.3121e+00	4.5072e-01
-1.3335e+00	4.6256e-01
-1.3552e+00	4.7459e-01
-1.3773e+00	4.8684e-01
-1.3998e+00	4.9930e-01
-1.4226e+00	5.1198e-01
-1.4458e+00	5.2488e-01
-1.4694e+00	5.3801e-01
-1.4933e+00	5.5138e-01
-1.5177e+00	5.6499e-01
-1.5424e+00	5.7885e-01
-1.5676e+00	5.9297e-01
-1.5931e+00	6.0736e-01
-1.6191e+00	6.2203e-01
-1.6455e+00	6.3699e-01
-1.6723e+00	6.5224e-01
-1.6996e+00	6.6780e-01
-1.7273e+00	6.8368e-01
-1.7555e+00	6.9989e-01
-1.7841e+00	7.1645e-01
-1.8132e+00	7.3336e-01
-1.8428e+00	7.5065e-01
-1.8728e+00	7.6831e-01
-1.9034e+00	7.8638e-01
-1.9344e+00	8.0486e-01
-1.9660e+00	8.2377e-01
-1.9980e+00	8.4313e-01
-2.0306e+00	8.6294e-01
-2.0637e+00	8.8324e-01
-2.0974e+00	9.0404e-01
-2.1316e+00	9.2535e-01
-2.1663e+00	9.4720e-01
-2.2016e+00	9.6961e-01
-2.2375e+00	9.9259e-01
-2.2740e+00	1.0162e+00
-2.3111e+00	1.0404e+00
-2.3488e+00	1.0652e+00
-2.3871e+00	1.0907e+00
-2.4260e+00	1.1169e+00
-2.4656e+00	1.1438e+00
-2.5058e+00	1.1715e+00
-2.5467e+00	1.1999e+00
-2.5882e+00	1.2291e+00
-2.6304e+00	1.2592e+00
-2.6733e+00	1.2901e+00
-2.7169e+00	1.3219e+00
-2.7612e+00	1.3545e+00
-2.8062e+00	1.3882e+00
-2.8520e+00	1.4228e+00
-2.8985e+00	1.4584e+00
-2.9457e+00	1.4951e+00
-2.9938e+00	1.5328e+00
-3.0426e+00	1.5717e+00
-3.0922e+00	1.6117e+00
-3.1426e+00	1.6529e+00
-3.1939e+00	1.6954e+00
-3.2460e+00	1.7391e+00
-3.2989e+00	1.7842e+00
-3.3527e+00	1.8306e+00
-3.4074e+00	1.8784e+00
-3.4629e+00	1.9277e+00
-3.5194e+00	1.9785e+00
-3.5768e+00	2.0308e+00
-3.6351e+00	2.0847e+00
-3.6944e+00	2.1403e+00
-3.7546e+00	2.1976e+00
-3.8159e+00	2.2566e+00
-3.8781e+00	2.3175e+00
-3.9413e+00	2.3802e+00
-4.0056e+00	2.4449e+00
-4.0709e+00	2.5116e+00
-4.1373e+00	2.5803e+00
-4.2048e+00	2.6511e+00
-4.2733e+00	2.7242e+00
-4.3430e+00	2.7995e+00
-4.4138e+00	2.8771e+00
-4.4858e+00	2.9572e+00
-4.5589e+00	3.0397e+00
-4.6333e+00	3.1247e+00
-4.7088e+00	3.2124e+00
-4.7856e+00	3.3028e+00
-4.8637e+00	3.3960e+00
-4.9430e+00	3.4921e+00
-5.0236e+00	3.5911e+00
-5.1055e+00	3.6932e+00
-5.1888e+00	3.7985e+00
-5.2734e+00	3.9069e+00
-5.3594e+00	4.0187e+00
-5.4468e+00	4.1340e+00
-5.5356e+00	4.2528e+00
-5.6258e+00	4.3752e+00
-5.7176e+00	4.5013e+00
-5.8108e+00	4.6314e+00
-5.9056e+00	4.7653e+00
-6.0019e+00	4.9034e+00
-6.0997e+00	5.0456e+00
-6.1992e+00	5.1922e+00
-
-wl	k
-2.4797e-01	1.9575e+00
-2.5201e-01	1.9594e+00
-2.5612e-01	1.9605e+00
-2.6030e-01	1.9604e+00
-2.6454e-01	1.9587e+00
-2.6886e-01	1.9551e+00
-2.7324e-01	1.9494e+00
-2.7770e-01	1.9414e+00
-2.8222e-01	1.9312e+00
-2.8683e-01	1.9188e+00
-2.9150e-01	1.9042e+00
-2.9626e-01	1.8879e+00
-3.0109e-01	1.8700e+00
-3.0600e-01	1.8512e+00
-3.1099e-01	1.8319e+00
-3.1606e-01	1.8128e+00
-3.2121e-01	1.7946e+00
-3.2645e-01	1.7784e+00
-3.3177e-01	1.7648e+00
-3.3718e-01	1.7548e+00
-3.4268e-01	1.7490e+00
-3.4827e-01	1.7479e+00
-3.5395e-01	1.7516e+00
-3.5972e-01	1.7597e+00
-3.6559e-01	1.7714e+00
-3.7155e-01	1.7856e+00
-3.7761e-01	1.8007e+00
-3.8377e-01	1.8152e+00
-3.9002e-01	1.8276e+00
-3.9638e-01	1.8366e+00
-4.0285e-01	1.8413e+00
-4.0942e-01	1.8411e+00
-4.1609e-01	1.8362e+00
-4.2288e-01	1.8268e+00
-4.2977e-01	1.8140e+00
-4.3678e-01	1.7988e+00
-4.4390e-01	1.7829e+00
-4.5114e-01	1.7681e+00
-4.5850e-01	1.7567e+00
-4.6598e-01	1.7509e+00
-4.7358e-01	1.7532e+00
-4.8130e-01	1.7661e+00
-4.8915e-01	1.7916e+00
-4.9712e-01	1.8312e+00
-5.0523e-01	1.8852e+00
-5.1347e-01	1.9530e+00
-5.2184e-01	2.0328e+00
-5.3035e-01	2.1222e+00
-5.3900e-01	2.2188e+00
-5.4779e-01	2.3201e+00
-5.5672e-01	2.4245e+00
-5.6580e-01	2.5305e+00
-5.7503e-01	2.6370e+00
-5.8440e-01	2.7434e+00
-5.9393e-01	2.8493e+00
-6.0362e-01	2.9545e+00
-6.1346e-01	3.0587e+00
-6.2346e-01	3.1621e+00
-6.3363e-01	3.2645e+00
-6.4396e-01	3.3662e+00
-6.5446e-01	3.4671e+00
-6.6514e-01	3.5675e+00
-6.7598e-01	3.6674e+00
-6.8701e-01	3.7669e+00
-6.9821e-01	3.8661e+00
-7.0959e-01	3.9653e+00
-7.2117e-01	4.0644e+00
-7.3292e-01	4.1635e+00
-7.4488e-01	4.2629e+00
-7.5702e-01	4.3625e+00
-7.6937e-01	4.4624e+00
-7.8191e-01	4.5627e+00
-7.9466e-01	4.6635e+00
-8.0762e-01	4.7649e+00
-8.2079e-01	4.8669e+00
-8.3418e-01	4.9695e+00
-8.4778e-01	5.0729e+00
-8.6160e-01	5.1770e+00
-8.7565e-01	5.2820e+00
-8.8993e-01	5.3878e+00
-9.0445e-01	5.4946e+00
-9.1919e-01	5.6024e+00
-9.3418e-01	5.7111e+00
-9.4942e-01	5.8210e+00
-9.6490e-01	5.9319e+00
-9.8063e-01	6.0440e+00
-9.9662e-01	6.1573e+00
-1.0129e+00	6.2718e+00
-1.0294e+00	6.3875e+00
-1.0462e+00	6.5046e+00
-1.0632e+00	6.6231e+00
-1.0806e+00	6.7429e+00
-1.0982e+00	6.8642e+00
-1.1161e+00	6.9869e+00
-1.1343e+00	7.1112e+00
-1.1528e+00	7.2370e+00
-1.1716e+00	7.3644e+00
-1.1907e+00	7.4935e+00
-1.2101e+00	7.6242e+00
-1.2299e+00	7.7566e+00
-1.2499e+00	7.8908e+00
-1.2703e+00	8.0268e+00
-1.2910e+00	8.1646e+00
-1.3121e+00	8.3044e+00
-1.3335e+00	8.4460e+00
-1.3552e+00	8.5896e+00
-1.3773e+00	8.7353e+00
-1.3998e+00	8.8829e+00
-1.4226e+00	9.0327e+00
-1.4458e+00	9.1847e+00
-1.4694e+00	9.3388e+00
-1.4933e+00	9.4951e+00
-1.5177e+00	9.6538e+00
-1.5424e+00	9.8147e+00
-1.5676e+00	9.9780e+00
-1.5931e+00	1.0144e+01
-1.6191e+00	1.0312e+01
-1.6455e+00	1.0483e+01
-1.6723e+00	1.0656e+01
-1.6996e+00	1.0832e+01
-1.7273e+00	1.1010e+01
-1.7555e+00	1.1192e+01
-1.7841e+00	1.1376e+01
-1.8132e+00	1.1563e+01
-1.8428e+00	1.1752e+01
-1.8728e+00	1.1945e+01
-1.9034e+00	1.2140e+01
-1.9344e+00	1.2339e+01
-1.9660e+00	1.2541e+01
-1.9980e+00	1.2745e+01
-2.0306e+00	1.2953e+01
-2.0637e+00	1.3164e+01
-2.0974e+00	1.3379e+01
-2.1316e+00	1.3597e+01
-2.1663e+00	1.3818e+01
-2.2016e+00	1.4042e+01
-2.2375e+00	1.4271e+01
-2.2740e+00	1.4502e+01
-2.3111e+00	1.4738e+01
-2.3488e+00	1.4977e+01
-2.3871e+00	1.5219e+01
-2.4260e+00	1.5466e+01
-2.4656e+00	1.5717e+01
-2.5058e+00	1.5971e+01
-2.5467e+00	1.6229e+01
-2.5882e+00	1.6492e+01
-2.6304e+00	1.6758e+01
-2.6733e+00	1.7029e+01
-2.7169e+00	1.7304e+01
-2.7612e+00	1.7584e+01
-2.8062e+00	1.7867e+01
-2.8520e+00	1.8156e+01
-2.8985e+00	1.8448e+01
-2.9457e+00	1.8746e+01
-2.9938e+00	1.9048e+01
-3.0426e+00	1.9354e+01
-3.0922e+00	1.9666e+01
-3.1426e+00	1.9982e+01
-3.1939e+00	2.0304e+01
-3.2460e+00	2.0630e+01
-3.2989e+00	2.0962e+01
-3.3527e+00	2.1299e+01
-3.4074e+00	2.1640e+01
-3.4629e+00	2.1988e+01
-3.5194e+00	2.2340e+01
-3.5768e+00	2.2699e+01
-3.6351e+00	2.3062e+01
-3.6944e+00	2.3432e+01
-3.7546e+00	2.3807e+01
-3.8159e+00	2.4188e+01
-3.8781e+00	2.4575e+01
-3.9413e+00	2.4967e+01
-4.0056e+00	2.5366e+01
-4.0709e+00	2.5771e+01
-4.1373e+00	2.6182e+01
-4.2048e+00	2.6600e+01
-4.2733e+00	2.7023e+01
-4.3430e+00	2.7454e+01
-4.4138e+00	2.7890e+01
-4.4858e+00	2.8334e+01
-4.5589e+00	2.8784e+01
-4.6333e+00	2.9241e+01
-4.7088e+00	2.9705e+01
-4.7856e+00	3.0176e+01
-4.8637e+00	3.0653e+01
-4.9430e+00	3.1139e+01
-5.0236e+00	3.1631e+01
-5.1055e+00	3.2130e+01
-5.1888e+00	3.2637e+01
-5.2734e+00	3.3152e+01
-5.3594e+00	3.3674e+01
-5.4468e+00	3.4204e+01
-5.5356e+00	3.4741e+01
-5.6258e+00	3.5287e+01
-5.7176e+00	3.5840e+01
-5.8108e+00	3.6401e+01
-5.9056e+00	3.6971e+01
-6.0019e+00	3.7548e+01
-6.0997e+00	3.8134e+01
-6.1992e+00	3.8728e+01
+wl	n
+2.4797e-01	1.4943e+00
+2.5201e-01	1.5158e+00
+2.5612e-01	1.5382e+00
+2.6030e-01	1.5611e+00
+2.6454e-01	1.5844e+00
+2.6886e-01	1.6078e+00
+2.7324e-01	1.6306e+00
+2.7770e-01	1.6527e+00
+2.8222e-01	1.6733e+00
+2.8683e-01	1.6921e+00
+2.9150e-01	1.7085e+00
+2.9626e-01	1.7220e+00
+3.0109e-01	1.7322e+00
+3.0600e-01	1.7387e+00
+3.1099e-01	1.7411e+00
+3.1606e-01	1.7391e+00
+3.2121e-01	1.7327e+00
+3.2645e-01	1.7219e+00
+3.3177e-01	1.7071e+00
+3.3718e-01	1.6887e+00
+3.4268e-01	1.6677e+00
+3.4827e-01	1.6452e+00
+3.5395e-01	1.6224e+00
+3.5972e-01	1.6006e+00
+3.6559e-01	1.5810e+00
+3.7155e-01	1.5645e+00
+3.7761e-01	1.5515e+00
+3.8377e-01	1.5419e+00
+3.9002e-01	1.5351e+00
+3.9638e-01	1.5301e+00
+4.0285e-01	1.5255e+00
+4.0942e-01	1.5196e+00
+4.1609e-01	1.5107e+00
+4.2288e-01	1.4971e+00
+4.2977e-01	1.4771e+00
+4.3678e-01	1.4493e+00
+4.4390e-01	1.4126e+00
+4.5114e-01	1.3661e+00
+4.5850e-01	1.3095e+00
+4.6598e-01	1.2427e+00
+4.7358e-01	1.1664e+00
+4.8130e-01	1.0821e+00
+4.8915e-01	9.9182e-01
+4.9712e-01	8.9849e-01
+5.0523e-01	8.0543e-01
+5.1347e-01	7.1590e-01
+5.2184e-01	6.3260e-01
+5.3035e-01	5.5731e-01
+5.3900e-01	4.9085e-01
+5.4779e-01	4.3326e-01
+5.5672e-01	3.8405e-01
+5.6580e-01	3.4242e-01
+5.7503e-01	3.0751e-01
+5.8440e-01	2.7843e-01
+5.9393e-01	2.5437e-01
+6.0362e-01	2.3457e-01
+6.1346e-01	2.1841e-01
+6.2346e-01	2.0533e-01
+6.3363e-01	1.9487e-01
+6.4396e-01	1.8664e-01
+6.5446e-01	1.8030e-01
+6.6514e-01	1.7558e-01
+6.7598e-01	1.7227e-01
+6.8701e-01	1.7016e-01
+6.9821e-01	1.6911e-01
+7.0959e-01	1.6897e-01
+7.2117e-01	1.6966e-01
+7.3292e-01	1.7107e-01
+7.4488e-01	1.7313e-01
+7.5702e-01	1.7577e-01
+7.6937e-01	1.7895e-01
+7.8191e-01	1.8262e-01
+7.9466e-01	1.8675e-01
+8.0762e-01	1.9129e-01
+8.2079e-01	1.9621e-01
+8.3418e-01	2.0151e-01
+8.4778e-01	2.0715e-01
+8.6160e-01	2.1311e-01
+8.7565e-01	2.1938e-01
+8.8993e-01	2.2594e-01
+9.0445e-01	2.3278e-01
+9.1919e-01	2.3989e-01
+9.3418e-01	2.4725e-01
+9.4942e-01	2.5486e-01
+9.6490e-01	2.6271e-01
+9.8063e-01	2.7079e-01
+9.9662e-01	2.7909e-01
+1.0129e+00	2.8761e-01
+1.0294e+00	2.9634e-01
+1.0462e+00	3.0528e-01
+1.0632e+00	3.1442e-01
+1.0806e+00	3.2376e-01
+1.0982e+00	3.3329e-01
+1.1161e+00	3.4302e-01
+1.1343e+00	3.5293e-01
+1.1528e+00	3.6304e-01
+1.1716e+00	3.7334e-01
+1.1907e+00	3.8382e-01
+1.2101e+00	3.9449e-01
+1.2299e+00	4.0535e-01
+1.2499e+00	4.1641e-01
+1.2703e+00	4.2765e-01
+1.2910e+00	4.3909e-01
+1.3121e+00	4.5072e-01
+1.3335e+00	4.6256e-01
+1.3552e+00	4.7459e-01
+1.3773e+00	4.8684e-01
+1.3998e+00	4.9930e-01
+1.4226e+00	5.1198e-01
+1.4458e+00	5.2488e-01
+1.4694e+00	5.3801e-01
+1.4933e+00	5.5138e-01
+1.5177e+00	5.6499e-01
+1.5424e+00	5.7885e-01
+1.5676e+00	5.9297e-01
+1.5931e+00	6.0736e-01
+1.6191e+00	6.2203e-01
+1.6455e+00	6.3699e-01
+1.6723e+00	6.5224e-01
+1.6996e+00	6.6780e-01
+1.7273e+00	6.8368e-01
+1.7555e+00	6.9989e-01
+1.7841e+00	7.1645e-01
+1.8132e+00	7.3336e-01
+1.8428e+00	7.5065e-01
+1.8728e+00	7.6831e-01
+1.9034e+00	7.8638e-01
+1.9344e+00	8.0486e-01
+1.9660e+00	8.2377e-01
+1.9980e+00	8.4313e-01
+2.0306e+00	8.6294e-01
+2.0637e+00	8.8324e-01
+2.0974e+00	9.0404e-01
+2.1316e+00	9.2535e-01
+2.1663e+00	9.4720e-01
+2.2016e+00	9.6961e-01
+2.2375e+00	9.9259e-01
+2.2740e+00	1.0162e+00
+2.3111e+00	1.0404e+00
+2.3488e+00	1.0652e+00
+2.3871e+00	1.0907e+00
+2.4260e+00	1.1169e+00
+2.4656e+00	1.1438e+00
+2.5058e+00	1.1715e+00
+2.5467e+00	1.1999e+00
+2.5882e+00	1.2291e+00
+2.6304e+00	1.2592e+00
+2.6733e+00	1.2901e+00
+2.7169e+00	1.3219e+00
+2.7612e+00	1.3545e+00
+2.8062e+00	1.3882e+00
+2.8520e+00	1.4228e+00
+2.8985e+00	1.4584e+00
+2.9457e+00	1.4951e+00
+2.9938e+00	1.5328e+00
+3.0426e+00	1.5717e+00
+3.0922e+00	1.6117e+00
+3.1426e+00	1.6529e+00
+3.1939e+00	1.6954e+00
+3.2460e+00	1.7391e+00
+3.2989e+00	1.7842e+00
+3.3527e+00	1.8306e+00
+3.4074e+00	1.8784e+00
+3.4629e+00	1.9277e+00
+3.5194e+00	1.9785e+00
+3.5768e+00	2.0308e+00
+3.6351e+00	2.0847e+00
+3.6944e+00	2.1403e+00
+3.7546e+00	2.1976e+00
+3.8159e+00	2.2566e+00
+3.8781e+00	2.3175e+00
+3.9413e+00	2.3802e+00
+4.0056e+00	2.4449e+00
+4.0709e+00	2.5116e+00
+4.1373e+00	2.5803e+00
+4.2048e+00	2.6511e+00
+4.2733e+00	2.7242e+00
+4.3430e+00	2.7995e+00
+4.4138e+00	2.8771e+00
+4.4858e+00	2.9572e+00
+4.5589e+00	3.0397e+00
+4.6333e+00	3.1247e+00
+4.7088e+00	3.2124e+00
+4.7856e+00	3.3028e+00
+4.8637e+00	3.3960e+00
+4.9430e+00	3.4921e+00
+5.0236e+00	3.5911e+00
+5.1055e+00	3.6932e+00
+5.1888e+00	3.7985e+00
+5.2734e+00	3.9069e+00
+5.3594e+00	4.0187e+00
+5.4468e+00	4.1340e+00
+5.5356e+00	4.2528e+00
+5.6258e+00	4.3752e+00
+5.7176e+00	4.5013e+00
+5.8108e+00	4.6314e+00
+5.9056e+00	4.7653e+00
+6.0019e+00	4.9034e+00
+6.0997e+00	5.0456e+00
+6.1992e+00	5.1922e+00
+
+wl	k
+2.4797e-01	1.9575e+00
+2.5201e-01	1.9594e+00
+2.5612e-01	1.9605e+00
+2.6030e-01	1.9604e+00
+2.6454e-01	1.9587e+00
+2.6886e-01	1.9551e+00
+2.7324e-01	1.9494e+00
+2.7770e-01	1.9414e+00
+2.8222e-01	1.9312e+00
+2.8683e-01	1.9188e+00
+2.9150e-01	1.9042e+00
+2.9626e-01	1.8879e+00
+3.0109e-01	1.8700e+00
+3.0600e-01	1.8512e+00
+3.1099e-01	1.8319e+00
+3.1606e-01	1.8128e+00
+3.2121e-01	1.7946e+00
+3.2645e-01	1.7784e+00
+3.3177e-01	1.7648e+00
+3.3718e-01	1.7548e+00
+3.4268e-01	1.7490e+00
+3.4827e-01	1.7479e+00
+3.5395e-01	1.7516e+00
+3.5972e-01	1.7597e+00
+3.6559e-01	1.7714e+00
+3.7155e-01	1.7856e+00
+3.7761e-01	1.8007e+00
+3.8377e-01	1.8152e+00
+3.9002e-01	1.8276e+00
+3.9638e-01	1.8366e+00
+4.0285e-01	1.8413e+00
+4.0942e-01	1.8411e+00
+4.1609e-01	1.8362e+00
+4.2288e-01	1.8268e+00
+4.2977e-01	1.8140e+00
+4.3678e-01	1.7988e+00
+4.4390e-01	1.7829e+00
+4.5114e-01	1.7681e+00
+4.5850e-01	1.7567e+00
+4.6598e-01	1.7509e+00
+4.7358e-01	1.7532e+00
+4.8130e-01	1.7661e+00
+4.8915e-01	1.7916e+00
+4.9712e-01	1.8312e+00
+5.0523e-01	1.8852e+00
+5.1347e-01	1.9530e+00
+5.2184e-01	2.0328e+00
+5.3035e-01	2.1222e+00
+5.3900e-01	2.2188e+00
+5.4779e-01	2.3201e+00
+5.5672e-01	2.4245e+00
+5.6580e-01	2.5305e+00
+5.7503e-01	2.6370e+00
+5.8440e-01	2.7434e+00
+5.9393e-01	2.8493e+00
+6.0362e-01	2.9545e+00
+6.1346e-01	3.0587e+00
+6.2346e-01	3.1621e+00
+6.3363e-01	3.2645e+00
+6.4396e-01	3.3662e+00
+6.5446e-01	3.4671e+00
+6.6514e-01	3.5675e+00
+6.7598e-01	3.6674e+00
+6.8701e-01	3.7669e+00
+6.9821e-01	3.8661e+00
+7.0959e-01	3.9653e+00
+7.2117e-01	4.0644e+00
+7.3292e-01	4.1635e+00
+7.4488e-01	4.2629e+00
+7.5702e-01	4.3625e+00
+7.6937e-01	4.4624e+00
+7.8191e-01	4.5627e+00
+7.9466e-01	4.6635e+00
+8.0762e-01	4.7649e+00
+8.2079e-01	4.8669e+00
+8.3418e-01	4.9695e+00
+8.4778e-01	5.0729e+00
+8.6160e-01	5.1770e+00
+8.7565e-01	5.2820e+00
+8.8993e-01	5.3878e+00
+9.0445e-01	5.4946e+00
+9.1919e-01	5.6024e+00
+9.3418e-01	5.7111e+00
+9.4942e-01	5.8210e+00
+9.6490e-01	5.9319e+00
+9.8063e-01	6.0440e+00
+9.9662e-01	6.1573e+00
+1.0129e+00	6.2718e+00
+1.0294e+00	6.3875e+00
+1.0462e+00	6.5046e+00
+1.0632e+00	6.6231e+00
+1.0806e+00	6.7429e+00
+1.0982e+00	6.8642e+00
+1.1161e+00	6.9869e+00
+1.1343e+00	7.1112e+00
+1.1528e+00	7.2370e+00
+1.1716e+00	7.3644e+00
+1.1907e+00	7.4935e+00
+1.2101e+00	7.6242e+00
+1.2299e+00	7.7566e+00
+1.2499e+00	7.8908e+00
+1.2703e+00	8.0268e+00
+1.2910e+00	8.1646e+00
+1.3121e+00	8.3044e+00
+1.3335e+00	8.4460e+00
+1.3552e+00	8.5896e+00
+1.3773e+00	8.7353e+00
+1.3998e+00	8.8829e+00
+1.4226e+00	9.0327e+00
+1.4458e+00	9.1847e+00
+1.4694e+00	9.3388e+00
+1.4933e+00	9.4951e+00
+1.5177e+00	9.6538e+00
+1.5424e+00	9.8147e+00
+1.5676e+00	9.9780e+00
+1.5931e+00	1.0144e+01
+1.6191e+00	1.0312e+01
+1.6455e+00	1.0483e+01
+1.6723e+00	1.0656e+01
+1.6996e+00	1.0832e+01
+1.7273e+00	1.1010e+01
+1.7555e+00	1.1192e+01
+1.7841e+00	1.1376e+01
+1.8132e+00	1.1563e+01
+1.8428e+00	1.1752e+01
+1.8728e+00	1.1945e+01
+1.9034e+00	1.2140e+01
+1.9344e+00	1.2339e+01
+1.9660e+00	1.2541e+01
+1.9980e+00	1.2745e+01
+2.0306e+00	1.2953e+01
+2.0637e+00	1.3164e+01
+2.0974e+00	1.3379e+01
+2.1316e+00	1.3597e+01
+2.1663e+00	1.3818e+01
+2.2016e+00	1.4042e+01
+2.2375e+00	1.4271e+01
+2.2740e+00	1.4502e+01
+2.3111e+00	1.4738e+01
+2.3488e+00	1.4977e+01
+2.3871e+00	1.5219e+01
+2.4260e+00	1.5466e+01
+2.4656e+00	1.5717e+01
+2.5058e+00	1.5971e+01
+2.5467e+00	1.6229e+01
+2.5882e+00	1.6492e+01
+2.6304e+00	1.6758e+01
+2.6733e+00	1.7029e+01
+2.7169e+00	1.7304e+01
+2.7612e+00	1.7584e+01
+2.8062e+00	1.7867e+01
+2.8520e+00	1.8156e+01
+2.8985e+00	1.8448e+01
+2.9457e+00	1.8746e+01
+2.9938e+00	1.9048e+01
+3.0426e+00	1.9354e+01
+3.0922e+00	1.9666e+01
+3.1426e+00	1.9982e+01
+3.1939e+00	2.0304e+01
+3.2460e+00	2.0630e+01
+3.2989e+00	2.0962e+01
+3.3527e+00	2.1299e+01
+3.4074e+00	2.1640e+01
+3.4629e+00	2.1988e+01
+3.5194e+00	2.2340e+01
+3.5768e+00	2.2699e+01
+3.6351e+00	2.3062e+01
+3.6944e+00	2.3432e+01
+3.7546e+00	2.3807e+01
+3.8159e+00	2.4188e+01
+3.8781e+00	2.4575e+01
+3.9413e+00	2.4967e+01
+4.0056e+00	2.5366e+01
+4.0709e+00	2.5771e+01
+4.1373e+00	2.6182e+01
+4.2048e+00	2.6600e+01
+4.2733e+00	2.7023e+01
+4.3430e+00	2.7454e+01
+4.4138e+00	2.7890e+01
+4.4858e+00	2.8334e+01
+4.5589e+00	2.8784e+01
+4.6333e+00	2.9241e+01
+4.7088e+00	2.9705e+01
+4.7856e+00	3.0176e+01
+4.8637e+00	3.0653e+01
+4.9430e+00	3.1139e+01
+5.0236e+00	3.1631e+01
+5.1055e+00	3.2130e+01
+5.1888e+00	3.2637e+01
+5.2734e+00	3.3152e+01
+5.3594e+00	3.3674e+01
+5.4468e+00	3.4204e+01
+5.5356e+00	3.4741e+01
+5.6258e+00	3.5287e+01
+5.7176e+00	3.5840e+01
+5.8108e+00	3.6401e+01
+5.9056e+00	3.6971e+01
+6.0019e+00	3.7548e+01
+6.0997e+00	3.8134e+01
+6.1992e+00	3.8728e+01

tools/specular-color/data/iron.txt

@@ -1,101 +1,101 @@
-wl	n
-0.188	1.29
-0.192	1.35
-0.195	1.42
-0.199	1.45
-0.203	1.47
-0.207	1.49
-0.212	1.47
-0.216	1.47
-0.221	1.47
-0.226	1.47
-0.231	1.48
-0.237	1.48
-0.243	1.50
-0.249	1.51
-0.255	1.53
-0.262	1.56
-0.269	1.59
-0.276	1.62
-0.284	1.64
-0.292	1.65
-0.301	1.67
-0.311	1.69
-0.320	1.74
-0.332	1.78
-0.342	1.85
-0.354	1.93
-0.368	2.02
-0.381	2.12
-0.397	2.24
-0.413	2.35
-0.431	2.48
-0.451	2.59
-0.471	2.67
-0.496	2.74
-0.521	2.86
-0.549	2.95
-0.582	2.94
-0.617	2.88
-0.659	2.92
-0.704	2.86
-0.756	2.87
-0.821	2.94
-0.892	2.96
-0.984	2.92
-1.088	2.97
-1.216	3.03
-1.393	3.09
-1.610	3.11
-1.937	3.17
-
-wl	k
-0.188	1.35
-0.192	1.37
-0.195	1.39
-0.199	1.40
-0.203	1.40
-0.207	1.41
-0.212	1.43
-0.216	1.44
-0.221	1.47
-0.226	1.49
-0.231	1.53
-0.237	1.57
-0.243	1.61
-0.249	1.66
-0.255	1.70
-0.262	1.75
-0.269	1.79
-0.276	1.84
-0.284	1.88
-0.292	1.94
-0.301	2.00
-0.311	2.06
-0.320	2.12
-0.332	2.19
-0.342	2.27
-0.354	2.35
-0.368	2.43
-0.381	2.50
-0.397	2.58
-0.413	2.65
-0.431	2.71
-0.451	2.77
-0.471	2.82
-0.496	2.88
-0.521	2.91
-0.549	2.93
-0.582	2.99
-0.617	3.05
-0.659	3.10
-0.704	3.19
-0.756	3.28
-0.821	3.39
-0.892	3.56
-0.984	3.79
-1.088	4.06
-1.216	4.39
-1.393	4.83
-1.610	5.39
-1.937	6.12
+wl	n
+0.188	1.29
+0.192	1.35
+0.195	1.42
+0.199	1.45
+0.203	1.47
+0.207	1.49
+0.212	1.47
+0.216	1.47
+0.221	1.47
+0.226	1.47
+0.231	1.48
+0.237	1.48
+0.243	1.50
+0.249	1.51
+0.255	1.53
+0.262	1.56
+0.269	1.59
+0.276	1.62
+0.284	1.64
+0.292	1.65
+0.301	1.67
+0.311	1.69
+0.320	1.74
+0.332	1.78
+0.342	1.85
+0.354	1.93
+0.368	2.02
+0.381	2.12
+0.397	2.24
+0.413	2.35
+0.431	2.48
+0.451	2.59
+0.471	2.67
+0.496	2.74
+0.521	2.86
+0.549	2.95
+0.582	2.94
+0.617	2.88
+0.659	2.92
+0.704	2.86
+0.756	2.87
+0.821	2.94
+0.892	2.96
+0.984	2.92
+1.088	2.97
+1.216	3.03
+1.393	3.09
+1.610	3.11
+1.937	3.17
+
+wl	k
+0.188	1.35
+0.192	1.37
+0.195	1.39
+0.199	1.40
+0.203	1.40
+0.207	1.41
+0.212	1.43
+0.216	1.44
+0.221	1.47
+0.226	1.49
+0.231	1.53
+0.237	1.57
+0.243	1.61
+0.249	1.66
+0.255	1.70
+0.262	1.75
+0.269	1.79
+0.276	1.84
+0.284	1.88
+0.292	1.94
+0.301	2.00
+0.311	2.06
+0.320	2.12
+0.332	2.19
+0.342	2.27
+0.354	2.35
+0.368	2.43
+0.381	2.50
+0.397	2.58
+0.413	2.65
+0.431	2.71
+0.451	2.77
+0.471	2.82
+0.496	2.88
+0.521	2.91
+0.549	2.93
+0.582	2.99
+0.617	3.05
+0.659	3.10
+0.704	3.19
+0.756	3.28
+0.821	3.39
+0.892	3.56
+0.984	3.79
+1.088	4.06
+1.216	4.39
+1.393	4.83
+1.610	5.39
+1.937	6.12

tools/specular-color/data/platinum.txt

@@ -1,403 +1,403 @@
-wl	n
-2.4797e-01	1.4979e+00
-2.5289e-01	1.4800e+00
-2.5791e-01	1.4657e+00
-2.6303e-01	1.4552e+00
-2.6825e-01	1.4484e+00
-2.7358e-01	1.4451e+00
-2.7901e-01	1.4452e+00
-2.8455e-01	1.4483e+00
-2.9020e-01	1.4543e+00
-2.9596e-01	1.4628e+00
-3.0184e-01	1.4734e+00
-3.0783e-01	1.4860e+00
-3.1394e-01	1.5003e+00
-3.2017e-01	1.5158e+00
-3.2653e-01	1.5325e+00
-3.3301e-01	1.5501e+00
-3.3962e-01	1.5683e+00
-3.4637e-01	1.5870e+00
-3.5324e-01	1.6061e+00
-3.6025e-01	1.6254e+00
-3.6741e-01	1.6448e+00
-3.7470e-01	1.6643e+00
-3.8214e-01	1.6838e+00
-3.8973e-01	1.7032e+00
-3.9746e-01	1.7225e+00
-4.0535e-01	1.7418e+00
-4.1340e-01	1.7611e+00
-4.2161e-01	1.7804e+00
-4.2998e-01	1.7998e+00
-4.3852e-01	1.8193e+00
-4.4722e-01	1.8390e+00
-4.5610e-01	1.8591e+00
-4.6515e-01	1.8796e+00
-4.7439e-01	1.9006e+00
-4.8381e-01	1.9222e+00
-4.9341e-01	1.9445e+00
-5.0321e-01	1.9676e+00
-5.1320e-01	1.9916e+00
-5.2339e-01	2.0166e+00
-5.3378e-01	2.0427e+00
-5.4437e-01	2.0699e+00
-5.5518e-01	2.0984e+00
-5.6620e-01	2.1281e+00
-5.7744e-01	2.1592e+00
-5.8891e-01	2.1917e+00
-6.0060e-01	2.2255e+00
-6.1252e-01	2.2607e+00
-6.2468e-01	2.2974e+00
-6.3709e-01	2.3354e+00
-6.4973e-01	2.3748e+00
-6.6263e-01	2.4155e+00
-6.7579e-01	2.4574e+00
-6.8920e-01	2.5006e+00
-7.0289e-01	2.5449e+00
-7.1684e-01	2.5903e+00
-7.3107e-01	2.6366e+00
-7.4559e-01	2.6837e+00
-7.6039e-01	2.7317e+00
-7.7549e-01	2.7802e+00
-7.9088e-01	2.8294e+00
-8.0658e-01	2.8789e+00
-8.2260e-01	2.9288e+00
-8.3893e-01	2.9790e+00
-8.5558e-01	3.0294e+00
-8.7257e-01	3.0800e+00
-8.8989e-01	3.1306e+00
-9.0756e-01	3.1814e+00
-9.2557e-01	3.2324e+00
-9.4395e-01	3.2835e+00
-9.6269e-01	3.3350e+00
-9.8180e-01	3.3871e+00
-1.0013e+00	3.4398e+00
-1.0212e+00	3.4934e+00
-1.0414e+00	3.5483e+00
-1.0621e+00	3.6049e+00
-1.0832e+00	3.6634e+00
-1.1047e+00	3.7245e+00
-1.1266e+00	3.7885e+00
-1.1490e+00	3.8560e+00
-1.1718e+00	3.9275e+00
-1.1951e+00	4.0035e+00
-1.2188e+00	4.0844e+00
-1.2430e+00	4.1706e+00
-1.2677e+00	4.2623e+00
-1.2929e+00	4.3595e+00
-1.3185e+00	4.4621e+00
-1.3447e+00	4.5695e+00
-1.3714e+00	4.6810e+00
-1.3986e+00	4.7954e+00
-1.4264e+00	4.9111e+00
-1.4547e+00	5.0264e+00
-1.4836e+00	5.1391e+00
-1.5130e+00	5.2469e+00
-1.5431e+00	5.3473e+00
-1.5737e+00	5.4381e+00
-1.6050e+00	5.5170e+00
-1.6368e+00	5.5820e+00
-1.6693e+00	5.6314e+00
-1.7025e+00	5.6640e+00
-1.7363e+00	5.6790e+00
-1.7707e+00	5.6762e+00
-1.8059e+00	5.6555e+00
-1.8417e+00	5.6176e+00
-1.8783e+00	5.5630e+00
-1.9156e+00	5.4931e+00
-1.9536e+00	5.4090e+00
-1.9924e+00	5.3124e+00
-2.0319e+00	5.2048e+00
-2.0723e+00	5.0880e+00
-2.1134e+00	4.9639e+00
-2.1554e+00	4.8343e+00
-2.1982e+00	4.7012e+00
-2.2418e+00	4.5664e+00
-2.2863e+00	4.4316e+00
-2.3317e+00	4.2987e+00
-2.3780e+00	4.1689e+00
-2.4252e+00	4.0438e+00
-2.4734e+00	3.9244e+00
-2.5225e+00	3.8115e+00
-2.5725e+00	3.7059e+00
-2.6236e+00	3.6080e+00
-2.6757e+00	3.5181e+00
-2.7288e+00	3.4365e+00
-2.7830e+00	3.3629e+00
-2.8383e+00	3.2975e+00
-2.8946e+00	3.2401e+00
-2.9521e+00	3.1904e+00
-3.0107e+00	3.1483e+00
-3.0704e+00	3.1134e+00
-3.1314e+00	3.0856e+00
-3.1936e+00	3.0646e+00
-3.2570e+00	3.0502e+00
-3.3216e+00	3.0421e+00
-3.3876e+00	3.0402e+00
-3.4548e+00	3.0442e+00
-3.5234e+00	3.0540e+00
-3.5934e+00	3.0694e+00
-3.6647e+00	3.0904e+00
-3.7375e+00	3.1168e+00
-3.8117e+00	3.1484e+00
-3.8873e+00	3.1853e+00
-3.9645e+00	3.2273e+00
-4.0432e+00	3.2744e+00
-4.1235e+00	3.3265e+00
-4.2053e+00	3.3837e+00
-4.2888e+00	3.4460e+00
-4.3740e+00	3.5132e+00
-4.4608e+00	3.5855e+00
-4.5494e+00	3.6628e+00
-4.6397e+00	3.7453e+00
-4.7318e+00	3.8328e+00
-4.8257e+00	3.9255e+00
-4.9216e+00	4.0235e+00
-5.0193e+00	4.1267e+00
-5.1189e+00	4.2353e+00
-5.2205e+00	4.3494e+00
-5.3242e+00	4.4690e+00
-5.4299e+00	4.5941e+00
-5.5377e+00	4.7250e+00
-5.6476e+00	4.8617e+00
-5.7597e+00	5.0042e+00
-5.8741e+00	5.1528e+00
-5.9907e+00	5.3076e+00
-6.1096e+00	5.4685e+00
-6.2309e+00	5.6358e+00
-6.3546e+00	5.8096e+00
-6.4808e+00	5.9901e+00
-6.6094e+00	6.1772e+00
-6.7407e+00	6.3713e+00
-6.8745e+00	6.5723e+00
-7.0110e+00	6.7805e+00
-7.1502e+00	6.9959e+00
-7.2921e+00	7.2188e+00
-7.4369e+00	7.4492e+00
-7.5845e+00	7.6874e+00
-7.7351e+00	7.9333e+00
-7.8887e+00	8.1872e+00
-8.0453e+00	8.4493e+00
-8.2050e+00	8.7195e+00
-8.3679e+00	8.9982e+00
-8.5340e+00	9.2853e+00
-8.7034e+00	9.5811e+00
-8.8762e+00	9.8857e+00
-9.0524e+00	1.0199e+01
-9.2322e+00	1.0522e+01
-9.4154e+00	1.0853e+01
-9.6024e+00	1.1194e+01
-9.7930e+00	1.1544e+01
-9.9874e+00	1.1904e+01
-1.0186e+01	1.2273e+01
-1.0388e+01	1.2652e+01
-1.0594e+01	1.3041e+01
-1.0804e+01	1.3439e+01
-1.1019e+01	1.3848e+01
-1.1238e+01	1.4266e+01
-1.1461e+01	1.4694e+01
-1.1688e+01	1.5133e+01
-1.1920e+01	1.5582e+01
-1.2157e+01	1.6040e+01
-1.2398e+01	1.6510e+01
-
-wl	k
-2.4797e-01	1.6810e+00
-2.5289e-01	1.7252e+00
-2.5791e-01	1.7720e+00
-2.6303e-01	1.8208e+00
-2.6825e-01	1.8711e+00
-2.7358e-01	1.9223e+00
-2.7901e-01	1.9740e+00
-2.8455e-01	2.0259e+00
-2.9020e-01	2.0776e+00
-2.9596e-01	2.1290e+00
-3.0184e-01	2.1798e+00
-3.0783e-01	2.2299e+00
-3.1394e-01	2.2793e+00
-3.2017e-01	2.3279e+00
-3.2653e-01	2.3758e+00
-3.3301e-01	2.4229e+00
-3.3962e-01	2.4694e+00
-3.4637e-01	2.5154e+00
-3.5324e-01	2.5610e+00
-3.6025e-01	2.6062e+00
-3.6741e-01	2.6513e+00
-3.7470e-01	2.6963e+00
-3.8214e-01	2.7414e+00
-3.8973e-01	2.7867e+00
-3.9746e-01	2.8323e+00
-4.0535e-01	2.8785e+00
-4.1340e-01	2.9253e+00
-4.2161e-01	2.9727e+00
-4.2998e-01	3.0210e+00
-4.3852e-01	3.0702e+00
-4.4722e-01	3.1204e+00
-4.5610e-01	3.1717e+00
-4.6515e-01	3.2240e+00
-4.7439e-01	3.2774e+00
-4.8381e-01	3.3320e+00
-4.9341e-01	3.3878e+00
-5.0321e-01	3.4447e+00
-5.1320e-01	3.5027e+00
-5.2339e-01	3.5618e+00
-5.3378e-01	3.6219e+00
-5.4437e-01	3.6830e+00
-5.5518e-01	3.7451e+00
-5.6620e-01	3.8079e+00
-5.7744e-01	3.8715e+00
-5.8891e-01	3.9358e+00
-6.0060e-01	4.0007e+00
-6.1252e-01	4.0661e+00
-6.2468e-01	4.1318e+00
-6.3709e-01	4.1979e+00
-6.4973e-01	4.2641e+00
-6.6263e-01	4.3305e+00
-6.7579e-01	4.3969e+00
-6.8920e-01	4.4633e+00
-7.0289e-01	4.5297e+00
-7.1684e-01	4.5958e+00
-7.3107e-01	4.6618e+00
-7.4559e-01	4.7276e+00
-7.6039e-01	4.7932e+00
-7.7549e-01	4.8586e+00
-7.9088e-01	4.9238e+00
-8.0658e-01	4.9889e+00
-8.2260e-01	5.0540e+00
-8.3893e-01	5.1191e+00
-8.5558e-01	5.1843e+00
-8.7257e-01	5.2498e+00
-8.8989e-01	5.3158e+00
-9.0756e-01	5.3823e+00
-9.2557e-01	5.4496e+00
-9.4395e-01	5.5178e+00
-9.6269e-01	5.5871e+00
-9.8180e-01	5.6577e+00
-1.0013e+00	5.7297e+00
-1.0212e+00	5.8033e+00
-1.0414e+00	5.8785e+00
-1.0621e+00	5.9554e+00
-1.0832e+00	6.0341e+00
-1.1047e+00	6.1143e+00
-1.1266e+00	6.1960e+00
-1.1490e+00	6.2788e+00
-1.1718e+00	6.3623e+00
-1.1951e+00	6.4460e+00
-1.2188e+00	6.5291e+00
-1.2430e+00	6.6107e+00
-1.2677e+00	6.6899e+00
-1.2929e+00	6.7653e+00
-1.3185e+00	6.8357e+00
-1.3447e+00	6.8998e+00
-1.3714e+00	6.9560e+00
-1.3986e+00	7.0031e+00
-1.4264e+00	7.0399e+00
-1.4547e+00	7.0655e+00
-1.4836e+00	7.0792e+00
-1.5130e+00	7.0810e+00
-1.5431e+00	7.0710e+00
-1.5737e+00	7.0502e+00
-1.6050e+00	7.0198e+00
-1.6368e+00	6.9815e+00
-1.6693e+00	6.9375e+00
-1.7025e+00	6.8899e+00
-1.7363e+00	6.8415e+00
-1.7707e+00	6.7946e+00
-1.8059e+00	6.7518e+00
-1.8417e+00	6.7156e+00
-1.8783e+00	6.6881e+00
-1.9156e+00	6.6714e+00
-1.9536e+00	6.6674e+00
-1.9924e+00	6.6776e+00
-2.0319e+00	6.7034e+00
-2.0723e+00	6.7457e+00
-2.1134e+00	6.8054e+00
-2.1554e+00	6.8830e+00
-2.1982e+00	6.9789e+00
-2.2418e+00	7.0930e+00
-2.2863e+00	7.2252e+00
-2.3317e+00	7.3748e+00
-2.3780e+00	7.5413e+00
-2.4252e+00	7.7237e+00
-2.4734e+00	7.9211e+00
-2.5225e+00	8.1325e+00
-2.5725e+00	8.3567e+00
-2.6236e+00	8.5928e+00
-2.6757e+00	8.8395e+00
-2.7288e+00	9.0961e+00
-2.7830e+00	9.3617e+00
-2.8383e+00	9.6354e+00
-2.8946e+00	9.9165e+00
-2.9521e+00	1.0205e+01
-3.0107e+00	1.0499e+01
-3.0704e+00	1.0800e+01
-3.1314e+00	1.1106e+01
-3.1936e+00	1.1417e+01
-3.2570e+00	1.1734e+01
-3.3216e+00	1.2056e+01
-3.3876e+00	1.2383e+01
-3.4548e+00	1.2714e+01
-3.5234e+00	1.3050e+01
-3.5934e+00	1.3391e+01
-3.6647e+00	1.3737e+01
-3.7375e+00	1.4087e+01
-3.8117e+00	1.4442e+01
-3.8873e+00	1.4801e+01
-3.9645e+00	1.5165e+01
-4.0432e+00	1.5534e+01
-4.1235e+00	1.5908e+01
-4.2053e+00	1.6287e+01
-4.2888e+00	1.6670e+01
-4.3740e+00	1.7059e+01
-4.4608e+00	1.7452e+01
-4.5494e+00	1.7851e+01
-4.6397e+00	1.8254e+01
-4.7318e+00	1.8663e+01
-4.8257e+00	1.9078e+01
-4.9216e+00	1.9497e+01
-5.0193e+00	1.9922e+01
-5.1189e+00	2.0352e+01
-5.2205e+00	2.0788e+01
-5.3242e+00	2.1229e+01
-5.4299e+00	2.1676e+01
-5.5377e+00	2.2129e+01
-5.6476e+00	2.2587e+01
-5.7597e+00	2.3051e+01
-5.8741e+00	2.3520e+01
-5.9907e+00	2.3996e+01
-6.1096e+00	2.4477e+01
-6.2309e+00	2.4964e+01
-6.3546e+00	2.5457e+01
-6.4808e+00	2.5955e+01
-6.6094e+00	2.6460e+01
-6.7407e+00	2.6970e+01
-6.8745e+00	2.7486e+01
-7.0110e+00	2.8008e+01
-7.1502e+00	2.8536e+01
-7.2921e+00	2.9070e+01
-7.4369e+00	2.9609e+01
-7.5845e+00	3.0154e+01
-7.7351e+00	3.0705e+01
-7.8887e+00	3.1262e+01
-8.0453e+00	3.1824e+01
-8.2050e+00	3.2392e+01
-8.3679e+00	3.2965e+01
-8.5340e+00	3.3544e+01
-8.7034e+00	3.4128e+01
-8.8762e+00	3.4717e+01
-9.0524e+00	3.5311e+01
-9.2322e+00	3.5911e+01
-9.4154e+00	3.6516e+01
-9.6024e+00	3.7125e+01
-9.7930e+00	3.7740e+01
-9.9874e+00	3.8359e+01
-1.0186e+01	3.8983e+01
-1.0388e+01	3.9611e+01
-1.0594e+01	4.0244e+01
-1.0804e+01	4.0881e+01
-1.1019e+01	4.1522e+01
-1.1238e+01	4.2167e+01
-1.1461e+01	4.2816e+01
-1.1688e+01	4.3469e+01
-1.1920e+01	4.4125e+01
-1.2157e+01	4.4785e+01
-1.2398e+01	4.5448e+01
+wl	n
+2.4797e-01	1.4979e+00
+2.5289e-01	1.4800e+00
+2.5791e-01	1.4657e+00
+2.6303e-01	1.4552e+00
+2.6825e-01	1.4484e+00
+2.7358e-01	1.4451e+00
+2.7901e-01	1.4452e+00
+2.8455e-01	1.4483e+00
+2.9020e-01	1.4543e+00
+2.9596e-01	1.4628e+00
+3.0184e-01	1.4734e+00
+3.0783e-01	1.4860e+00
+3.1394e-01	1.5003e+00
+3.2017e-01	1.5158e+00
+3.2653e-01	1.5325e+00
+3.3301e-01	1.5501e+00
+3.3962e-01	1.5683e+00
+3.4637e-01	1.5870e+00
+3.5324e-01	1.6061e+00
+3.6025e-01	1.6254e+00
+3.6741e-01	1.6448e+00
+3.7470e-01	1.6643e+00
+3.8214e-01	1.6838e+00
+3.8973e-01	1.7032e+00
+3.9746e-01	1.7225e+00
+4.0535e-01	1.7418e+00
+4.1340e-01	1.7611e+00
+4.2161e-01	1.7804e+00
+4.2998e-01	1.7998e+00
+4.3852e-01	1.8193e+00
+4.4722e-01	1.8390e+00
+4.5610e-01	1.8591e+00
+4.6515e-01	1.8796e+00
+4.7439e-01	1.9006e+00
+4.8381e-01	1.9222e+00
+4.9341e-01	1.9445e+00
+5.0321e-01	1.9676e+00
+5.1320e-01	1.9916e+00
+5.2339e-01	2.0166e+00
+5.3378e-01	2.0427e+00
+5.4437e-01	2.0699e+00
+5.5518e-01	2.0984e+00
+5.6620e-01	2.1281e+00
+5.7744e-01	2.1592e+00
+5.8891e-01	2.1917e+00
+6.0060e-01	2.2255e+00
+6.1252e-01	2.2607e+00
+6.2468e-01	2.2974e+00
+6.3709e-01	2.3354e+00
+6.4973e-01	2.3748e+00
+6.6263e-01	2.4155e+00
+6.7579e-01	2.4574e+00
+6.8920e-01	2.5006e+00
+7.0289e-01	2.5449e+00
+7.1684e-01	2.5903e+00
+7.3107e-01	2.6366e+00
+7.4559e-01	2.6837e+00
+7.6039e-01	2.7317e+00
+7.7549e-01	2.7802e+00
+7.9088e-01	2.8294e+00
+8.0658e-01	2.8789e+00
+8.2260e-01	2.9288e+00
+8.3893e-01	2.9790e+00
+8.5558e-01	3.0294e+00
+8.7257e-01	3.0800e+00
+8.8989e-01	3.1306e+00
+9.0756e-01	3.1814e+00
+9.2557e-01	3.2324e+00
+9.4395e-01	3.2835e+00
+9.6269e-01	3.3350e+00
+9.8180e-01	3.3871e+00
+1.0013e+00	3.4398e+00
+1.0212e+00	3.4934e+00
+1.0414e+00	3.5483e+00
+1.0621e+00	3.6049e+00
+1.0832e+00	3.6634e+00
+1.1047e+00	3.7245e+00
+1.1266e+00	3.7885e+00
+1.1490e+00	3.8560e+00
+1.1718e+00	3.9275e+00
+1.1951e+00	4.0035e+00
+1.2188e+00	4.0844e+00
+1.2430e+00	4.1706e+00
+1.2677e+00	4.2623e+00
+1.2929e+00	4.3595e+00
+1.3185e+00	4.4621e+00
+1.3447e+00	4.5695e+00
+1.3714e+00	4.6810e+00
+1.3986e+00	4.7954e+00
+1.4264e+00	4.9111e+00
+1.4547e+00	5.0264e+00
+1.4836e+00	5.1391e+00
+1.5130e+00	5.2469e+00
+1.5431e+00	5.3473e+00
+1.5737e+00	5.4381e+00
+1.6050e+00	5.5170e+00
+1.6368e+00	5.5820e+00
+1.6693e+00	5.6314e+00
+1.7025e+00	5.6640e+00
+1.7363e+00	5.6790e+00
+1.7707e+00	5.6762e+00
+1.8059e+00	5.6555e+00
+1.8417e+00	5.6176e+00
+1.8783e+00	5.5630e+00
+1.9156e+00	5.4931e+00
+1.9536e+00	5.4090e+00
+1.9924e+00	5.3124e+00
+2.0319e+00	5.2048e+00
+2.0723e+00	5.0880e+00
+2.1134e+00	4.9639e+00
+2.1554e+00	4.8343e+00
+2.1982e+00	4.7012e+00
+2.2418e+00	4.5664e+00
+2.2863e+00	4.4316e+00
+2.3317e+00	4.2987e+00
+2.3780e+00	4.1689e+00
+2.4252e+00	4.0438e+00
+2.4734e+00	3.9244e+00
+2.5225e+00	3.8115e+00
+2.5725e+00	3.7059e+00
+2.6236e+00	3.6080e+00
+2.6757e+00	3.5181e+00
+2.7288e+00	3.4365e+00
+2.7830e+00	3.3629e+00
+2.8383e+00	3.2975e+00
+2.8946e+00	3.2401e+00
+2.9521e+00	3.1904e+00
+3.0107e+00	3.1483e+00
+3.0704e+00	3.1134e+00
+3.1314e+00	3.0856e+00
+3.1936e+00	3.0646e+00
+3.2570e+00	3.0502e+00
+3.3216e+00	3.0421e+00
+3.3876e+00	3.0402e+00
+3.4548e+00	3.0442e+00
+3.5234e+00	3.0540e+00
+3.5934e+00	3.0694e+00
+3.6647e+00	3.0904e+00
+3.7375e+00	3.1168e+00
+3.8117e+00	3.1484e+00
+3.8873e+00	3.1853e+00
+3.9645e+00	3.2273e+00
+4.0432e+00	3.2744e+00
+4.1235e+00	3.3265e+00
+4.2053e+00	3.3837e+00
+4.2888e+00	3.4460e+00
+4.3740e+00	3.5132e+00
+4.4608e+00	3.5855e+00
+4.5494e+00	3.6628e+00
+4.6397e+00	3.7453e+00
+4.7318e+00	3.8328e+00
+4.8257e+00	3.9255e+00
+4.9216e+00	4.0235e+00
+5.0193e+00	4.1267e+00
+5.1189e+00	4.2353e+00
+5.2205e+00	4.3494e+00
+5.3242e+00	4.4690e+00
+5.4299e+00	4.5941e+00
+5.5377e+00	4.7250e+00
+5.6476e+00	4.8617e+00
+5.7597e+00	5.0042e+00
+5.8741e+00	5.1528e+00
+5.9907e+00	5.3076e+00
+6.1096e+00	5.4685e+00
+6.2309e+00	5.6358e+00
+6.3546e+00	5.8096e+00
+6.4808e+00	5.9901e+00
+6.6094e+00	6.1772e+00
+6.7407e+00	6.3713e+00
+6.8745e+00	6.5723e+00
+7.0110e+00	6.7805e+00
+7.1502e+00	6.9959e+00
+7.2921e+00	7.2188e+00
+7.4369e+00	7.4492e+00
+7.5845e+00	7.6874e+00
+7.7351e+00	7.9333e+00
+7.8887e+00	8.1872e+00
+8.0453e+00	8.4493e+00
+8.2050e+00	8.7195e+00
+8.3679e+00	8.9982e+00
+8.5340e+00	9.2853e+00
+8.7034e+00	9.5811e+00
+8.8762e+00	9.8857e+00
+9.0524e+00	1.0199e+01
+9.2322e+00	1.0522e+01
+9.4154e+00	1.0853e+01
+9.6024e+00	1.1194e+01
+9.7930e+00	1.1544e+01
+9.9874e+00	1.1904e+01
+1.0186e+01	1.2273e+01
+1.0388e+01	1.2652e+01
+1.0594e+01	1.3041e+01
+1.0804e+01	1.3439e+01
+1.1019e+01	1.3848e+01
+1.1238e+01	1.4266e+01
+1.1461e+01	1.4694e+01
+1.1688e+01	1.5133e+01
+1.1920e+01	1.5582e+01
+1.2157e+01	1.6040e+01
+1.2398e+01	1.6510e+01
+
+wl	k
+2.4797e-01	1.6810e+00
+2.5289e-01	1.7252e+00
+2.5791e-01	1.7720e+00
+2.6303e-01	1.8208e+00
+2.6825e-01	1.8711e+00
+2.7358e-01	1.9223e+00
+2.7901e-01	1.9740e+00
+2.8455e-01	2.0259e+00
+2.9020e-01	2.0776e+00
+2.9596e-01	2.1290e+00
+3.0184e-01	2.1798e+00
+3.0783e-01	2.2299e+00
+3.1394e-01	2.2793e+00
+3.2017e-01	2.3279e+00
+3.2653e-01	2.3758e+00
+3.3301e-01	2.4229e+00
+3.3962e-01	2.4694e+00
+3.4637e-01	2.5154e+00
+3.5324e-01	2.5610e+00
+3.6025e-01	2.6062e+00
+3.6741e-01	2.6513e+00
+3.7470e-01	2.6963e+00
+3.8214e-01	2.7414e+00
+3.8973e-01	2.7867e+00
+3.9746e-01	2.8323e+00
+4.0535e-01	2.8785e+00
+4.1340e-01	2.9253e+00
+4.2161e-01	2.9727e+00
+4.2998e-01	3.0210e+00
+4.3852e-01	3.0702e+00
+4.4722e-01	3.1204e+00
+4.5610e-01	3.1717e+00
+4.6515e-01	3.2240e+00
+4.7439e-01	3.2774e+00
+4.8381e-01	3.3320e+00
+4.9341e-01	3.3878e+00
+5.0321e-01	3.4447e+00
+5.1320e-01	3.5027e+00
+5.2339e-01	3.5618e+00
+5.3378e-01	3.6219e+00
+5.4437e-01	3.6830e+00
+5.5518e-01	3.7451e+00
+5.6620e-01	3.8079e+00
+5.7744e-01	3.8715e+00
+5.8891e-01	3.9358e+00
+6.0060e-01	4.0007e+00
+6.1252e-01	4.0661e+00
+6.2468e-01	4.1318e+00
+6.3709e-01	4.1979e+00
+6.4973e-01	4.2641e+00
+6.6263e-01	4.3305e+00
+6.7579e-01	4.3969e+00
+6.8920e-01	4.4633e+00
+7.0289e-01	4.5297e+00
+7.1684e-01	4.5958e+00
+7.3107e-01	4.6618e+00
+7.4559e-01	4.7276e+00
+7.6039e-01	4.7932e+00
+7.7549e-01	4.8586e+00
+7.9088e-01	4.9238e+00
+8.0658e-01	4.9889e+00
+8.2260e-01	5.0540e+00
+8.3893e-01	5.1191e+00
+8.5558e-01	5.1843e+00
+8.7257e-01	5.2498e+00
+8.8989e-01	5.3158e+00
+9.0756e-01	5.3823e+00
+9.2557e-01	5.4496e+00
+9.4395e-01	5.5178e+00
+9.6269e-01	5.5871e+00
+9.8180e-01	5.6577e+00
+1.0013e+00	5.7297e+00
+1.0212e+00	5.8033e+00
+1.0414e+00	5.8785e+00
+1.0621e+00	5.9554e+00
+1.0832e+00	6.0341e+00
+1.1047e+00	6.1143e+00
+1.1266e+00	6.1960e+00
+1.1490e+00	6.2788e+00
+1.1718e+00	6.3623e+00
+1.1951e+00	6.4460e+00
+1.2188e+00	6.5291e+00
+1.2430e+00	6.6107e+00
+1.2677e+00	6.6899e+00
+1.2929e+00	6.7653e+00
+1.3185e+00	6.8357e+00
+1.3447e+00	6.8998e+00
+1.3714e+00	6.9560e+00
+1.3986e+00	7.0031e+00
+1.4264e+00	7.0399e+00
+1.4547e+00	7.0655e+00
+1.4836e+00	7.0792e+00
+1.5130e+00	7.0810e+00
+1.5431e+00	7.0710e+00
+1.5737e+00	7.0502e+00
+1.6050e+00	7.0198e+00
+1.6368e+00	6.9815e+00
+1.6693e+00	6.9375e+00
+1.7025e+00	6.8899e+00
+1.7363e+00	6.8415e+00
+1.7707e+00	6.7946e+00
+1.8059e+00	6.7518e+00
+1.8417e+00	6.7156e+00
+1.8783e+00	6.6881e+00
+1.9156e+00	6.6714e+00
+1.9536e+00	6.6674e+00
+1.9924e+00	6.6776e+00
+2.0319e+00	6.7034e+00
+2.0723e+00	6.7457e+00
+2.1134e+00	6.8054e+00
+2.1554e+00	6.8830e+00
+2.1982e+00	6.9789e+00
+2.2418e+00	7.0930e+00
+2.2863e+00	7.2252e+00
+2.3317e+00	7.3748e+00
+2.3780e+00	7.5413e+00
+2.4252e+00	7.7237e+00
+2.4734e+00	7.9211e+00
+2.5225e+00	8.1325e+00
+2.5725e+00	8.3567e+00
+2.6236e+00	8.5928e+00
+2.6757e+00	8.8395e+00
+2.7288e+00	9.0961e+00
+2.7830e+00	9.3617e+00
+2.8383e+00	9.6354e+00
+2.8946e+00	9.9165e+00
+2.9521e+00	1.0205e+01
+3.0107e+00	1.0499e+01
+3.0704e+00	1.0800e+01
+3.1314e+00	1.1106e+01
+3.1936e+00	1.1417e+01
+3.2570e+00	1.1734e+01
+3.3216e+00	1.2056e+01
+3.3876e+00	1.2383e+01
+3.4548e+00	1.2714e+01
+3.5234e+00	1.3050e+01
+3.5934e+00	1.3391e+01
+3.6647e+00	1.3737e+01
+3.7375e+00	1.4087e+01
+3.8117e+00	1.4442e+01
+3.8873e+00	1.4801e+01
+3.9645e+00	1.5165e+01
+4.0432e+00	1.5534e+01
+4.1235e+00	1.5908e+01
+4.2053e+00	1.6287e+01
+4.2888e+00	1.6670e+01
+4.3740e+00	1.7059e+01
+4.4608e+00	1.7452e+01
+4.5494e+00	1.7851e+01
+4.6397e+00	1.8254e+01
+4.7318e+00	1.8663e+01
+4.8257e+00	1.9078e+01
+4.9216e+00	1.9497e+01
+5.0193e+00	1.9922e+01
+5.1189e+00	2.0352e+01
+5.2205e+00	2.0788e+01
+5.3242e+00	2.1229e+01
+5.4299e+00	2.1676e+01
+5.5377e+00	2.2129e+01
+5.6476e+00	2.2587e+01
+5.7597e+00	2.3051e+01
+5.8741e+00	2.3520e+01
+5.9907e+00	2.3996e+01
+6.1096e+00	2.4477e+01
+6.2309e+00	2.4964e+01
+6.3546e+00	2.5457e+01
+6.4808e+00	2.5955e+01
+6.6094e+00	2.6460e+01
+6.7407e+00	2.6970e+01
+6.8745e+00	2.7486e+01
+7.0110e+00	2.8008e+01
+7.1502e+00	2.8536e+01
+7.2921e+00	2.9070e+01
+7.4369e+00	2.9609e+01
+7.5845e+00	3.0154e+01
+7.7351e+00	3.0705e+01
+7.8887e+00	3.1262e+01
+8.0453e+00	3.1824e+01
+8.2050e+00	3.2392e+01
+8.3679e+00	3.2965e+01
+8.5340e+00	3.3544e+01
+8.7034e+00	3.4128e+01
+8.8762e+00	3.4717e+01
+9.0524e+00	3.5311e+01
+9.2322e+00	3.5911e+01
+9.4154e+00	3.6516e+01
+9.6024e+00	3.7125e+01
+9.7930e+00	3.7740e+01
+9.9874e+00	3.8359e+01
+1.0186e+01	3.8983e+01
+1.0388e+01	3.9611e+01
+1.0594e+01	4.0244e+01
+1.0804e+01	4.0881e+01
+1.1019e+01	4.1522e+01
+1.1238e+01	4.2167e+01
+1.1461e+01	4.2816e+01
+1.1688e+01	4.3469e+01
+1.1920e+01	4.4125e+01
+1.2157e+01	4.4785e+01
+1.2398e+01	4.5448e+01

tools/specular-color/data/silver.txt

@@ -1,403 +1,403 @@
-wl	n
-2.4797e-01	8.4863e-01
-2.5289e-01	8.2493e-01
-2.5791e-01	7.9699e-01
-2.6303e-01	8.0009e-01
-2.6825e-01	8.7536e-01
-2.7358e-01	1.0320e+00
-2.7901e-01	1.2351e+00
-2.8455e-01	1.4245e+00
-2.9020e-01	1.5424e+00
-2.9596e-01	1.5549e+00
-3.0184e-01	1.4594e+00
-3.0783e-01	1.2767e+00
-3.1394e-01	1.0361e+00
-3.2017e-01	7.6783e-01
-3.2653e-01	5.2213e-01
-3.3301e-01	3.6378e-01
-3.3962e-01	2.7960e-01
-3.4637e-01	2.3178e-01
-3.5324e-01	2.0172e-01
-3.6025e-01	1.8151e-01
-3.6741e-01	1.6741e-01
-3.7470e-01	1.5739e-01
-3.8214e-01	1.5021e-01
-3.8973e-01	1.4506e-01
-3.9746e-01	1.4141e-01
-4.0535e-01	1.3887e-01
-4.1340e-01	1.3716e-01
-4.2161e-01	1.3609e-01
-4.2998e-01	1.3550e-01
-4.3852e-01	1.3529e-01
-4.4722e-01	1.3537e-01
-4.5610e-01	1.3569e-01
-4.6515e-01	1.3621e-01
-4.7439e-01	1.3687e-01
-4.8381e-01	1.3767e-01
-4.9341e-01	1.3857e-01
-5.0321e-01	1.3958e-01
-5.1320e-01	1.4067e-01
-5.2339e-01	1.4184e-01
-5.3378e-01	1.4308e-01
-5.4437e-01	1.4440e-01
-5.5518e-01	1.4578e-01
-5.6620e-01	1.4723e-01
-5.7744e-01	1.4875e-01
-5.8891e-01	1.5034e-01
-6.0060e-01	1.5200e-01
-6.1252e-01	1.5373e-01
-6.2468e-01	1.5554e-01
-6.3709e-01	1.5742e-01
-6.4973e-01	1.5939e-01
-6.6263e-01	1.6143e-01
-6.7579e-01	1.6356e-01
-6.8920e-01	1.6579e-01
-7.0289e-01	1.6810e-01
-7.1684e-01	1.7051e-01
-7.3107e-01	1.7303e-01
-7.4559e-01	1.7565e-01
-7.6039e-01	1.7838e-01
-7.7549e-01	1.8123e-01
-7.9088e-01	1.8420e-01
-8.0658e-01	1.8729e-01
-8.2260e-01	1.9051e-01
-8.3893e-01	1.9387e-01
-8.5558e-01	1.9737e-01
-8.7257e-01	2.0102e-01
-8.8989e-01	2.0482e-01
-9.0756e-01	2.0878e-01
-9.2557e-01	2.1291e-01
-9.4395e-01	2.1721e-01
-9.6269e-01	2.2169e-01
-9.8180e-01	2.2636e-01
-1.0013e+00	2.3122e-01
-1.0212e+00	2.3628e-01
-1.0414e+00	2.4155e-01
-1.0621e+00	2.4705e-01
-1.0832e+00	2.5277e-01
-1.1047e+00	2.5872e-01
-1.1266e+00	2.6493e-01
-1.1490e+00	2.7138e-01
-1.1718e+00	2.7811e-01
-1.1951e+00	2.8511e-01
-1.2188e+00	2.9239e-01
-1.2430e+00	2.9998e-01
-1.2677e+00	3.0788e-01
-1.2929e+00	3.1609e-01
-1.3185e+00	3.2465e-01
-1.3447e+00	3.3355e-01
-1.3714e+00	3.4281e-01
-1.3986e+00	3.5245e-01
-1.4264e+00	3.6249e-01
-1.4547e+00	3.7292e-01
-1.4836e+00	3.8379e-01
-1.5130e+00	3.9509e-01
-1.5431e+00	4.0684e-01
-1.5737e+00	4.1908e-01
-1.6050e+00	4.3180e-01
-1.6368e+00	4.4504e-01
-1.6693e+00	4.5882e-01
-1.7025e+00	4.7314e-01
-1.7363e+00	4.8805e-01
-1.7707e+00	5.0355e-01
-1.8059e+00	5.1967e-01
-1.8417e+00	5.3644e-01
-1.8783e+00	5.5389e-01
-1.9156e+00	5.7203e-01
-1.9536e+00	5.9090e-01
-1.9924e+00	6.1053e-01
-2.0319e+00	6.3094e-01
-2.0723e+00	6.5216e-01
-2.1134e+00	6.7424e-01
-2.1554e+00	6.9719e-01
-2.1982e+00	7.2106e-01
-2.2418e+00	7.4588e-01
-2.2863e+00	7.7170e-01
-2.3317e+00	7.9854e-01
-2.3780e+00	8.2645e-01
-2.4252e+00	8.5546e-01
-2.4734e+00	8.8564e-01
-2.5225e+00	9.1701e-01
-2.5725e+00	9.4962e-01
-2.6236e+00	9.8353e-01
-2.6757e+00	1.0188e+00
-2.7288e+00	1.0554e+00
-2.7830e+00	1.0935e+00
-2.8383e+00	1.1332e+00
-2.8946e+00	1.1743e+00
-2.9521e+00	1.2171e+00
-3.0107e+00	1.2616e+00
-3.0704e+00	1.3079e+00
-3.1314e+00	1.3560e+00
-3.1936e+00	1.4060e+00
-3.2570e+00	1.4579e+00
-3.3216e+00	1.5119e+00
-3.3876e+00	1.5680e+00
-3.4548e+00	1.6263e+00
-3.5234e+00	1.6869e+00
-3.5934e+00	1.7499e+00
-3.6647e+00	1.8153e+00
-3.7375e+00	1.8833e+00
-3.8117e+00	1.9540e+00
-3.8873e+00	2.0274e+00
-3.9645e+00	2.1036e+00
-4.0432e+00	2.1829e+00
-4.1235e+00	2.2652e+00
-4.2053e+00	2.3507e+00
-4.2888e+00	2.4396e+00
-4.3740e+00	2.5319e+00
-4.4608e+00	2.6277e+00
-4.5494e+00	2.7273e+00
-4.6397e+00	2.8307e+00
-4.7318e+00	2.9381e+00
-4.8257e+00	3.0496e+00
-4.9216e+00	3.1654e+00
-5.0193e+00	3.2856e+00
-5.1189e+00	3.4104e+00
-5.2205e+00	3.5400e+00
-5.3242e+00	3.6745e+00
-5.4299e+00	3.8141e+00
-5.5377e+00	3.9591e+00
-5.6476e+00	4.1095e+00
-5.7597e+00	4.2656e+00
-5.8741e+00	4.4275e+00
-5.9907e+00	4.5956e+00
-6.1096e+00	4.7699e+00
-6.2309e+00	4.9508e+00
-6.3546e+00	5.1384e+00
-6.4808e+00	5.3329e+00
-6.6094e+00	5.5347e+00
-6.7407e+00	5.7439e+00
-6.8745e+00	5.9609e+00
-7.0110e+00	6.1857e+00
-7.1502e+00	6.4188e+00
-7.2921e+00	6.6604e+00
-7.4369e+00	6.9107e+00
-7.5845e+00	7.1701e+00
-7.7351e+00	7.4389e+00
-7.8887e+00	7.7172e+00
-8.0453e+00	8.0055e+00
-8.2050e+00	8.3040e+00
-8.3679e+00	8.6131e+00
-8.5340e+00	8.9330e+00
-8.7034e+00	9.2642e+00
-8.8762e+00	9.6068e+00
-9.0524e+00	9.9614e+00
-9.2322e+00	1.0328e+01
-9.4154e+00	1.0707e+01
-9.6024e+00	1.1100e+01
-9.7930e+00	1.1505e+01
-9.9874e+00	1.1924e+01
-1.0186e+01	1.2357e+01
-1.0388e+01	1.2805e+01
-1.0594e+01	1.3267e+01
-1.0804e+01	1.3744e+01
-1.1019e+01	1.4237e+01
-1.1238e+01	1.4746e+01
-1.1461e+01	1.5270e+01
-1.1688e+01	1.5812e+01
-1.1920e+01	1.6370e+01
-1.2157e+01	1.6946e+01
-1.2398e+01	1.7540e+01
-
-wl	k
-2.4797e-01	1.1920e+00
-2.5289e-01	1.2193e+00
-2.5791e-01	1.2844e+00
-2.6303e-01	1.3955e+00
-2.6825e-01	1.5246e+00
-2.7358e-01	1.6142e+00
-2.7901e-01	1.6125e+00
-2.8455e-01	1.5017e+00
-2.9020e-01	1.3028e+00
-2.9596e-01	1.0631e+00
-3.0184e-01	8.3581e-01
-3.0783e-01	6.6203e-01
-3.1394e-01	5.6621e-01
-3.2017e-01	5.6549e-01
-3.2653e-01	6.7421e-01
-3.3301e-01	8.4735e-01
-3.3962e-01	1.0142e+00
-3.4637e-01	1.1589e+00
-3.5324e-01	1.2860e+00
-3.6025e-01	1.4005e+00
-3.6741e-01	1.5059e+00
-3.7470e-01	1.6045e+00
-3.8214e-01	1.6979e+00
-3.8973e-01	1.7873e+00
-3.9746e-01	1.8736e+00
-4.0535e-01	1.9574e+00
-4.1340e-01	2.0394e+00
-4.2161e-01	2.1200e+00
-4.2998e-01	2.1995e+00
-4.3852e-01	2.2782e+00
-4.4722e-01	2.3564e+00
-4.5610e-01	2.4344e+00
-4.6515e-01	2.5122e+00
-4.7439e-01	2.5901e+00
-4.8381e-01	2.6682e+00
-4.9341e-01	2.7466e+00
-5.0321e-01	2.8254e+00
-5.1320e-01	2.9048e+00
-5.2339e-01	2.9848e+00
-5.3378e-01	3.0656e+00
-5.4437e-01	3.1471e+00
-5.5518e-01	3.2295e+00
-5.6620e-01	3.3128e+00
-5.7744e-01	3.3971e+00
-5.8891e-01	3.4825e+00
-6.0060e-01	3.5690e+00
-6.1252e-01	3.6567e+00
-6.2468e-01	3.7455e+00
-6.3709e-01	3.8357e+00
-6.4973e-01	3.9272e+00
-6.6263e-01	4.0200e+00
-6.7579e-01	4.1143e+00
-6.8920e-01	4.2100e+00
-7.0289e-01	4.3072e+00
-7.1684e-01	4.4061e+00
-7.3107e-01	4.5065e+00
-7.4559e-01	4.6085e+00
-7.6039e-01	4.7123e+00
-7.7549e-01	4.8178e+00
-7.9088e-01	4.9251e+00
-8.0658e-01	5.0343e+00
-8.2260e-01	5.1453e+00
-8.3893e-01	5.2583e+00
-8.5558e-01	5.3732e+00
-8.7257e-01	5.4902e+00
-8.8989e-01	5.6093e+00
-9.0756e-01	5.7304e+00
-9.2557e-01	5.8538e+00
-9.4395e-01	5.9793e+00
-9.6269e-01	6.1072e+00
-9.8180e-01	6.2373e+00
-1.0013e+00	6.3699e+00
-1.0212e+00	6.5048e+00
-1.0414e+00	6.6423e+00
-1.0621e+00	6.7823e+00
-1.0832e+00	6.9248e+00
-1.1047e+00	7.0700e+00
-1.1266e+00	7.2179e+00
-1.1490e+00	7.3686e+00
-1.1718e+00	7.5221e+00
-1.1951e+00	7.6785e+00
-1.2188e+00	7.8378e+00
-1.2430e+00	8.0001e+00
-1.2677e+00	8.1654e+00
-1.2929e+00	8.3339e+00
-1.3185e+00	8.5056e+00
-1.3447e+00	8.6805e+00
-1.3714e+00	8.8587e+00
-1.3986e+00	9.0403e+00
-1.4264e+00	9.2254e+00
-1.4547e+00	9.4140e+00
-1.4836e+00	9.6062e+00
-1.5130e+00	9.8021e+00
-1.5431e+00	1.0002e+01
-1.5737e+00	1.0205e+01
-1.6050e+00	1.0412e+01
-1.6368e+00	1.0624e+01
-1.6693e+00	1.0839e+01
-1.7025e+00	1.1059e+01
-1.7363e+00	1.1282e+01
-1.7707e+00	1.1510e+01
-1.8059e+00	1.1743e+01
-1.8417e+00	1.1979e+01
-1.8783e+00	1.2221e+01
-1.9156e+00	1.2467e+01
-1.9536e+00	1.2718e+01
-1.9924e+00	1.2973e+01
-2.0319e+00	1.3234e+01
-2.0723e+00	1.3499e+01
-2.1134e+00	1.3770e+01
-2.1554e+00	1.4046e+01
-2.1982e+00	1.4327e+01
-2.2418e+00	1.4614e+01
-2.2863e+00	1.4906e+01
-2.3317e+00	1.5203e+01
-2.3780e+00	1.5507e+01
-2.4252e+00	1.5816e+01
-2.4734e+00	1.6131e+01
-2.5225e+00	1.6453e+01
-2.5725e+00	1.6780e+01
-2.6236e+00	1.7114e+01
-2.6757e+00	1.7454e+01
-2.7288e+00	1.7801e+01
-2.7830e+00	1.8154e+01
-2.8383e+00	1.8514e+01
-2.8946e+00	1.8881e+01
-2.9521e+00	1.9255e+01
-3.0107e+00	1.9636e+01
-3.0704e+00	2.0025e+01
-3.1314e+00	2.0421e+01
-3.1936e+00	2.0824e+01
-3.2570e+00	2.1235e+01
-3.3216e+00	2.1654e+01
-3.3876e+00	2.2081e+01
-3.4548e+00	2.2516e+01
-3.5234e+00	2.2959e+01
-3.5934e+00	2.3410e+01
-3.6647e+00	2.3870e+01
-3.7375e+00	2.4339e+01
-3.8117e+00	2.4817e+01
-3.8873e+00	2.5303e+01
-3.9645e+00	2.5799e+01
-4.0432e+00	2.6304e+01
-4.1235e+00	2.6818e+01
-4.2053e+00	2.7342e+01
-4.2888e+00	2.7876e+01
-4.3740e+00	2.8419e+01
-4.4608e+00	2.8973e+01
-4.5494e+00	2.9537e+01
-4.6397e+00	3.0111e+01
-4.7318e+00	3.0696e+01
-4.8257e+00	3.1291e+01
-4.9216e+00	3.1898e+01
-5.0193e+00	3.2515e+01
-5.1189e+00	3.3143e+01
-5.2205e+00	3.3783e+01
-5.3242e+00	3.4435e+01
-5.4299e+00	3.5098e+01
-5.5377e+00	3.5773e+01
-5.6476e+00	3.6460e+01
-5.7597e+00	3.7159e+01
-5.8741e+00	3.7870e+01
-5.9907e+00	3.8594e+01
-6.1096e+00	3.9331e+01
-6.2309e+00	4.0080e+01
-6.3546e+00	4.0842e+01
-6.4808e+00	4.1618e+01
-6.6094e+00	4.2407e+01
-6.7407e+00	4.3209e+01
-6.8745e+00	4.4025e+01
-7.0110e+00	4.4854e+01
-7.1502e+00	4.5697e+01
-7.2921e+00	4.6555e+01
-7.4369e+00	4.7426e+01
-7.5845e+00	4.8312e+01
-7.7351e+00	4.9212e+01
-7.8887e+00	5.0126e+01
-8.0453e+00	5.1055e+01
-8.2050e+00	5.1999e+01
-8.3679e+00	5.2958e+01
-8.5340e+00	5.3931e+01
-8.7034e+00	5.4920e+01
-8.8762e+00	5.5923e+01
-9.0524e+00	5.6942e+01
-9.2322e+00	5.7976e+01
-9.4154e+00	5.9025e+01
-9.6024e+00	6.0090e+01
-9.7930e+00	6.1170e+01
-9.9874e+00	6.2265e+01
-1.0186e+01	6.3376e+01
-1.0388e+01	6.4502e+01
-1.0594e+01	6.5643e+01
-1.0804e+01	6.6800e+01
-1.1019e+01	6.7973e+01
-1.1238e+01	6.9160e+01
-1.1461e+01	7.0363e+01
-1.1688e+01	7.1581e+01
-1.1920e+01	7.2814e+01
-1.2157e+01	7.4063e+01
-1.2398e+01	7.5326e+01
+wl	n
+2.4797e-01	8.4863e-01
+2.5289e-01	8.2493e-01
+2.5791e-01	7.9699e-01
+2.6303e-01	8.0009e-01
+2.6825e-01	8.7536e-01
+2.7358e-01	1.0320e+00
+2.7901e-01	1.2351e+00
+2.8455e-01	1.4245e+00
+2.9020e-01	1.5424e+00
+2.9596e-01	1.5549e+00
+3.0184e-01	1.4594e+00
+3.0783e-01	1.2767e+00
+3.1394e-01	1.0361e+00
+3.2017e-01	7.6783e-01
+3.2653e-01	5.2213e-01
+3.3301e-01	3.6378e-01
+3.3962e-01	2.7960e-01
+3.4637e-01	2.3178e-01
+3.5324e-01	2.0172e-01
+3.6025e-01	1.8151e-01
+3.6741e-01	1.6741e-01
+3.7470e-01	1.5739e-01
+3.8214e-01	1.5021e-01
+3.8973e-01	1.4506e-01
+3.9746e-01	1.4141e-01
+4.0535e-01	1.3887e-01
+4.1340e-01	1.3716e-01
+4.2161e-01	1.3609e-01
+4.2998e-01	1.3550e-01
+4.3852e-01	1.3529e-01
+4.4722e-01	1.3537e-01
+4.5610e-01	1.3569e-01
+4.6515e-01	1.3621e-01
+4.7439e-01	1.3687e-01
+4.8381e-01	1.3767e-01
+4.9341e-01	1.3857e-01
+5.0321e-01	1.3958e-01
+5.1320e-01	1.4067e-01
+5.2339e-01	1.4184e-01
+5.3378e-01	1.4308e-01
+5.4437e-01	1.4440e-01
+5.5518e-01	1.4578e-01
+5.6620e-01	1.4723e-01
+5.7744e-01	1.4875e-01
+5.8891e-01	1.5034e-01
+6.0060e-01	1.5200e-01
+6.1252e-01	1.5373e-01
+6.2468e-01	1.5554e-01
+6.3709e-01	1.5742e-01
+6.4973e-01	1.5939e-01
+6.6263e-01	1.6143e-01
+6.7579e-01	1.6356e-01
+6.8920e-01	1.6579e-01
+7.0289e-01	1.6810e-01
+7.1684e-01	1.7051e-01
+7.3107e-01	1.7303e-01
+7.4559e-01	1.7565e-01
+7.6039e-01	1.7838e-01
+7.7549e-01	1.8123e-01
+7.9088e-01	1.8420e-01
+8.0658e-01	1.8729e-01
+8.2260e-01	1.9051e-01
+8.3893e-01	1.9387e-01
+8.5558e-01	1.9737e-01
+8.7257e-01	2.0102e-01
+8.8989e-01	2.0482e-01
+9.0756e-01	2.0878e-01
+9.2557e-01	2.1291e-01
+9.4395e-01	2.1721e-01
+9.6269e-01	2.2169e-01
+9.8180e-01	2.2636e-01
+1.0013e+00	2.3122e-01
+1.0212e+00	2.3628e-01
+1.0414e+00	2.4155e-01
+1.0621e+00	2.4705e-01
+1.0832e+00	2.5277e-01
+1.1047e+00	2.5872e-01
+1.1266e+00	2.6493e-01
+1.1490e+00	2.7138e-01
+1.1718e+00	2.7811e-01
+1.1951e+00	2.8511e-01
+1.2188e+00	2.9239e-01
+1.2430e+00	2.9998e-01
+1.2677e+00	3.0788e-01
+1.2929e+00	3.1609e-01
+1.3185e+00	3.2465e-01
+1.3447e+00	3.3355e-01
+1.3714e+00	3.4281e-01
+1.3986e+00	3.5245e-01
+1.4264e+00	3.6249e-01
+1.4547e+00	3.7292e-01
+1.4836e+00	3.8379e-01
+1.5130e+00	3.9509e-01
+1.5431e+00	4.0684e-01
+1.5737e+00	4.1908e-01
+1.6050e+00	4.3180e-01
+1.6368e+00	4.4504e-01
+1.6693e+00	4.5882e-01
+1.7025e+00	4.7314e-01
+1.7363e+00	4.8805e-01
+1.7707e+00	5.0355e-01
+1.8059e+00	5.1967e-01
+1.8417e+00	5.3644e-01
+1.8783e+00	5.5389e-01
+1.9156e+00	5.7203e-01
+1.9536e+00	5.9090e-01
+1.9924e+00	6.1053e-01
+2.0319e+00	6.3094e-01
+2.0723e+00	6.5216e-01
+2.1134e+00	6.7424e-01
+2.1554e+00	6.9719e-01
+2.1982e+00	7.2106e-01
+2.2418e+00	7.4588e-01
+2.2863e+00	7.7170e-01
+2.3317e+00	7.9854e-01
+2.3780e+00	8.2645e-01
+2.4252e+00	8.5546e-01
+2.4734e+00	8.8564e-01
+2.5225e+00	9.1701e-01
+2.5725e+00	9.4962e-01
+2.6236e+00	9.8353e-01
+2.6757e+00	1.0188e+00
+2.7288e+00	1.0554e+00
+2.7830e+00	1.0935e+00
+2.8383e+00	1.1332e+00
+2.8946e+00	1.1743e+00
+2.9521e+00	1.2171e+00
+3.0107e+00	1.2616e+00
+3.0704e+00	1.3079e+00
+3.1314e+00	1.3560e+00
+3.1936e+00	1.4060e+00
+3.2570e+00	1.4579e+00
+3.3216e+00	1.5119e+00
+3.3876e+00	1.5680e+00
+3.4548e+00	1.6263e+00
+3.5234e+00	1.6869e+00
+3.5934e+00	1.7499e+00
+3.6647e+00	1.8153e+00
+3.7375e+00	1.8833e+00
+3.8117e+00	1.9540e+00
+3.8873e+00	2.0274e+00
+3.9645e+00	2.1036e+00
+4.0432e+00	2.1829e+00
+4.1235e+00	2.2652e+00
+4.2053e+00	2.3507e+00
+4.2888e+00	2.4396e+00
+4.3740e+00	2.5319e+00
+4.4608e+00	2.6277e+00
+4.5494e+00	2.7273e+00
+4.6397e+00	2.8307e+00
+4.7318e+00	2.9381e+00
+4.8257e+00	3.0496e+00
+4.9216e+00	3.1654e+00
+5.0193e+00	3.2856e+00
+5.1189e+00	3.4104e+00
+5.2205e+00	3.5400e+00
+5.3242e+00	3.6745e+00
+5.4299e+00	3.8141e+00
+5.5377e+00	3.9591e+00
+5.6476e+00	4.1095e+00
+5.7597e+00	4.2656e+00
+5.8741e+00	4.4275e+00
+5.9907e+00	4.5956e+00
+6.1096e+00	4.7699e+00
+6.2309e+00	4.9508e+00
+6.3546e+00	5.1384e+00
+6.4808e+00	5.3329e+00
+6.6094e+00	5.5347e+00
+6.7407e+00	5.7439e+00
+6.8745e+00	5.9609e+00
+7.0110e+00	6.1857e+00
+7.1502e+00	6.4188e+00
+7.2921e+00	6.6604e+00
+7.4369e+00	6.9107e+00
+7.5845e+00	7.1701e+00
+7.7351e+00	7.4389e+00
+7.8887e+00	7.7172e+00
+8.0453e+00	8.0055e+00
+8.2050e+00	8.3040e+00
+8.3679e+00	8.6131e+00
+8.5340e+00	8.9330e+00
+8.7034e+00	9.2642e+00
+8.8762e+00	9.6068e+00
+9.0524e+00	9.9614e+00
+9.2322e+00	1.0328e+01
+9.4154e+00	1.0707e+01
+9.6024e+00	1.1100e+01
+9.7930e+00	1.1505e+01
+9.9874e+00	1.1924e+01
+1.0186e+01	1.2357e+01
+1.0388e+01	1.2805e+01
+1.0594e+01	1.3267e+01
+1.0804e+01	1.3744e+01
+1.1019e+01	1.4237e+01
+1.1238e+01	1.4746e+01
+1.1461e+01	1.5270e+01
+1.1688e+01	1.5812e+01
+1.1920e+01	1.6370e+01
+1.2157e+01	1.6946e+01
+1.2398e+01	1.7540e+01
+
+wl	k
+2.4797e-01	1.1920e+00
+2.5289e-01	1.2193e+00
+2.5791e-01	1.2844e+00
+2.6303e-01	1.3955e+00
+2.6825e-01	1.5246e+00
+2.7358e-01	1.6142e+00
+2.7901e-01	1.6125e+00
+2.8455e-01	1.5017e+00
+2.9020e-01	1.3028e+00
+2.9596e-01	1.0631e+00
+3.0184e-01	8.3581e-01
+3.0783e-01	6.6203e-01
+3.1394e-01	5.6621e-01
+3.2017e-01	5.6549e-01
+3.2653e-01	6.7421e-01
+3.3301e-01	8.4735e-01
+3.3962e-01	1.0142e+00
+3.4637e-01	1.1589e+00
+3.5324e-01	1.2860e+00
+3.6025e-01	1.4005e+00
+3.6741e-01	1.5059e+00
+3.7470e-01	1.6045e+00
+3.8214e-01	1.6979e+00
+3.8973e-01	1.7873e+00
+3.9746e-01	1.8736e+00
+4.0535e-01	1.9574e+00
+4.1340e-01	2.0394e+00
+4.2161e-01	2.1200e+00
+4.2998e-01	2.1995e+00
+4.3852e-01	2.2782e+00
+4.4722e-01	2.3564e+00
+4.5610e-01	2.4344e+00
+4.6515e-01	2.5122e+00
+4.7439e-01	2.5901e+00
+4.8381e-01	2.6682e+00
+4.9341e-01	2.7466e+00
+5.0321e-01	2.8254e+00
+5.1320e-01	2.9048e+00
+5.2339e-01	2.9848e+00
+5.3378e-01	3.0656e+00
+5.4437e-01	3.1471e+00
+5.5518e-01	3.2295e+00
+5.6620e-01	3.3128e+00
+5.7744e-01	3.3971e+00
+5.8891e-01	3.4825e+00
+6.0060e-01	3.5690e+00
+6.1252e-01	3.6567e+00
+6.2468e-01	3.7455e+00
+6.3709e-01	3.8357e+00
+6.4973e-01	3.9272e+00
+6.6263e-01	4.0200e+00
+6.7579e-01	4.1143e+00
+6.8920e-01	4.2100e+00
+7.0289e-01	4.3072e+00
+7.1684e-01	4.4061e+00
+7.3107e-01	4.5065e+00
+7.4559e-01	4.6085e+00
+7.6039e-01	4.7123e+00
+7.7549e-01	4.8178e+00
+7.9088e-01	4.9251e+00
+8.0658e-01	5.0343e+00
+8.2260e-01	5.1453e+00
+8.3893e-01	5.2583e+00
+8.5558e-01	5.3732e+00
+8.7257e-01	5.4902e+00
+8.8989e-01	5.6093e+00
+9.0756e-01	5.7304e+00
+9.2557e-01	5.8538e+00
+9.4395e-01	5.9793e+00
+9.6269e-01	6.1072e+00
+9.8180e-01	6.2373e+00
+1.0013e+00	6.3699e+00
+1.0212e+00	6.5048e+00
+1.0414e+00	6.6423e+00
+1.0621e+00	6.7823e+00
+1.0832e+00	6.9248e+00
+1.1047e+00	7.0700e+00
+1.1266e+00	7.2179e+00
+1.1490e+00	7.3686e+00
+1.1718e+00	7.5221e+00
+1.1951e+00	7.6785e+00
+1.2188e+00	7.8378e+00
+1.2430e+00	8.0001e+00
+1.2677e+00	8.1654e+00
+1.2929e+00	8.3339e+00
+1.3185e+00	8.5056e+00
+1.3447e+00	8.6805e+00
+1.3714e+00	8.8587e+00
+1.3986e+00	9.0403e+00
+1.4264e+00	9.2254e+00
+1.4547e+00	9.4140e+00
+1.4836e+00	9.6062e+00
+1.5130e+00	9.8021e+00
+1.5431e+00	1.0002e+01
+1.5737e+00	1.0205e+01
+1.6050e+00	1.0412e+01
+1.6368e+00	1.0624e+01
+1.6693e+00	1.0839e+01
+1.7025e+00	1.1059e+01
+1.7363e+00	1.1282e+01
+1.7707e+00	1.1510e+01
+1.8059e+00	1.1743e+01
+1.8417e+00	1.1979e+01
+1.8783e+00	1.2221e+01
+1.9156e+00	1.2467e+01
+1.9536e+00	1.2718e+01
+1.9924e+00	1.2973e+01
+2.0319e+00	1.3234e+01
+2.0723e+00	1.3499e+01
+2.1134e+00	1.3770e+01
+2.1554e+00	1.4046e+01
+2.1982e+00	1.4327e+01
+2.2418e+00	1.4614e+01
+2.2863e+00	1.4906e+01
+2.3317e+00	1.5203e+01
+2.3780e+00	1.5507e+01
+2.4252e+00	1.5816e+01
+2.4734e+00	1.6131e+01
+2.5225e+00	1.6453e+01
+2.5725e+00	1.6780e+01
+2.6236e+00	1.7114e+01
+2.6757e+00	1.7454e+01
+2.7288e+00	1.7801e+01
+2.7830e+00	1.8154e+01
+2.8383e+00	1.8514e+01
+2.8946e+00	1.8881e+01
+2.9521e+00	1.9255e+01
+3.0107e+00	1.9636e+01
+3.0704e+00	2.0025e+01
+3.1314e+00	2.0421e+01
+3.1936e+00	2.0824e+01
+3.2570e+00	2.1235e+01
+3.3216e+00	2.1654e+01
+3.3876e+00	2.2081e+01
+3.4548e+00	2.2516e+01
+3.5234e+00	2.2959e+01
+3.5934e+00	2.3410e+01
+3.6647e+00	2.3870e+01
+3.7375e+00	2.4339e+01
+3.8117e+00	2.4817e+01
+3.8873e+00	2.5303e+01
+3.9645e+00	2.5799e+01
+4.0432e+00	2.6304e+01
+4.1235e+00	2.6818e+01
+4.2053e+00	2.7342e+01
+4.2888e+00	2.7876e+01
+4.3740e+00	2.8419e+01
+4.4608e+00	2.8973e+01
+4.5494e+00	2.9537e+01
+4.6397e+00	3.0111e+01
+4.7318e+00	3.0696e+01
+4.8257e+00	3.1291e+01
+4.9216e+00	3.1898e+01
+5.0193e+00	3.2515e+01
+5.1189e+00	3.3143e+01
+5.2205e+00	3.3783e+01
+5.3242e+00	3.4435e+01
+5.4299e+00	3.5098e+01
+5.5377e+00	3.5773e+01
+5.6476e+00	3.6460e+01
+5.7597e+00	3.7159e+01
+5.8741e+00	3.7870e+01
+5.9907e+00	3.8594e+01
+6.1096e+00	3.9331e+01
+6.2309e+00	4.0080e+01
+6.3546e+00	4.0842e+01
+6.4808e+00	4.1618e+01
+6.6094e+00	4.2407e+01
+6.7407e+00	4.3209e+01
+6.8745e+00	4.4025e+01
+7.0110e+00	4.4854e+01
+7.1502e+00	4.5697e+01
+7.2921e+00	4.6555e+01
+7.4369e+00	4.7426e+01
+7.5845e+00	4.8312e+01
+7.7351e+00	4.9212e+01
+7.8887e+00	5.0126e+01
+8.0453e+00	5.1055e+01
+8.2050e+00	5.1999e+01
+8.3679e+00	5.2958e+01
+8.5340e+00	5.3931e+01
+8.7034e+00	5.4920e+01
+8.8762e+00	5.5923e+01
+9.0524e+00	5.6942e+01
+9.2322e+00	5.7976e+01
+9.4154e+00	5.9025e+01
+9.6024e+00	6.0090e+01
+9.7930e+00	6.1170e+01
+9.9874e+00	6.2265e+01
+1.0186e+01	6.3376e+01
+1.0388e+01	6.4502e+01
+1.0594e+01	6.5643e+01
+1.0804e+01	6.6800e+01
+1.1019e+01	6.7973e+01
+1.1238e+01	6.9160e+01
+1.1461e+01	7.0363e+01
+1.1688e+01	7.1581e+01
+1.1920e+01	7.2814e+01
+1.2157e+01	7.4063e+01
+1.2398e+01	7.5326e+01

tools/specular-color/data/titanium.txt

@@ -1,101 +1,101 @@
-wl	n
-0.188	1.10
-0.192	1.16
-0.195	1.22
-0.199	1.25
-0.203	1.27
-0.207	1.31
-0.212	1.31
-0.216	1.32
-0.221	1.32
-0.226	1.32
-0.231	1.31
-0.237	1.30
-0.243	1.28
-0.249	1.27
-0.255	1.26
-0.262	1.27
-0.269	1.27
-0.276	1.30
-0.284	1.35
-0.292	1.40
-0.301	1.45
-0.311	1.50
-0.320	1.55
-0.332	1.61
-0.342	1.72
-0.354	1.82
-0.368	1.90
-0.381	1.99
-0.397	2.08
-0.413	2.14
-0.431	2.21
-0.451	2.27
-0.471	2.32
-0.496	2.36
-0.521	2.44
-0.549	2.54
-0.582	2.60
-0.617	2.67
-0.659	2.76
-0.704	2.86
-0.756	3.00
-0.821	3.21
-0.892	3.29
-0.984	3.35
-1.088	3.50
-1.216	3.62
-1.393	3.67
-1.610	3.69
-1.937	3.51
-
-wl	k
-0.188	1.62
-0.192	1.64
-0.195	1.66
-0.199	1.68
-0.203	1.69
-0.207	1.69
-0.212	1.68
-0.216	1.67
-0.221	1.66
-0.226	1.66
-0.231	1.68
-0.237	1.72
-0.243	1.77
-0.249	1.83
-0.255	1.91
-0.262	1.99
-0.269	2.07
-0.276	2.17
-0.284	2.26
-0.292	2.36
-0.301	2.46
-0.311	2.57
-0.320	2.66
-0.332	2.74
-0.342	2.82
-0.354	2.87
-0.368	2.90
-0.381	2.93
-0.397	2.95
-0.413	2.98
-0.431	3.01
-0.451	3.04
-0.471	3.10
-0.496	3.19
-0.521	3.30
-0.549	3.43
-0.582	3.58
-0.617	3.72
-0.659	3.84
-0.704	3.96
-0.756	4.01
-0.821	4.01
-0.892	3.96
-0.984	3.97
-1.088	4.02
-1.216	4.15
-1.393	4.37
-1.610	4.70
-1.937	5.19
+wl	n
+0.188	1.10
+0.192	1.16
+0.195	1.22
+0.199	1.25
+0.203	1.27
+0.207	1.31
+0.212	1.31
+0.216	1.32
+0.221	1.32
+0.226	1.32
+0.231	1.31
+0.237	1.30
+0.243	1.28
+0.249	1.27
+0.255	1.26
+0.262	1.27
+0.269	1.27
+0.276	1.30
+0.284	1.35
+0.292	1.40
+0.301	1.45
+0.311	1.50
+0.320	1.55
+0.332	1.61
+0.342	1.72
+0.354	1.82
+0.368	1.90
+0.381	1.99
+0.397	2.08
+0.413	2.14
+0.431	2.21
+0.451	2.27
+0.471	2.32
+0.496	2.36
+0.521	2.44
+0.549	2.54
+0.582	2.60
+0.617	2.67
+0.659	2.76
+0.704	2.86
+0.756	3.00
+0.821	3.21
+0.892	3.29
+0.984	3.35
+1.088	3.50
+1.216	3.62
+1.393	3.67
+1.610	3.69
+1.937	3.51
+
+wl	k
+0.188	1.62
+0.192	1.64
+0.195	1.66
+0.199	1.68
+0.203	1.69
+0.207	1.69
+0.212	1.68
+0.216	1.67
+0.221	1.66
+0.226	1.66
+0.231	1.68
+0.237	1.72
+0.243	1.77
+0.249	1.83
+0.255	1.91
+0.262	1.99
+0.269	2.07
+0.276	2.17
+0.284	2.26
+0.292	2.36
+0.301	2.46
+0.311	2.57
+0.320	2.66
+0.332	2.74
+0.342	2.82
+0.354	2.87
+0.368	2.90
+0.381	2.93
+0.397	2.95
+0.413	2.98
+0.431	3.01
+0.451	3.04
+0.471	3.10
+0.496	3.19
+0.521	3.30
+0.549	3.43
+0.582	3.58
+0.617	3.72
+0.659	3.84
+0.704	3.96
+0.756	4.01
+0.821	4.01
+0.892	3.96
+0.984	3.97
+1.088	4.02
+1.216	4.15
+1.393	4.37
+1.610	4.70
+1.937	5.19

web/filament-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "filament",
-  "version": "1.9.12",
+  "version": "1.9.13",
   "description": "Real-time physically based rendering engine",
   "main": "filament.js",
   "module": "filament.js",