From 8b86abfcebbddb7963eca3abbb748ccbe3ed3283 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Thu, 5 May 2022 22:17:07 -0400 Subject: [PATCH] Reorganize assets --- .github/workflows/CI.yml | 35 +++++---- CMakeLists.txt | 38 ++++------ assets/{ => assets_common}/box.png | Bin assets/{ => assets_common}/steam.png | Bin assets/{ => assets_common}/sunshine.conf | 2 +- assets/{ => assets_common}/web/apps.html | 0 assets/{ => assets_common}/web/clients.html | 0 assets/{ => assets_common}/web/config.html | 0 .../fonts/fontawesome-free-web/LICENSE.txt | 0 .../fonts/fontawesome-free-web/attribution.js | 0 .../fontawesome-free-web/css/all.min.css | 0 .../fontawesome-free-web/css/brands.min.css | 0 .../css/fontawesome.min.css | 0 .../fontawesome-free-web/css/regular.min.css | 0 .../fontawesome-free-web/css/solid.min.css | 0 .../css/svg-with-js.min.css | 0 .../fontawesome-free-web/css/v4-shims.min.css | 0 .../webfonts/fa-brands-400.eot | Bin .../webfonts/fa-brands-400.svg | 0 .../webfonts/fa-brands-400.ttf | Bin .../webfonts/fa-brands-400.woff | Bin .../webfonts/fa-brands-400.woff2 | Bin .../webfonts/fa-regular-400.eot | Bin .../webfonts/fa-regular-400.svg | 0 .../webfonts/fa-regular-400.ttf | Bin .../webfonts/fa-regular-400.woff | Bin .../webfonts/fa-regular-400.woff2 | Bin .../webfonts/fa-solid-900.eot | Bin .../webfonts/fa-solid-900.svg | 0 .../webfonts/fa-solid-900.ttf | Bin .../webfonts/fa-solid-900.woff | Bin .../webfonts/fa-solid-900.woff2 | Bin .../web/header-no-nav.html | 0 assets/{ => assets_common}/web/header.html | 0 .../web/images/favicon.ico | Bin .../web/images/logo-sunshine-45.png | Bin assets/{ => assets_common}/web/index.html | 0 assets/{ => assets_common}/web/password.html | 0 assets/{ => assets_common}/web/pin.html | 0 .../web/third_party/bootstrap.bundle.min.js | 0 .../web/third_party/bootstrap.min.css | 0 .../web/third_party/vue.js | 0 .../web/troubleshooting.html | 0 assets/{ => assets_common}/web/welcome.html | 0 .../apps.json} | 0 .../shaders/opengl/ConvertUV.frag | 68 +++++++++--------- .../shaders/opengl/ConvertUV.vert | 52 +++++++------- .../shaders/opengl/ConvertY.frag | 50 ++++++------- .../shaders/opengl/Scene.frag | 26 +++---- .../shaders/opengl/Scene.vert | 42 +++++------ assets/{info.plist => assets_mac/Info.plist} | 0 .../{apps_mac.json => assets_mac/apps.json} | 0 .../apps.json} | 0 .../shaders/directx/ConvertUVPS.hlsl | 64 ++++++++--------- .../shaders/directx/ConvertUVVS.hlsl | 56 +++++++-------- .../shaders/directx/ConvertYPS.hlsl | 48 ++++++------- .../shaders/directx/ScenePS.hlsl | 26 +++---- .../shaders/directx/SceneVS.hlsl | 42 +++++------ .../{ => linux-misc}/85-sunshine-rules.rules | 0 59 files changed, 271 insertions(+), 278 deletions(-) rename assets/{ => assets_common}/box.png (100%) rename assets/{ => assets_common}/steam.png (100%) rename assets/{ => assets_common}/sunshine.conf (99%) rename assets/{ => assets_common}/web/apps.html (100%) rename assets/{ => assets_common}/web/clients.html (100%) rename assets/{ => assets_common}/web/config.html (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/LICENSE.txt (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/attribution.js (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/css/all.min.css (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/css/brands.min.css (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/css/fontawesome.min.css (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/css/regular.min.css (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/css/solid.min.css (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/css/svg-with-js.min.css (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/css/v4-shims.min.css (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.eot (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.svg (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.ttf (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.woff (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.woff2 (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.eot (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.svg (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.ttf (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.woff (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.woff2 (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.eot (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.svg (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.ttf (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.woff (100%) rename assets/{ => assets_common}/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.woff2 (100%) rename assets/{ => assets_common}/web/header-no-nav.html (100%) rename assets/{ => assets_common}/web/header.html (100%) rename assets/{ => assets_common}/web/images/favicon.ico (100%) rename assets/{ => assets_common}/web/images/logo-sunshine-45.png (100%) rename assets/{ => assets_common}/web/index.html (100%) rename assets/{ => assets_common}/web/password.html (100%) rename assets/{ => assets_common}/web/pin.html (100%) rename assets/{ => assets_common}/web/third_party/bootstrap.bundle.min.js (100%) rename assets/{ => assets_common}/web/third_party/bootstrap.min.css (100%) rename assets/{ => assets_common}/web/third_party/vue.js (100%) rename assets/{ => assets_common}/web/troubleshooting.html (100%) rename assets/{ => assets_common}/web/welcome.html (100%) rename assets/{apps_linux.json => assets_linux/apps.json} (100%) rename assets/{ => assets_linux}/shaders/opengl/ConvertUV.frag (96%) rename assets/{ => assets_linux}/shaders/opengl/ConvertUV.vert (95%) rename assets/{ => assets_linux}/shaders/opengl/ConvertY.frag (94%) rename assets/{ => assets_linux}/shaders/opengl/Scene.frag (93%) rename assets/{ => assets_linux}/shaders/opengl/Scene.vert (94%) rename assets/{info.plist => assets_mac/Info.plist} (100%) rename assets/{apps_mac.json => assets_mac/apps.json} (100%) rename assets/{apps_windows.json => assets_windows/apps.json} (100%) rename assets/{ => assets_windows}/shaders/directx/ConvertUVPS.hlsl (96%) rename assets/{ => assets_windows}/shaders/directx/ConvertUVVS.hlsl (96%) rename assets/{ => assets_windows}/shaders/directx/ConvertYPS.hlsl (95%) rename assets/{ => assets_windows}/shaders/directx/ScenePS.hlsl (95%) rename assets/{ => assets_windows}/shaders/directx/SceneVS.hlsl (95%) rename assets/{ => linux-misc}/85-sunshine-rules.rules (100%) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0e71e2de..504e706f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -107,29 +107,34 @@ jobs: DESKTOP_FILE="${DESKTOP_FILE:-sunshine.desktop}" ICON_FILE="${ICON_FILE:-sunshine.png}" - CONFIG_DIR="${CONFIG_DIR:-sunshine/sunshine.AppImage.config/}" - HOME_DIR="${HOME_DIR:-sunshine/sunshine.AppImage.home/}" + # CONFIG_DIR="${CONFIG_DIR:-sunshine/sunshine.AppImage.config/}" + # HOME_DIR="${HOME_DIR:-sunshine/sunshine.AppImage.home/}" wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage && chmod +x linuxdeploy-x86_64.AppImage ./linuxdeploy-x86_64.AppImage --appdir ../AppDir -e ../appimage-build/sunshine -i "../$ICON_FILE" -d "../appimage-build/$DESKTOP_FILE" --output appimage - mv sunshine*.AppImage sunshine.AppImage - mkdir sunshine && mv sunshine.AppImage sunshine/ - ./sunshine/sunshine.AppImage --appimage-portable-config - ./sunshine/sunshine.AppImage --appimage-portable-home - cp -r ../assets/* "$CONFIG_DIR" - rm -f "$CONFIG_DIR"/apps_windows.json - mkdir -p ./"$HOME_DIR"/.config/"$CONFIG_DIR" - cp ./"$CONFIG_DIR"/apps_linux.json ./"$HOME_DIR"/.config/"$CONFIG_DIR" - zip -r ./sunshine-appimage.zip ./sunshine/* + # mv sunshine*.AppImage sunshine.AppImage + # mkdir sunshine && mv sunshine.AppImage sunshine/ + # ./sunshine/sunshine.AppImage --appimage-portable-config + # ./sunshine/sunshine.AppImage --appimage-portable-home + # cp -r ../assets/assets_common/* "$CONFIG_DIR" + # cp -r ../assets/assets_linux/* "$CONFIG_DIR" - mv sunshine-appimage.zip ../artifacts/ + # mkdir -p ./"$HOME_DIR"/.config/"$CONFIG_DIR" + # cp ./"$CONFIG_DIR"/apps.json ./"$HOME_DIR"/.config/"$CONFIG_DIR" + # zip -r ./sunshine-appimage.zip ./sunshine/* + + # mv sunshine-appimage.zip ../artifacts/ + + mv sunshine*.AppImage ../artifacts/sunshine.AppImage + + # if testing succeeds, can remove commented lines - name: Verify AppImage run: | - cd appimage_temp - wget https://github.com/TheAssassin/appimagelint/releases/download/continuous/appimagelint-x86_64.AppImage && chmod +x appimagelint-x86_64.AppImage && ./appimagelint-x86_64.AppImage ./sunshine/sunshine.AppImage + # cd appimage_temp + wget https://github.com/TheAssassin/appimagelint/releases/download/continuous/appimagelint-x86_64.AppImage && chmod +x appimagelint-x86_64.AppImage && ./appimagelint-x86_64.AppImage ./artifacts/sunshine.AppImage - name: Upload Artifacts if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} @@ -318,7 +323,7 @@ jobs: cd build # package - cpack -G NSIS + cpack -G NSIS cpack -G ZIP # move diff --git a/CMakeLists.txt b/CMakeLists.txt index 675a5725..ec31a2a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,8 +66,6 @@ if(WIN32) add_compile_definitions(SUNSHINE_PLATFORM="windows") add_subdirectory(tools) #This is temporary, only tools for Windows are needed, for now - list(APPEND SUNSHINE_DEFINITIONS APPS_JSON="apps_windows.json") - include_directories(third-party/ViGEmClient/include) if(NOT DEFINED SUNSHINE_ICON_PATH) @@ -126,7 +124,6 @@ if(WIN32) set_source_files_properties(third-party/ViGEmClient/src/ViGEmClient.cpp PROPERTIES COMPILE_FLAGS "-Wno-unknown-pragmas -Wno-misleading-indentation -Wno-class-memaccess") elseif(APPLE) add_compile_definitions(SUNSHINE_PLATFORM="macos") - list(APPEND SUNSHINE_DEFINITIONS APPS_JSON="apps_mac.json") link_directories(/opt/local/lib) link_directories(/usr/local/lib) ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK) @@ -163,10 +160,9 @@ elseif(APPLE) sunshine/platform/macos/publish.cpp sunshine/platform/macos/TPCircularBuffer/TPCircularBuffer.c sunshine/platform/macos/TPCircularBuffer/TPCircularBuffer.h - ${CMAKE_CURRENT_SOURCE_DIR}/assets/Info.plist) + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_mac/Info.plist) else() add_compile_definitions(SUNSHINE_PLATFORM="linux") - list(APPEND SUNSHINE_DEFINITIONS APPS_JSON="apps_linux.json") option(SUNSHINE_ENABLE_DRM "Enable KMS grab if available" ON) option(SUNSHINE_ENABLE_X11 "Enable X11 grab if available" ON) @@ -423,6 +419,7 @@ endif() list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_ASSETS_DIR="${SUNSHINE_ASSETS_DIR}") list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_CONFIG_DIR="${SUNSHINE_CONFIG_DIR}") list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_DEFAULT_DIR="${SUNSHINE_DEFAULT_DIR}") +list(APPEND SUNSHINE_DEFINITIONS APPS_JSON="apps.json") add_executable(sunshine ${SUNSHINE_TARGET_FILES}) target_link_libraries(sunshine ${SUNSHINE_EXTERNAL_LIBRARIES} ${EXTRA_LIBS}) target_compile_definitions(sunshine PUBLIC ${SUNSHINE_DEFINITIONS}) @@ -437,7 +434,7 @@ if(NOT DEFINED CMAKE_CUDA_STANDARD) endif() if(APPLE) - target_link_options(sunshine PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/assets/Info.plist) + target_link_options(sunshine PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_mac/Info.plist) endif() foreach(flag IN LISTS SUNSHINE_COMPILE_OPTIONS) @@ -471,12 +468,8 @@ if(WIN32) # see options at: https://cmake.org/cmake/help/latest/cpack_gen/nsis.h install(TARGETS audio-info RUNTIME DESTINATION "tools" COMPONENT audio) install(TARGETS sunshinesvc RUNTIME DESTINATION "tools" COMPONENT sunshinesvc) - install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/web" DESTINATION "${SUNSHINE_CONFIG_DIR}" COMPONENT web) - install(FILES "${SUNSHINE_ASSETS_DIR}/apps_windows.json" DESTINATION "${SUNSHINE_CONFIG_DIR}" COMPONENT assets) - install(FILES "${SUNSHINE_ASSETS_DIR}/box.png" DESTINATION "${SUNSHINE_CONFIG_DIR}" COMPONENT assets) - install(FILES "${SUNSHINE_ASSETS_DIR}/steam.png" DESTINATION "${SUNSHINE_CONFIG_DIR}" COMPONENT assets) - install(FILES "${SUNSHINE_ASSETS_DIR}/sunshine.conf" DESTINATION "${SUNSHINE_CONFIG_DIR}" COMPONENT assets) - install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/shaders/directx" DESTINATION "${SUNSHINE_CONFIG_DIR}/shaders" COMPONENT assets) + install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/assets_common/" DESTINATION "${SUNSHINE_CONFIG_DIR}" COMPONENT assets) + install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/assets_windows/" DESTINATION "${SUNSHINE_CONFIG_DIR}" COMPONENT assets) set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\sunshine.ico") set(CPACK_NSIS_INSTALLED_ICON_NAME "${PROJECT__DIR}\\\\${PROJECT_EXE}") @@ -517,17 +510,15 @@ if(WIN32) # see options at: https://cmake.org/cmake/help/latest/cpack_gen/nsis.h set(CPACK_COMPONENT_AUDIO_GROUP "Extra Tools") set(CPACK_COMPONENT_SUNSHINESVC_GROUP "Extra Tools") - set(CPACK_COMPONENT_APPLICATION_DEPENDS web assets) + set(CPACK_COMPONENT_APPLICATION_DEPENDS assets) endif() if(APPLE) # TODO: test set(prefix "${CMAKE_PROJECT_NAME}.app/Contents") set(INSTALL_RUNTIME_DIR "${prefix}/MacOS") - install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/web" DESTINATION "${INSTALL_RUNTIME_DIR}") - install(FILES "${SUNSHINE_ASSETS_DIR}/apps_mac.json" DESTINATION "${INSTALL_RUNTIME_DIR}") - install(FILES "${SUNSHINE_ASSETS_DIR}/box.png" DESTINATION "${INSTALL_RUNTIME_DIR}") - install(FILES "${SUNSHINE_ASSETS_DIR}/sunshine.conf" DESTINATION "${INSTALL_RUNTIME_DIR}") + install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/assets_common/" DESTINATION "${INSTALL_RUNTIME_DIR}") + install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/assets_mac/" DESTINATION "${INSTALL_RUNTIME_DIR}") install(TARGETS sunshine BUNDLE DESTINATION . COMPONENT Runtime @@ -535,23 +526,20 @@ if(APPLE) # TODO: test # TODO: bundle doesn't produce a valid .app use cpack -G DragNDrop set(CPACK_BUNDLE_NAME "${CMAKE_PROJECT_NAME}") - set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/assets/Info.plist") + set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/assets_mac/Info.plist") set(CPACK_BUNDLE_ICON "${PROJECT_SOURCE_DIR}/sunshine.icns") # Portfile configure_file(Portfile.in Portfile @ONLY) endif() if(UNIX AND NOT APPLE) - install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/web" DESTINATION "${SUNSHINE_CONFIG_DIR}") - install(FILES "${SUNSHINE_ASSETS_DIR}/85-sunshine-rules.rules" DESTINATION "/etc/udev/rules.d") - install(FILES "${SUNSHINE_ASSETS_DIR}/apps_linux.json" DESTINATION "${SUNSHINE_CONFIG_DIR}") - install(FILES "${SUNSHINE_ASSETS_DIR}/box.png" DESTINATION "${SUNSHINE_CONFIG_DIR}") - install(FILES "${SUNSHINE_ASSETS_DIR}/steam.png" DESTINATION "${SUNSHINE_CONFIG_DIR}") - install(FILES "${SUNSHINE_ASSETS_DIR}/sunshine.conf" DESTINATION "${SUNSHINE_CONFIG_DIR}") + install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/assets_common/" DESTINATION "${SUNSHINE_CONFIG_DIR}") + install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/assets_linux/" DESTINATION "${SUNSHINE_CONFIG_DIR}") + + install(FILES "${SUNSHINE_ASSETS_DIR}/linux-misc/85-sunshine-rules.rules" DESTINATION "/etc/udev/rules.d") install(TARGETS sunshine RUNTIME DESTINATION "/usr/bin") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine.service" DESTINATION "/usr/lib/systemd/user") - install(DIRECTORY "${SUNSHINE_ASSETS_DIR}/shaders/opengl" DESTINATION "${SUNSHINE_CONFIG_DIR}/shaders") # Pre and post install set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA diff --git a/assets/box.png b/assets/assets_common/box.png similarity index 100% rename from assets/box.png rename to assets/assets_common/box.png diff --git a/assets/steam.png b/assets/assets_common/steam.png similarity index 100% rename from assets/steam.png rename to assets/assets_common/steam.png diff --git a/assets/sunshine.conf b/assets/assets_common/sunshine.conf similarity index 99% rename from assets/sunshine.conf rename to assets/assets_common/sunshine.conf index 509ff52a..04d51c2a 100644 --- a/assets/sunshine.conf +++ b/assets/assets_common/sunshine.conf @@ -1 +1 @@ -# See our documentation at https://sunshinestream.readthedocs.io/en/latest/about/advanced_usage.html +# See our documentation at https://sunshinestream.readthedocs.io/en/latest/about/advanced_usage.html diff --git a/assets/web/apps.html b/assets/assets_common/web/apps.html similarity index 100% rename from assets/web/apps.html rename to assets/assets_common/web/apps.html diff --git a/assets/web/clients.html b/assets/assets_common/web/clients.html similarity index 100% rename from assets/web/clients.html rename to assets/assets_common/web/clients.html diff --git a/assets/web/config.html b/assets/assets_common/web/config.html similarity index 100% rename from assets/web/config.html rename to assets/assets_common/web/config.html diff --git a/assets/web/fonts/fontawesome-free-web/LICENSE.txt b/assets/assets_common/web/fonts/fontawesome-free-web/LICENSE.txt similarity index 100% rename from assets/web/fonts/fontawesome-free-web/LICENSE.txt rename to assets/assets_common/web/fonts/fontawesome-free-web/LICENSE.txt diff --git a/assets/web/fonts/fontawesome-free-web/attribution.js b/assets/assets_common/web/fonts/fontawesome-free-web/attribution.js similarity index 100% rename from assets/web/fonts/fontawesome-free-web/attribution.js rename to assets/assets_common/web/fonts/fontawesome-free-web/attribution.js diff --git a/assets/web/fonts/fontawesome-free-web/css/all.min.css b/assets/assets_common/web/fonts/fontawesome-free-web/css/all.min.css similarity index 100% rename from assets/web/fonts/fontawesome-free-web/css/all.min.css rename to assets/assets_common/web/fonts/fontawesome-free-web/css/all.min.css diff --git a/assets/web/fonts/fontawesome-free-web/css/brands.min.css b/assets/assets_common/web/fonts/fontawesome-free-web/css/brands.min.css similarity index 100% rename from assets/web/fonts/fontawesome-free-web/css/brands.min.css rename to assets/assets_common/web/fonts/fontawesome-free-web/css/brands.min.css diff --git a/assets/web/fonts/fontawesome-free-web/css/fontawesome.min.css b/assets/assets_common/web/fonts/fontawesome-free-web/css/fontawesome.min.css similarity index 100% rename from assets/web/fonts/fontawesome-free-web/css/fontawesome.min.css rename to assets/assets_common/web/fonts/fontawesome-free-web/css/fontawesome.min.css diff --git a/assets/web/fonts/fontawesome-free-web/css/regular.min.css b/assets/assets_common/web/fonts/fontawesome-free-web/css/regular.min.css similarity index 100% rename from assets/web/fonts/fontawesome-free-web/css/regular.min.css rename to assets/assets_common/web/fonts/fontawesome-free-web/css/regular.min.css diff --git a/assets/web/fonts/fontawesome-free-web/css/solid.min.css b/assets/assets_common/web/fonts/fontawesome-free-web/css/solid.min.css similarity index 100% rename from assets/web/fonts/fontawesome-free-web/css/solid.min.css rename to assets/assets_common/web/fonts/fontawesome-free-web/css/solid.min.css diff --git a/assets/web/fonts/fontawesome-free-web/css/svg-with-js.min.css b/assets/assets_common/web/fonts/fontawesome-free-web/css/svg-with-js.min.css similarity index 100% rename from assets/web/fonts/fontawesome-free-web/css/svg-with-js.min.css rename to assets/assets_common/web/fonts/fontawesome-free-web/css/svg-with-js.min.css diff --git a/assets/web/fonts/fontawesome-free-web/css/v4-shims.min.css b/assets/assets_common/web/fonts/fontawesome-free-web/css/v4-shims.min.css similarity index 100% rename from assets/web/fonts/fontawesome-free-web/css/v4-shims.min.css rename to assets/assets_common/web/fonts/fontawesome-free-web/css/v4-shims.min.css diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.eot b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.eot similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.eot rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.eot diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.svg b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.svg similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.svg rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.svg diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.ttf b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.ttf similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.ttf rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.ttf diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.woff b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.woff similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.woff rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.woff diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.woff2 b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.woff2 similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.woff2 rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-brands-400.woff2 diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.eot b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.eot similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.eot rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.eot diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.svg b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.svg similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.svg rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.svg diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.ttf b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.ttf similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.ttf rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.ttf diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.woff b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.woff similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.woff rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.woff diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.woff2 b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.woff2 similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.woff2 rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-regular-400.woff2 diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.eot b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.eot similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.eot rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.eot diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.svg b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.svg similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.svg rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.svg diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.ttf b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.ttf similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.ttf rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.ttf diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.woff b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.woff similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.woff rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.woff diff --git a/assets/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.woff2 b/assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.woff2 similarity index 100% rename from assets/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.woff2 rename to assets/assets_common/web/fonts/fontawesome-free-web/webfonts/fa-solid-900.woff2 diff --git a/assets/web/header-no-nav.html b/assets/assets_common/web/header-no-nav.html similarity index 100% rename from assets/web/header-no-nav.html rename to assets/assets_common/web/header-no-nav.html diff --git a/assets/web/header.html b/assets/assets_common/web/header.html similarity index 100% rename from assets/web/header.html rename to assets/assets_common/web/header.html diff --git a/assets/web/images/favicon.ico b/assets/assets_common/web/images/favicon.ico similarity index 100% rename from assets/web/images/favicon.ico rename to assets/assets_common/web/images/favicon.ico diff --git a/assets/web/images/logo-sunshine-45.png b/assets/assets_common/web/images/logo-sunshine-45.png similarity index 100% rename from assets/web/images/logo-sunshine-45.png rename to assets/assets_common/web/images/logo-sunshine-45.png diff --git a/assets/web/index.html b/assets/assets_common/web/index.html similarity index 100% rename from assets/web/index.html rename to assets/assets_common/web/index.html diff --git a/assets/web/password.html b/assets/assets_common/web/password.html similarity index 100% rename from assets/web/password.html rename to assets/assets_common/web/password.html diff --git a/assets/web/pin.html b/assets/assets_common/web/pin.html similarity index 100% rename from assets/web/pin.html rename to assets/assets_common/web/pin.html diff --git a/assets/web/third_party/bootstrap.bundle.min.js b/assets/assets_common/web/third_party/bootstrap.bundle.min.js similarity index 100% rename from assets/web/third_party/bootstrap.bundle.min.js rename to assets/assets_common/web/third_party/bootstrap.bundle.min.js diff --git a/assets/web/third_party/bootstrap.min.css b/assets/assets_common/web/third_party/bootstrap.min.css similarity index 100% rename from assets/web/third_party/bootstrap.min.css rename to assets/assets_common/web/third_party/bootstrap.min.css diff --git a/assets/web/third_party/vue.js b/assets/assets_common/web/third_party/vue.js similarity index 100% rename from assets/web/third_party/vue.js rename to assets/assets_common/web/third_party/vue.js diff --git a/assets/web/troubleshooting.html b/assets/assets_common/web/troubleshooting.html similarity index 100% rename from assets/web/troubleshooting.html rename to assets/assets_common/web/troubleshooting.html diff --git a/assets/web/welcome.html b/assets/assets_common/web/welcome.html similarity index 100% rename from assets/web/welcome.html rename to assets/assets_common/web/welcome.html diff --git a/assets/apps_linux.json b/assets/assets_linux/apps.json similarity index 100% rename from assets/apps_linux.json rename to assets/assets_linux/apps.json diff --git a/assets/shaders/opengl/ConvertUV.frag b/assets/assets_linux/shaders/opengl/ConvertUV.frag similarity index 96% rename from assets/shaders/opengl/ConvertUV.frag rename to assets/assets_linux/shaders/opengl/ConvertUV.frag index 416e1e8b..4bd08287 100644 --- a/assets/shaders/opengl/ConvertUV.frag +++ b/assets/assets_linux/shaders/opengl/ConvertUV.frag @@ -1,35 +1,35 @@ -#version 300 es - -#ifdef GL_ES -precision lowp float; -#endif - -uniform sampler2D image; - -layout(shared) uniform ColorMatrix { - vec4 color_vec_y; - vec4 color_vec_u; - vec4 color_vec_v; - vec2 range_y; - vec2 range_uv; -}; - -in vec3 uuv; -layout(location = 0) out vec2 color; - -//-------------------------------------------------------------------------------------- -// Pixel Shader -//-------------------------------------------------------------------------------------- -void main() { - vec3 rgb_left = texture(image, uuv.xz).rgb; - vec3 rgb_right = texture(image, uuv.yz).rgb; - vec3 rgb = (rgb_left + rgb_right) * 0.5; - - float u = dot(color_vec_u.xyz, rgb) + color_vec_u.w; - float v = dot(color_vec_v.xyz, rgb) + color_vec_v.w; - - u = u * range_uv.x + range_uv.y; - v = v * range_uv.x + range_uv.y; - - color = vec2(u, v * 224.0f / 256.0f + 0.0625); +#version 300 es + +#ifdef GL_ES +precision lowp float; +#endif + +uniform sampler2D image; + +layout(shared) uniform ColorMatrix { + vec4 color_vec_y; + vec4 color_vec_u; + vec4 color_vec_v; + vec2 range_y; + vec2 range_uv; +}; + +in vec3 uuv; +layout(location = 0) out vec2 color; + +//-------------------------------------------------------------------------------------- +// Pixel Shader +//-------------------------------------------------------------------------------------- +void main() { + vec3 rgb_left = texture(image, uuv.xz).rgb; + vec3 rgb_right = texture(image, uuv.yz).rgb; + vec3 rgb = (rgb_left + rgb_right) * 0.5; + + float u = dot(color_vec_u.xyz, rgb) + color_vec_u.w; + float v = dot(color_vec_v.xyz, rgb) + color_vec_v.w; + + u = u * range_uv.x + range_uv.y; + v = v * range_uv.x + range_uv.y; + + color = vec2(u, v * 224.0f / 256.0f + 0.0625); } \ No newline at end of file diff --git a/assets/shaders/opengl/ConvertUV.vert b/assets/assets_linux/shaders/opengl/ConvertUV.vert similarity index 95% rename from assets/shaders/opengl/ConvertUV.vert rename to assets/assets_linux/shaders/opengl/ConvertUV.vert index a71fe58d..70c14f4c 100644 --- a/assets/shaders/opengl/ConvertUV.vert +++ b/assets/assets_linux/shaders/opengl/ConvertUV.vert @@ -1,27 +1,27 @@ -#version 300 es - -#ifdef GL_ES -precision mediump float; -#endif - -uniform float width_i; - -out vec3 uuv; -//-------------------------------------------------------------------------------------- -// Vertex Shader -//-------------------------------------------------------------------------------------- -void main() -{ - float idHigh = float(gl_VertexID >> 1); - float idLow = float(gl_VertexID & int(1)); - - float x = idHigh * 4.0 - 1.0; - float y = idLow * 4.0 - 1.0; - - float u_right = idHigh * 2.0; - float u_left = u_right - width_i; - float v = idLow * 2.0; - - uuv = vec3(u_left, u_right, v); - gl_Position = vec4(x, y, 0.0, 1.0); +#version 300 es + +#ifdef GL_ES +precision mediump float; +#endif + +uniform float width_i; + +out vec3 uuv; +//-------------------------------------------------------------------------------------- +// Vertex Shader +//-------------------------------------------------------------------------------------- +void main() +{ + float idHigh = float(gl_VertexID >> 1); + float idLow = float(gl_VertexID & int(1)); + + float x = idHigh * 4.0 - 1.0; + float y = idLow * 4.0 - 1.0; + + float u_right = idHigh * 2.0; + float u_left = u_right - width_i; + float v = idLow * 2.0; + + uuv = vec3(u_left, u_right, v); + gl_Position = vec4(x, y, 0.0, 1.0); } \ No newline at end of file diff --git a/assets/shaders/opengl/ConvertY.frag b/assets/assets_linux/shaders/opengl/ConvertY.frag similarity index 94% rename from assets/shaders/opengl/ConvertY.frag rename to assets/assets_linux/shaders/opengl/ConvertY.frag index 564fa25a..dfd5774e 100644 --- a/assets/shaders/opengl/ConvertY.frag +++ b/assets/assets_linux/shaders/opengl/ConvertY.frag @@ -1,26 +1,26 @@ -#version 300 es - -#ifdef GL_ES -precision lowp float; -#endif - -uniform sampler2D image; - -layout(shared) uniform ColorMatrix { - vec4 color_vec_y; - vec4 color_vec_u; - vec4 color_vec_v; - vec2 range_y; - vec2 range_uv; -}; - -in vec2 tex; -layout(location = 0) out float color; - -void main() -{ - vec3 rgb = texture(image, tex).rgb; - float y = dot(color_vec_y.xyz, rgb); - - color = y * range_y.x + range_y.y; +#version 300 es + +#ifdef GL_ES +precision lowp float; +#endif + +uniform sampler2D image; + +layout(shared) uniform ColorMatrix { + vec4 color_vec_y; + vec4 color_vec_u; + vec4 color_vec_v; + vec2 range_y; + vec2 range_uv; +}; + +in vec2 tex; +layout(location = 0) out float color; + +void main() +{ + vec3 rgb = texture(image, tex).rgb; + float y = dot(color_vec_y.xyz, rgb); + + color = y * range_y.x + range_y.y; } \ No newline at end of file diff --git a/assets/shaders/opengl/Scene.frag b/assets/assets_linux/shaders/opengl/Scene.frag similarity index 93% rename from assets/shaders/opengl/Scene.frag rename to assets/assets_linux/shaders/opengl/Scene.frag index 6375f1fd..ee4b36b9 100644 --- a/assets/shaders/opengl/Scene.frag +++ b/assets/assets_linux/shaders/opengl/Scene.frag @@ -1,14 +1,14 @@ -#version 300 es - -#ifdef GL_ES -precision lowp float; -#endif - -uniform sampler2D image; - -in vec2 tex; -layout(location = 0) out vec4 color; -void main() -{ - color = texture(image, tex); +#version 300 es + +#ifdef GL_ES +precision lowp float; +#endif + +uniform sampler2D image; + +in vec2 tex; +layout(location = 0) out vec4 color; +void main() +{ + color = texture(image, tex); } \ No newline at end of file diff --git a/assets/shaders/opengl/Scene.vert b/assets/assets_linux/shaders/opengl/Scene.vert similarity index 94% rename from assets/shaders/opengl/Scene.vert rename to assets/assets_linux/shaders/opengl/Scene.vert index 258878f4..24c16bef 100644 --- a/assets/shaders/opengl/Scene.vert +++ b/assets/assets_linux/shaders/opengl/Scene.vert @@ -1,22 +1,22 @@ -#version 300 es - -#ifdef GL_ES -precision mediump float; -#endif - -out vec2 tex; - -void main() -{ - float idHigh = float(gl_VertexID >> 1); - float idLow = float(gl_VertexID & int(1)); - - float x = idHigh * 4.0 - 1.0; - float y = idLow * 4.0 - 1.0; - - float u = idHigh * 2.0; - float v = idLow * 2.0; - - gl_Position = vec4(x, y, 0.0, 1.0); - tex = vec2(u, v); +#version 300 es + +#ifdef GL_ES +precision mediump float; +#endif + +out vec2 tex; + +void main() +{ + float idHigh = float(gl_VertexID >> 1); + float idLow = float(gl_VertexID & int(1)); + + float x = idHigh * 4.0 - 1.0; + float y = idLow * 4.0 - 1.0; + + float u = idHigh * 2.0; + float v = idLow * 2.0; + + gl_Position = vec4(x, y, 0.0, 1.0); + tex = vec2(u, v); } \ No newline at end of file diff --git a/assets/info.plist b/assets/assets_mac/Info.plist similarity index 100% rename from assets/info.plist rename to assets/assets_mac/Info.plist diff --git a/assets/apps_mac.json b/assets/assets_mac/apps.json similarity index 100% rename from assets/apps_mac.json rename to assets/assets_mac/apps.json diff --git a/assets/apps_windows.json b/assets/assets_windows/apps.json similarity index 100% rename from assets/apps_windows.json rename to assets/assets_windows/apps.json diff --git a/assets/shaders/directx/ConvertUVPS.hlsl b/assets/assets_windows/shaders/directx/ConvertUVPS.hlsl similarity index 96% rename from assets/shaders/directx/ConvertUVPS.hlsl rename to assets/assets_windows/shaders/directx/ConvertUVPS.hlsl index 2b72cddf..f9bf69df 100644 --- a/assets/shaders/directx/ConvertUVPS.hlsl +++ b/assets/assets_windows/shaders/directx/ConvertUVPS.hlsl @@ -1,33 +1,33 @@ -Texture2D image : register(t0); - -SamplerState def_sampler : register(s0); - -struct FragTexWide { - float3 uuv : TEXCOORD0; -}; - -cbuffer ColorMatrix : register(b0) { - float4 color_vec_y; - float4 color_vec_u; - float4 color_vec_v; - float2 range_y; - float2 range_uv; -}; - -//-------------------------------------------------------------------------------------- -// Pixel Shader -//-------------------------------------------------------------------------------------- -float2 main_ps(FragTexWide input) : SV_Target -{ - float3 rgb_left = image.Sample(def_sampler, input.uuv.xz).rgb; - float3 rgb_right = image.Sample(def_sampler, input.uuv.yz).rgb; - float3 rgb = (rgb_left + rgb_right) * 0.5; - - float u = dot(color_vec_u.xyz, rgb) + color_vec_u.w; - float v = dot(color_vec_v.xyz, rgb) + color_vec_v.w; - - u = u * range_uv.x + range_uv.y; - v = v * range_uv.x + range_uv.y; - - return float2(u, v * 224.0f/256.0f + 0.0625); +Texture2D image : register(t0); + +SamplerState def_sampler : register(s0); + +struct FragTexWide { + float3 uuv : TEXCOORD0; +}; + +cbuffer ColorMatrix : register(b0) { + float4 color_vec_y; + float4 color_vec_u; + float4 color_vec_v; + float2 range_y; + float2 range_uv; +}; + +//-------------------------------------------------------------------------------------- +// Pixel Shader +//-------------------------------------------------------------------------------------- +float2 main_ps(FragTexWide input) : SV_Target +{ + float3 rgb_left = image.Sample(def_sampler, input.uuv.xz).rgb; + float3 rgb_right = image.Sample(def_sampler, input.uuv.yz).rgb; + float3 rgb = (rgb_left + rgb_right) * 0.5; + + float u = dot(color_vec_u.xyz, rgb) + color_vec_u.w; + float v = dot(color_vec_v.xyz, rgb) + color_vec_v.w; + + u = u * range_uv.x + range_uv.y; + v = v * range_uv.x + range_uv.y; + + return float2(u, v * 224.0f/256.0f + 0.0625); } \ No newline at end of file diff --git a/assets/shaders/directx/ConvertUVVS.hlsl b/assets/assets_windows/shaders/directx/ConvertUVVS.hlsl similarity index 96% rename from assets/shaders/directx/ConvertUVVS.hlsl rename to assets/assets_windows/shaders/directx/ConvertUVVS.hlsl index 66d97d43..77ff38d7 100644 --- a/assets/shaders/directx/ConvertUVVS.hlsl +++ b/assets/assets_windows/shaders/directx/ConvertUVVS.hlsl @@ -1,29 +1,29 @@ -struct VertTexPosWide { - float3 uuv : TEXCOORD; - float4 pos : SV_POSITION; -}; - -cbuffer info : register(b0) { - float width_i; -}; - -//-------------------------------------------------------------------------------------- -// Vertex Shader -//-------------------------------------------------------------------------------------- -VertTexPosWide main_vs(uint vI : SV_VERTEXID) -{ - float idHigh = float(vI >> 1); - float idLow = float(vI & uint(1)); - - float x = idHigh * 4.0 - 1.0; - float y = idLow * 4.0 - 1.0; - - float u_right = idHigh * 2.0; - float u_left = u_right - width_i; - float v = 1.0 - idLow * 2.0; - - VertTexPosWide vert_out; - vert_out.uuv = float3(u_left, u_right, v); - vert_out.pos = float4(x, y, 0.0, 1.0); - return vert_out; +struct VertTexPosWide { + float3 uuv : TEXCOORD; + float4 pos : SV_POSITION; +}; + +cbuffer info : register(b0) { + float width_i; +}; + +//-------------------------------------------------------------------------------------- +// Vertex Shader +//-------------------------------------------------------------------------------------- +VertTexPosWide main_vs(uint vI : SV_VERTEXID) +{ + float idHigh = float(vI >> 1); + float idLow = float(vI & uint(1)); + + float x = idHigh * 4.0 - 1.0; + float y = idLow * 4.0 - 1.0; + + float u_right = idHigh * 2.0; + float u_left = u_right - width_i; + float v = 1.0 - idLow * 2.0; + + VertTexPosWide vert_out; + vert_out.uuv = float3(u_left, u_right, v); + vert_out.pos = float4(x, y, 0.0, 1.0); + return vert_out; } \ No newline at end of file diff --git a/assets/shaders/directx/ConvertYPS.hlsl b/assets/assets_windows/shaders/directx/ConvertYPS.hlsl similarity index 95% rename from assets/shaders/directx/ConvertYPS.hlsl rename to assets/assets_windows/shaders/directx/ConvertYPS.hlsl index 386133c8..c38d19c8 100644 --- a/assets/shaders/directx/ConvertYPS.hlsl +++ b/assets/assets_windows/shaders/directx/ConvertYPS.hlsl @@ -1,25 +1,25 @@ -Texture2D image : register(t0); - -SamplerState def_sampler : register(s0); - -cbuffer ColorMatrix : register(b0) { - float4 color_vec_y; - float4 color_vec_u; - float4 color_vec_v; - float2 range_y; - float2 range_uv; -}; - -struct PS_INPUT -{ - float4 pos : SV_POSITION; - float2 tex : TEXCOORD; -}; - -float main_ps(PS_INPUT frag_in) : SV_Target -{ - float3 rgb = image.Sample(def_sampler, frag_in.tex, 0).rgb; - float y = dot(color_vec_y.xyz, rgb); - - return y * range_y.x + range_y.y; +Texture2D image : register(t0); + +SamplerState def_sampler : register(s0); + +cbuffer ColorMatrix : register(b0) { + float4 color_vec_y; + float4 color_vec_u; + float4 color_vec_v; + float2 range_y; + float2 range_uv; +}; + +struct PS_INPUT +{ + float4 pos : SV_POSITION; + float2 tex : TEXCOORD; +}; + +float main_ps(PS_INPUT frag_in) : SV_Target +{ + float3 rgb = image.Sample(def_sampler, frag_in.tex, 0).rgb; + float y = dot(color_vec_y.xyz, rgb); + + return y * range_y.x + range_y.y; } \ No newline at end of file diff --git a/assets/shaders/directx/ScenePS.hlsl b/assets/assets_windows/shaders/directx/ScenePS.hlsl similarity index 95% rename from assets/shaders/directx/ScenePS.hlsl rename to assets/assets_windows/shaders/directx/ScenePS.hlsl index aa601231..53a9bc8d 100644 --- a/assets/shaders/directx/ScenePS.hlsl +++ b/assets/assets_windows/shaders/directx/ScenePS.hlsl @@ -1,14 +1,14 @@ -Texture2D image : register(t0); - -SamplerState def_sampler : register(s0); - -struct PS_INPUT -{ - float4 pos : SV_POSITION; - float2 tex : TEXCOORD; -}; - -float4 main_ps(PS_INPUT frag_in) : SV_Target -{ - return image.Sample(def_sampler, frag_in.tex, 0); +Texture2D image : register(t0); + +SamplerState def_sampler : register(s0); + +struct PS_INPUT +{ + float4 pos : SV_POSITION; + float2 tex : TEXCOORD; +}; + +float4 main_ps(PS_INPUT frag_in) : SV_Target +{ + return image.Sample(def_sampler, frag_in.tex, 0); } \ No newline at end of file diff --git a/assets/shaders/directx/SceneVS.hlsl b/assets/assets_windows/shaders/directx/SceneVS.hlsl similarity index 95% rename from assets/shaders/directx/SceneVS.hlsl rename to assets/assets_windows/shaders/directx/SceneVS.hlsl index 51319ddb..3afaffc6 100644 --- a/assets/shaders/directx/SceneVS.hlsl +++ b/assets/assets_windows/shaders/directx/SceneVS.hlsl @@ -1,22 +1,22 @@ -struct PS_INPUT -{ - float4 pos : SV_POSITION; - float2 tex : TEXCOORD; -}; - -PS_INPUT main_vs(uint vI : SV_VERTEXID) -{ - float idHigh = float(vI >> 1); - float idLow = float(vI & uint(1)); - - float x = idHigh * 4.0 - 1.0; - float y = idLow * 4.0 - 1.0; - - float u = idHigh * 2.0; - float v = 1.0 - idLow * 2.0; - - PS_INPUT vert_out; - vert_out.pos = float4(x, y, 0.0, 1.0); - vert_out.tex = float2(u, v); - return vert_out; +struct PS_INPUT +{ + float4 pos : SV_POSITION; + float2 tex : TEXCOORD; +}; + +PS_INPUT main_vs(uint vI : SV_VERTEXID) +{ + float idHigh = float(vI >> 1); + float idLow = float(vI & uint(1)); + + float x = idHigh * 4.0 - 1.0; + float y = idLow * 4.0 - 1.0; + + float u = idHigh * 2.0; + float v = 1.0 - idLow * 2.0; + + PS_INPUT vert_out; + vert_out.pos = float4(x, y, 0.0, 1.0); + vert_out.tex = float2(u, v); + return vert_out; } \ No newline at end of file diff --git a/assets/85-sunshine-rules.rules b/assets/linux-misc/85-sunshine-rules.rules similarity index 100% rename from assets/85-sunshine-rules.rules rename to assets/linux-misc/85-sunshine-rules.rules