Skip to content

Commit

Permalink
test_world scenery update
Browse files Browse the repository at this point in the history
- adds 3 new terrain plots whose one vertically translated and one with partial liquid surface
- adds a 'Humans test' location
  • Loading branch information
jmbau authored and hsanjuan committed Oct 9, 2023
1 parent 1da0bd6 commit 66b1d20
Show file tree
Hide file tree
Showing 9 changed files with 108 additions and 5 deletions.
11 changes: 11 additions & 0 deletions data/objects/test_world/plot03.3d
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
begin_header
texture_load plot03_tex textures/test_world/plot03.tex
end_header

range 4000

begin_model standard
color 1.0 1.0 1.0 1.0
texture_select plot03_tex
heightfield_load textures/test_world/plot03.hf 600 400 155.563 0 0 0 0 0 0
end_model standard
13 changes: 13 additions & 0 deletions data/objects/test_world/plot04.3d
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
begin_header
# Note: as in plot04.tex lava lake area is at least 1% transparent,
# it will be detected as a liquid surface.
texture_load plot04_tex textures/test_world/plot04.tex
end_header

range 4000

begin_model standard
color 1.0 1.0 1.0 1.0
texture_select plot04_tex
heightfield_load textures/test_world/plot04.hf 600 600 170.875 0 0 0 0 0 0
end_model standard
11 changes: 11 additions & 0 deletions data/objects/test_world/plot05.3d
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
begin_header
texture_load plot03_tex textures/test_world/plot03.tex
end_header

range 4000

begin_model standard
color 1.0 1.0 1.0 1.0
texture_select plot03_tex
heightfield_load textures/test_world/plot05.hf 400 400 100 0 0 0 0 0 0
end_model standard
78 changes: 73 additions & 5 deletions data/scenery/test_world.scn
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ scene_ground_tile 1000 1000 10000 0.22 0.36 0.53 1.0 water01_tex
# object names to match beginning location).
#

# x y z h p b name
register_location -10.92 -289.42 36.0 30 0 0 CG Cutter
#register_location -332.93 3320.24 0.0 170 0 0 Runway 17

# x(m) y(m) z(ft) h p b name
register_location -10.92 -289.42 36.0 30 0 0 CG Cutter
register_location -332.93 3320.24 0.0 170 0 0 Runway 17
register_location 454.0 276.0 5.0 180.0 0 0 Humans test

# #####################################################################
# Begin loading base objects
Expand All @@ -69,6 +69,18 @@ register_location -10.92 -289.42 36.0 30 0 0 CG Cutter
#translation -200 50 0
#rotate 315 0 0

# 3 plots height field
# Note that "plot04.3d" ground object is translated 328.084ft (100m) up.
create_object 6
model_file objects/test_world/plot03.3d
translation 600 300 0
create_object 6
model_file objects/test_world/plot04.3d
translation 600 -200 328.084
create_object 6
model_file objects/test_world/plot05.3d
translation 100 300 0


# #####################################################################
# Begin loading other objects
Expand Down Expand Up @@ -160,7 +172,7 @@ translation 48 -190 0
set_human_mesg_enter Thanks for saving me!

# Human type_name flags
create_human default need_rescue alert aware in_water
create_human boy_2 need_rescue alert aware in_water
translation 35 -200 0
set_human_mesg_enter Thanks for saving me!

Expand All @@ -176,3 +188,59 @@ create_human default need_rescue alert aware
translation 109.0 -52.5 86.0
set_human_mesg_enter Thanks for the lift!
human_reference player run_towards


# "main human" preset name | flag(s) | assist. human(s) + assistant preset name(s) | flag(s)
# | | number (0 to 4) |
create_human woman_1 need_rescue assisted 3 woman_1 boy_1 bad_name on_stretcher lying
translation 450.5 260 0
rotate 40 0 0

create_human boy_1 need_rescue sit_down on_stretcher assisted 2 assistant_1 woman_1
translation 453.5 260 0
rotate -10 0 0

create_human baby_1 alert
translation 455.2 260 0
rotate 0 0 0

create_human girl_1 need_rescue
translation 456.0 260 0
rotate 0 0 0

create_human boy_1
translation 456.3 260 0
rotate 0 0 0

create_human woman_1 need_rescue
translation 457.4 260 1.0
rotate 85 0 0

create_human woman_2 need_rescue
translation 457.9 260 1.0
rotate -85 0 0
create_object 1

create_human man_1
translation 459.0 260.0 1.0
rotate -19 0 0

create_human baby_1 sitting
translation 459.3 260 7.0
rotate -18 0 0

create_human man_2
object_name Bald_man
translation 460.0 260 1.0
rotate 0 0 0

create_human default
translation 461.0 260 1.0
rotate -20 0 0

# Only the "main human" -i.e. woman_2, who runs in the middle of the group- will board. Assistants never board.
create_human woman_2 aware assisted 4 man_1 default man_2 assistant_1
translation 442 244 0
rotate 0 0 0
human_reference player run_towards
set_human_message_enter I'm the only one passenger, my bodyguards don't come with me...
Binary file added data/textures/test_world/plot03.hf
Binary file not shown.
Binary file added data/textures/test_world/plot03.tex
Binary file not shown.
Binary file added data/textures/test_world/plot04.hf
Binary file not shown.
Binary file added data/textures/test_world/plot04.tex
Binary file not shown.
Binary file added data/textures/test_world/plot05.hf
Binary file not shown.

0 comments on commit 66b1d20

Please sign in to comment.