diff --git a/CMakeLists.txt b/CMakeLists.txt index f67830840..8404bf93c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,11 @@ set(HECL_DATASPEC_PUSHES hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3); hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3PC);") add_subdirectory(hecl) + +if(NOT TARGET atdna) + message(FATAL_ERROR "atdna required for building URDE; please verify LLVM installation") +endif() + add_definitions(${BOO_SYS_DEFINES}) include_directories(${BOO_SYS_INCLUDES}) add_subdirectory(amuse) diff --git a/Editor/ViewManager.cpp b/Editor/ViewManager.cpp index 61951e2b3..db5093aff 100644 --- a/Editor/ViewManager.cpp +++ b/Editor/ViewManager.cpp @@ -333,7 +333,7 @@ void ViewManager::init(boo::IApplication* app) m_mainWindow->showWindow(); m_mainWindow->setWaitCursor(true); - float pixelFactor = 1.0; + float pixelFactor = m_mainWindow->getVirtualPixelFactor(); m_mainBooFactory = m_mainWindow->getMainContextDataFactory(); m_mainPlatformName = m_mainBooFactory->platformName(); diff --git a/Editor/icons/CMakeLists.txt b/Editor/icons/CMakeLists.txt index 80edef7f5..abc8f9bc1 100644 --- a/Editor/icons/CMakeLists.txt +++ b/Editor/icons/CMakeLists.txt @@ -12,6 +12,7 @@ if(WIN32) "$ENV{ProgramW6432}/Inkscape" "$ENV{PROGRAMFILES(X86)}/Inkscape") else() + set(CMAKE_FIND_APPBUNDLE FIRST) find_program(INKSCAPE_BIN inkscape) endif() if(INKSCAPE_BIN STREQUAL "INKSCAPE_BIN-NOTFOUND") diff --git a/Runtime/Graphics/CGraphics.cpp b/Runtime/Graphics/CGraphics.cpp index 1f49352b6..fe8e7caeb 100644 --- a/Runtime/Graphics/CGraphics.cpp +++ b/Runtime/Graphics/CGraphics.cpp @@ -71,6 +71,7 @@ void CGraphics::SetFog(ERglFogMode mode, float startz, float endz, const zeus::C if (mode == ERglFogMode::None) { g_Fog.m_start = 4096.f; + g_Fog.m_rangeScale = 1.f; } else { diff --git a/amuse b/amuse index c886bfd7d..eb948dfd6 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit c886bfd7d2e7ef0d397db469160cbce3e29484ee +Subproject commit eb948dfd63236cceaf4055c032fa7f88c8fa4955 diff --git a/hecl b/hecl index 9a4781eb6..389c6a2e3 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 9a4781eb6c763ba412e432806990694235d5fb48 +Subproject commit 389c6a2e3d7aaffc132c7d027af8eb17873433ed diff --git a/specter b/specter index 1410e7656..ac2ebd549 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 1410e76566910b2436d1588f6976470684d57e33 +Subproject commit ac2ebd5499cfcdb6183c7fa26618555575f9b9c6