maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix ocean pass

Browse source
This commit is contained in:
Lubos Lenco 2017-09-19 11:29:01 +02:00
parent 0225ad2601
commit 51eac232fe
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
blender/arm/exporter.py
View file

@ -2786,7 +2786,7 @@ class ArmoryExporter:
export_object = False
rdpat = arm.utils.get_rp()
wrd = bpy.data.worlds['Arm']
rdpat.arm_ocean = True
rdpat.rp_ocean = True
# Take position and bounds
wrd.arm_ocean_level = 0.0#bobject.location.z

1
blender/arm/props_renderpath.py
View file

@ -144,7 +144,6 @@ class ArmRPListItem(bpy.types.PropertyGroup):
('512', '512', '512')],
name="Resolution", description="3D texture resolution", default='128', update=update_renderpath)
arm_clouds = bpy.props.BoolProperty(name="Clouds", default=False, update=assets.invalidate_shader_cache)
arm_ocean = bpy.props.BoolProperty(name="Ocean", default=False, update=assets.invalidate_shader_cache)
arm_pcss_state = EnumProperty(
items=[('On', 'On', 'On'),
('Off', 'Off', 'Off'),

2
blender/arm/write_data.py
View file

@ -324,7 +324,7 @@ const float cloudsSecondary = """ + str(round(wrd.arm_clouds_secondary * 100) /
const float cloudsPrecipitation = """ + str(round(wrd.arm_clouds_precipitation * 100) / 100) + """;
const float cloudsEccentricity = """ + str(round(wrd.arm_clouds_eccentricity * 100) / 100) + """;
""")
if rpdat.arm_ocean:
if rpdat.rp_ocean:
f.write(
"""const float seaLevel = """ + str(round(wrd.arm_ocean_level * 100) / 100) + """;
const float seaMaxAmplitude = """ + str(round(wrd.arm_ocean_amplitude * 100) / 100) + """;