Skip to content

Commit 0b5b172

Browse files
committed
Fixed #1168.
1 parent 2888e61 commit 0b5b172

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

Nu/Nu/OpenGL/OpenGL.PhysicallyBased.fs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3757,7 +3757,6 @@ module PhysicallyBased =
37573757
lightShadowSampleScalar : single,
37583758
lightShadowExponent : single,
37593759
lightShadowDensity : single,
3760-
elementsCount : int,
37613760
materials : PhysicallyBasedMaterial array,
37623761
geometry : PhysicallyBasedGeometry,
37633762
shader : PhysicallyBasedDeferredTerrainShader,
@@ -3833,7 +3832,7 @@ module PhysicallyBased =
38333832
Hl.Assert ()
38343833

38353834
// draw geometry
3836-
Gl.DrawElements (geometry.PrimitiveType, elementsCount, DrawElementsType.UnsignedInt, nativeint 0)
3835+
Gl.DrawElements (geometry.PrimitiveType, geometry.ElementCount, DrawElementsType.UnsignedInt, nativeint 0)
38373836
Hl.ReportDrawCall 1
38383837
Hl.Assert ()
38393838

Nu/Nu/Render/Renderer3d.fs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3102,9 +3102,7 @@ type [<ReferenceEquality>] GlRenderer3d =
31023102
static member private renderPhysicallyBasedTerrain
31033103
viewArray projectionArray viewProjectionArray eyeCenter
31043104
lightShadowSamples lightShadowBias lightShadowSampleScalar lightShadowExponent lightShadowDensity
3105-
terrainDescriptor geometry shader vao renderer =
3106-
let (resolutionX, resolutionY) = Option.defaultValue (0, 0) (GlRenderer3d.tryGetHeightMapResolution terrainDescriptor.HeightMap renderer)
3107-
let elementsCount = dec resolutionX * dec resolutionY * 6
3105+
(terrainDescriptor : TerrainDescriptor) geometry shader vao renderer =
31083106
let terrainMaterialProperties = terrainDescriptor.MaterialProperties
31093107
let materialProperties : OpenGL.PhysicallyBased.PhysicallyBasedMaterialProperties =
31103108
{ Albedo = Option.defaultValue Constants.Render.AlbedoDefault terrainMaterialProperties.AlbedoOpt
@@ -3221,7 +3219,7 @@ type [<ReferenceEquality>] GlRenderer3d =
32213219
OpenGL.PhysicallyBased.DrawPhysicallyBasedTerrain
32223220
(viewArray, projectionArray, viewProjectionArray, eyeCenter,
32233221
instanceFields, lightShadowSamples, lightShadowBias, lightShadowSampleScalar, lightShadowExponent, lightShadowDensity,
3224-
elementsCount, materials, geometry, shader, vao)
3222+
materials, geometry, shader, vao)
32253223

32263224
static member private renderShadow
32273225
lightOrigin

0 commit comments

Comments
 (0)