FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #184 from hwiesmann/master

Browse Source 
BUG FIX - Wrong calculation of terrain normals in GeometryTechnique
This commit is contained in:
OpenSceneGraph git repository
2017-01-04 13:22:22 +00:00
committed by GitHub
parent b5c4f461bc 192dcec5f9
commit 3cccdaddab
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgTerrain/GeometryTechnique.cpp
View File

@@ -329,11 +329,11 @@ class VertexNormalGenerator
osg::Vec3 zero(0.0f,0.0f,0.0f);
if (left_valid)
{
dx = center-left;
dx += center-left;
}
if (right_valid)
{
dx = right-center;
dx += right-center;
}
if (bottom_valid)
{

7
src/osgViewer/DarwinUtils.mm
View File

@@ -366,7 +366,8 @@ void MenubarController::update()
/** Helper method to get a double value out of a CFDictionary */
static double getDictDouble (CFDictionaryRef refDict, CFStringRef key)
#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060)
static double getDictDouble (CFDictionaryRef refDict, CFStringRef key)
{
double value;
CFNumberRef number_value = (CFNumberRef) CFDictionaryGetValue(refDict, key);
@@ -376,7 +377,7 @@ static double getDictDouble (CFDictionaryRef refDict, CFStringRef key)
return -1; // fail
return value; // otherwise return the long value
}
/** Helper method to get a long value out of a CFDictionary */
static long getDictLong(CFDictionaryRef refDict, CFStringRef key) // const void* key?
{
@@ -388,7 +389,7 @@ static long getDictLong(CFDictionaryRef refDict, CFStringRef key) // cons
return -1; // fail
return value;
}
#endif
/** ctor, get a list of all attached displays */