AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Phillip Stephens 2016-12-09 18:36:20 -08:00
parent 5793c8df87 b3debc0dbe
commit 0dc6729144
7 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -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::SpecEntMP3);
hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3PC);") hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3PC);")
add_subdirectory(hecl) 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}) add_definitions(${BOO_SYS_DEFINES})
include_directories(${BOO_SYS_INCLUDES}) include_directories(${BOO_SYS_INCLUDES})
add_subdirectory(amuse) add_subdirectory(amuse)

2
Editor/ViewManager.cpp
View File

@ -333,7 +333,7 @@ void ViewManager::init(boo::IApplication* app)
m_mainWindow->showWindow(); m_mainWindow->showWindow();
m_mainWindow->setWaitCursor(true); m_mainWindow->setWaitCursor(true);
float pixelFactor = 1.0; float pixelFactor = m_mainWindow->getVirtualPixelFactor();
m_mainBooFactory = m_mainWindow->getMainContextDataFactory(); m_mainBooFactory = m_mainWindow->getMainContextDataFactory();
m_mainPlatformName = m_mainBooFactory->platformName(); m_mainPlatformName = m_mainBooFactory->platformName();

1
Editor/icons/CMakeLists.txt
View File

@ -12,6 +12,7 @@ if(WIN32)
"$ENV{ProgramW6432}/Inkscape" "$ENV{ProgramW6432}/Inkscape"
"$ENV{PROGRAMFILES(X86)}/Inkscape") "$ENV{PROGRAMFILES(X86)}/Inkscape")
else() else()
set(CMAKE_FIND_APPBUNDLE FIRST)
find_program(INKSCAPE_BIN inkscape) find_program(INKSCAPE_BIN inkscape)
endif() endif()
if(INKSCAPE_BIN STREQUAL "INKSCAPE_BIN-NOTFOUND") if(INKSCAPE_BIN STREQUAL "INKSCAPE_BIN-NOTFOUND")

1
Runtime/Graphics/CGraphics.cpp
View File

@ -71,6 +71,7 @@ void CGraphics::SetFog(ERglFogMode mode, float startz, float endz, const zeus::C
if (mode == ERglFogMode::None) if (mode == ERglFogMode::None)
{ {
g_Fog.m_start = 4096.f; g_Fog.m_start = 4096.f;
g_Fog.m_rangeScale = 1.f;
} }
else else
{ {

2
amuse

@ -1 +1 @@
Subproject commit c886bfd7d2e7ef0d397db469160cbce3e29484ee Subproject commit eb948dfd63236cceaf4055c032fa7f88c8fa4955

2
hecl

@ -1 +1 @@
Subproject commit 9a4781eb6c763ba412e432806990694235d5fb48 Subproject commit 389c6a2e3d7aaffc132c7d027af8eb17873433ed

2
specter

@ -1 +1 @@
Subproject commit 1410e76566910b2436d1588f6976470684d57e33 Subproject commit ac2ebd5499cfcdb6183c7fa26618555575f9b9c6