izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

SpeedTree: eliminate some clang warnings.

Browse Source 
- Also marked a dubious place in code which is still producing a warning.

[CL 2479343 by Dmitry Rekman in Main branch]
This commit is contained in:
Dmitry Rekman
2015-03-13 18:13:56 -04:00
parent 05b1bc20fc
commit 882c6b7bd8
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Source/ThirdParty/SpeedTree/SpeedTreeSDK-v7.0/Include/Core/RenderState_inl.h vendored
View File

@@ -49,7 +49,6 @@ ST_INLINE SRenderState::SRenderState( ) :
m_bFadeToBillboard(true),
m_bVertBillboard(false),
m_bHorzBillboard(false),
m_eHueVariation(EFFECT_OFF),
// render states
m_eShaderGenerationMode(SHADER_GEN_MODE_STANDARD),
m_bUsedAsGrass(false),
@@ -57,6 +56,7 @@ ST_INLINE SRenderState::SRenderState( ) :
m_bBlending(false),
// image-based ambient lighting
m_eAmbientImageLighting(EFFECT_OFF),
m_eHueVariation(EFFECT_OFF),
// fog
m_eFogCurve(FOG_CURVE_NONE),
m_eFogColorStyle(FOG_COLOR_TYPE_CONSTANT),

1
Engine/Source/ThirdParty/SpeedTree/SpeedTreeSDK-v7.0/Source/Core/Source/Parser.cpp vendored
View File

@@ -770,6 +770,7 @@ void SwapEndianStringPtr(CStringPtr& cStringPtr)
#endif
SwapEndian4Bytes<st_uint32>(uiPtrConvert);
// @fixme: this looks fishy (converting uint32 to a 64-bit pointer)
cStringPtr = (const char*) uiPtrConvert;
}

22
Engine/Source/ThirdParty/SpeedTree/SpeedTreeSDK-v7.0/Source/Core/Source/Wind.cpp vendored
View File

@@ -76,23 +76,23 @@ CWind::SParams::SParams( ) :
m_fGlobalHeightExponent(2.0f),
m_fFrondRippleTile(10.0f),
m_fFrondRippleLightingScalar(1.0f),
m_fRollingNoiseSize(0.005f),
m_fRollingNoiseTwist(9.0f),
m_fRollingNoiseTurbulence(32.0f),
m_fRollingNoisePeriod(0.4f),
m_fRollingNoiseSpeed(0.05f),
m_fRollingBranchFieldMin(0.5f),
m_fRollingBranchLightingAdjust(0.5f),
m_fRollingBranchVerticalOffset(-0.5f),
m_fRollingLeafRippleMin(0.5f),
m_fRollingLeafTumbleMin(0.5f),
m_fGustFrequency(0.0f),
m_fGustStrengthMin(0.5f),
m_fGustStrengthMax(1.0f),
m_fGustDurationMin(1.0f),
m_fGustDurationMax(4.0f),
m_fGustRiseScalar(1.0f),
m_fGustFallScalar(1.0f),
m_fRollingNoiseSize(0.005f),
m_fRollingNoiseTwist(9.0f),
m_fRollingNoiseTurbulence(32.0f),
m_fRollingNoisePeriod(0.4f),
m_fRollingNoiseSpeed(0.05f),
m_fRollingLeafRippleMin(0.5f),
m_fRollingLeafTumbleMin(0.5f),
m_fRollingBranchFieldMin(0.5f),
m_fRollingBranchLightingAdjust(0.5f),
m_fRollingBranchVerticalOffset(-0.5f)
m_fGustFallScalar(1.0f)
{
for (st_int32 i = 0; i < CWind::NUM_OSC_COMPONENTS; ++i)
for (st_int32 j = 0; j < c_nNumWindPointsInCurves; ++j)