First draft of prop object type

Author: MjnMixael

code/globalincs/globals.h

@@ -34,6 +34,9 @@
 #define MAX_SHIPS					500		// max number of ship instances there can be.DTP; bumped from 200 to 400, then to 500 in 2022
 #define SHIPS_LIMIT					500		// what MAX_SHIPS will be at release time (for error checking in debug mode); dtp Bumped from 200 to 400, then to 500 in 2022
 
+// from prop.h
+#define MAX_PROPS               200 // Arbitrary guess
+
 // from missionparse.h and then redefined to the same value in sexp.h
 #define TOKEN_LENGTH	32
 

code/graphics/shadows.cpp

@@ -509,6 +509,7 @@ void shadows_render_all(fov_t fov, matrix *eye_orient, vec3d *eye_pos)
 		switch(objp->type)
 		{
 		case OBJ_RAW_POF:
+		case OBJ_PROP:
 		case OBJ_SHIP:
 			{
 				obj_queue_render(objp, &scene);

code/mission/missionparse.cpp

@@ -64,6 +64,7 @@
 #include "parse/generic_log.h"
 #include "parse/parselo.h"
 #include "parse/sexp_container.h"
+#include "prop/prop.h"
 #include "scripting/global_hooks.h"
 #include "scripting/hook_api.h"
 #include "scripting/hook_conditions.h"
@@ -140,6 +141,9 @@ p_object Ship_arrival_list;	// for linked list of ships to arrive later
 // all the ships that we parse
 SCP_vector<p_object> Parse_objects;
 
+// all the props that we parse
+SCP_vector<parsed_prop> Parse_props;
+
 
 // list for arriving support ship
 p_object	Support_ship_pobj;
@@ -4934,17 +4938,50 @@ void parse_wing(mission *pm)
 	// Goober5000 - wing creation stuff moved to post_process_ships_wings
 }
 
+void parse_prop(mission* pm)
+{
+	parsed_prop prop;
+	required_string("$Name:");
+	stuff_string(prop.name, F_NAME, NAME_LENGTH);
+
+	// Maybe do this by name instead?
+	required_string("$Class:");
+	stuff_int(&prop.prop_info_index);
+
+	required_string("$Location:");
+	stuff_vec3d(&prop.position);
+
+	required_string("$Orientation:");
+	stuff_matrix(&prop.orientation);
+
+	Parse_props.emplace_back(prop);
+}
+
 void parse_wings(mission* pm)
 {
 	required_string("#Wings");
-	while (required_string_either("#Events", "$Name:"))
-	{
+	while (true) {
+		int which = required_string_one_of(3, "#Events", "#Props", "$Name:");
+
+		if (which == -1 || which == 0 || which == 1) // #Events or #Props
+			break;
+
 		Assert(Num_wings < MAX_WINGS);
 		parse_wing(pm);
 		Num_wings++;
 	}
 }
 
+void parse_props(mission* pm)
+{
+	if (optional_string("#Props")) {
+		while (required_string_either("#Events", "$Name:")) {
+			Assert(Parse_props.size() < MAX_PROPS);
+			parse_prop(pm);
+		}
+	}
+}
+
 // Goober5000
 void resolve_path_masks(int anchor, int *path_mask)
 {
@@ -5023,6 +5060,15 @@ void post_process_path_stuff()
 	}
 }
 
+// MjnMixael
+void post_process_props()
+{
+	for (int i = 0; i < static_cast<int>(Parse_props.size()); i++) {
+		parsed_prop* propp = &Parse_props[i];
+		prop_create(&propp->orientation, &propp->position, propp->prop_info_index, propp->name);
+	}
+}
+
 // Goober5000
 void post_process_ships_wings()
 {
@@ -5147,7 +5193,6 @@ void post_process_ships_wings()
 		mission_parse_maybe_create_parse_object(&p_obj);
 	}
 
-
 	// ----------------- at this point the ships have been created -----------------
 	// Now set up the wings.  This must be done after both dock stuff and ship stuff.
 
@@ -6298,6 +6343,7 @@ bool parse_mission(mission *pm, int flags)
 	parse_player_info(pm);
 	parse_objects(pm, flags);
 	parse_wings(pm);
+	parse_props(pm);
 	parse_events(pm);
 	parse_goals(pm);
 	parse_waypoints_and_jumpnodes(pm);
@@ -6383,6 +6429,8 @@ bool post_process_mission(mission *pm)
 	ship_weapon	*swp;
 	ship_obj *so;
 
+	post_process_props();
+
 	// Goober5000 - this must be done even before post_process_ships_wings because it is a prerequisite
 	ship_clear_ship_type_counts();
 
@@ -6844,6 +6892,7 @@ void mission_init(mission *pm)
 
 	jumpnode_level_close();
 	waypoint_level_close();
+	props_level_close();
 
 	red_alert_invalidate_timestamp();
 	event_music_reset_choices();
@@ -6875,6 +6924,8 @@ void mission_init(mission *pm)
 
 	Num_reinforcements = 0;
 
+	Parse_props.clear();
+
 	Asteroid_field.num_initial_asteroids = 0;
 
 	// This could be set with a sexp, so we should reset it here

code/model/animation/modelanimation_driver.cpp

@@ -98,6 +98,7 @@ namespace animation {
 		}
 	}
 
