diff options
| author | Jason Maskell <[email protected]> | 2016-05-12 13:51:01 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-12 13:51:01 +0200 |
| commit | 3f13a04cda58b8cb6b3ae76ea663443611752a38 (patch) | |
| tree | b655d905a336dfe0722ddc8582f049875f8f6d3d /src | |
| parent | Restructuring starts. Got some initial CMake problems sorted. Need to extend. (diff) | |
| download | waveworks_archive-3f13a04cda58b8cb6b3ae76ea663443611752a38.tar.xz waveworks_archive-3f13a04cda58b8cb6b3ae76ea663443611752a38.zip | |
Project now compiles with Cmake.
Modified FindDirectX to use the Windows SDK more, and added support for getting dxguid.lib
Diffstat (limited to 'src')
| -rw-r--r-- | src/Entrypoints.cpp | 5 | ||||
| -rw-r--r-- | src/Quadtree.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Entrypoints.cpp b/src/Entrypoints.cpp index ad94648..996fe55 100644 --- a/src/Entrypoints.cpp +++ b/src/Entrypoints.cpp @@ -431,8 +431,9 @@ const char* GFSDK_WAVEWORKS_CALL_CONV GFSDK_WaveWorks_GetBuildString() #elif defined(TARGET_PLATFORM_ANDROID) return "ANDROID_TEST"; // TIMT: TODO!!! -#else - extern const char* kNVWaveWorks_build_string; +#else + //TODO: Fix this build string thing. + const char* kNVWaveWorks_build_string = "FixBuildString!"; return kNVWaveWorks_build_string; #endif } diff --git a/src/Quadtree.cpp b/src/Quadtree.cpp index 2ee2d76..daa7d23 100644 --- a/src/Quadtree.cpp +++ b/src/Quadtree.cpp @@ -1169,7 +1169,7 @@ int GFSDK_WaveWorks_Quadtree::buildNodeList( QuadNode& quad_node, // Estimate the min grid coverage float min_coverage = estimateGridCoverage(quad_node, m_params, matProj, NumPixelsInViewport, eyePoint); - float geomorphing_degree = max(0.f,min(m_params.geomorphing_degree,1.f)); + //float geomorphing_degree = max(0.f,min(m_params.geomorphing_degree,1.f)); // Recursively attatch sub-nodes. bool visible = true; |