+	// ADD PROP HERE
 	template<typename property, property ship::* property_ptr, float property::* subproperty_ptr>
 	static float get_ship_subproperty_float(polymodel_instance* pmi){
 		int objnum = get_pmi_objnum(pmi);

code/model/modelread.cpp

@@ -4925,6 +4925,7 @@ void model_get_moving_submodel_list(SCP_vector<int> &submodel_vector, const obje
 
 	int model_instance_num;
 	int model_num;
+	// ADD PROP HERE
 	if (objp->type == OBJ_SHIP) {
 		model_instance_num = Ships[objp->instance].model_instance_num;
 		model_num = Ship_info[Ships[objp->instance].ship_info_index].model_num;

code/model/modelrender.cpp

@@ -1327,6 +1327,7 @@ int model_render_determine_elapsed_time(int objnum, uint64_t flags)
 	if ( objnum >= 0 ) {
 		object *objp = &Objects[objnum];
 
+		// ADD PROP HERE
 		if ( objp->type == OBJ_SHIP ) {
 			return timestamp_since(Ships[objp->instance].base_texture_anim_timestamp);
 		}
@@ -1923,6 +1924,7 @@ void model_render_set_glow_points(const polymodel *pm, int objnum)
 	if ( objnum > -1 ) {
 		object *objp = &Objects[objnum];
 
+		// ADD PROP HERE
 		if ( objp != NULL && objp->type == OBJ_SHIP ) {
 			shipp = &Ships[Objects[objnum].instance];
 			sip = &Ship_info[shipp->ship_info_index];
@@ -2607,6 +2609,7 @@ void model_render_queue(const model_render_params* interp, model_draw_list* scen
 		objp = &Objects[objnum];
 		int tentative_num = -1;
 
+		// ADD PROP HERE
 		if (objp->type == OBJ_SHIP) {
 			shipp = &Ships[objp->instance];
 			tentative_num = shipp->model_instance_num;
@@ -2925,6 +2928,7 @@ void model_render_only_glowpoint_lights(const model_render_params* interp, int m
 		objp = &Objects[objnum];
 		int tentative_num = -1;
 
+		// ADD PROP HERE
 		if (objp->type == OBJ_SHIP) {
 			shipp = &Ships[objp->instance];
 			tentative_num = shipp->model_instance_num;

code/nebula/neb.cpp

@@ -678,6 +678,7 @@ int neb2_skip_render(object *objp, float z_depth)
 
 		// any ship or raw pof less than 3% visible at their closest point
 		case OBJ_RAW_POF:
+		case OBJ_PROP:
 		case OBJ_SHIP:
 			if (fog < 0.03f)
 				return 1;
@@ -713,6 +714,8 @@ float neb2_get_lod_scale(int objnum)
 	ship *shipp;
 	ship_info *sip;
 
+	// ADD PROP HERE
+
 	// bogus
 	if ( (objnum < 0) 
 		|| (objnum >= MAX_OBJECTS) 
@@ -1094,6 +1097,7 @@ void neb2_get_fog_values(float *fnear, float *ffar, object *objp)
 		return;
 	}
 
+	// ADD PROP HERE
 	// determine what fog index to use
 	if(objp->type == OBJ_SHIP) {
 		Assert((objp->instance >= 0) && (objp->instance < MAX_SHIPS));

code/object/collidedebrisship.cpp

@@ -23,6 +23,8 @@
 #include "ship/ship.h"
 #include "ship/shiphit.h"
 
+// Need a version of this for PROPS
+
 
 void calculate_ship_ship_collision_physics(collision_info_struct *ship_ship_hit_info);
 

code/object/collidepropdebris.cpp

@@ -0,0 +1 @@
+// STUB

code/object/collidepropship.cpp

@@ -0,0 +1 @@
+//STUB