Use forward-declaration header for robot.h

This commit is contained in:
Kp 2022-07-09 13:39:29 +00:00
parent d6c43f56af
commit e5425a00f3
3 changed files with 113 additions and 62 deletions

108
common/main/fwd-robot.h Normal file
View file

@ -0,0 +1,108 @@
/*
* Portions of this file are copyright Rebirth contributors and licensed as
* described in COPYING.txt.
* Portions of this file are copyright Parallax Software and licensed
* according to the Parallax license below.
* See COPYING.txt for license details.
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*/
#pragma once
#include "dsx-ns.h"
#include "fwd-object.h"
#include "fwd-weapon.h"
#include "polyobj.h"
#include "vecmat.h"
#include <cstddef>
#include <physfs.h>
#include <type_traits>
namespace dcx {
constexpr std::integral_constant<std::size_t, 8> MAX_GUNS{}; //should be multiple of 4 for ubyte array
//Animation states
#define AS_REST 0
#define AS_ALERT 1
#define AS_FIRE 2
#define AS_RECOIL 3
#define AS_FLINCH 4
#define N_ANIM_STATES 5
#define RI_CLOAKED_ALWAYS 1
struct jointpos;
struct jointlist;
constexpr std::integral_constant<unsigned, 16> ROBOT_NAME_LENGTH{};
struct d_level_shared_robot_joint_state;
}
#ifdef dsx
namespace dsx {
#if defined(DXX_BUILD_DESCENT_II)
//robot info flags
#define RIF_BIG_RADIUS 1 //pad the radius to fix robots firing through walls
#define RIF_THIEF 2 //this guy steals!
#endif
// Robot information
struct robot_info;
#if defined(DXX_BUILD_DESCENT_I)
// maximum number of robot types
constexpr std::integral_constant<unsigned, 30> MAX_ROBOT_TYPES{};
constexpr std::integral_constant<unsigned, 600> MAX_ROBOT_JOINTS{};
#elif defined(DXX_BUILD_DESCENT_II)
// maximum number of robot types
constexpr std::integral_constant<unsigned, 85> MAX_ROBOT_TYPES{};
constexpr std::integral_constant<unsigned, 1600> MAX_ROBOT_JOINTS{};
#endif
using d_robot_info_array = std::array<robot_info, MAX_ROBOT_TYPES>;
//the array of robots types
struct d_level_shared_robot_info_state;
extern d_level_shared_robot_info_state LevelSharedRobotInfoState;
#if DXX_USE_EDITOR
using robot_names_array = std::array<std::array<char, ROBOT_NAME_LENGTH>, MAX_ROBOT_TYPES>;
extern robot_names_array Robot_names;
#endif
/* Robot joints can be customized by hxm files, which are per-level.
*/
struct d_level_shared_robot_joint_state;
extern d_level_shared_robot_joint_state LevelSharedRobotJointState;
//given an object and a gun number, return position in 3-space of gun
//fills in gun_point
void calc_gun_point(vms_vector &gun_point, const object_base &obj, unsigned gun_num);
/*
* reads n robot_info structs from a PHYSFS_File
*/
void robot_info_read(PHYSFS_File *fp, robot_info &r);
void robot_set_angles(robot_info *r,polymodel *pm, std::array<std::array<vms_angvec, MAX_SUBMODELS>, N_ANIM_STATES> &angs);
weapon_id_type get_robot_weapon(const robot_info &ri, const unsigned gun_num);
}
#endif
/*
* reads n jointpos structs from a PHYSFS_File
*/
void jointpos_read(PHYSFS_File *fp, jointpos &jp);

View file

@ -25,31 +25,17 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#pragma once
#include "vecmat.h"
#include "fwd-robot.h"
#include "game.h"
#ifdef __cplusplus
#include "pack.h"
#include "aistruct.h"
#include "polyobj.h"
#include "weapon_id.h"
#include "object.h"
#include "fwd-partial_range.h"
#include "d_array.h"
#include "digi.h"
#define MAX_GUNS 8 //should be multiple of 4 for ubyte array
//Animation states
#define AS_REST 0
#define AS_ALERT 1
#define AS_FIRE 2
#define AS_RECOIL 3
#define AS_FLINCH 4
#define N_ANIM_STATES 5
#define RI_CLOAKED_ALWAYS 1
namespace dcx {
//describes the position of a certain joint
@ -66,21 +52,16 @@ struct jointlist
short offset;
};
constexpr std::integral_constant<unsigned, 16> ROBOT_NAME_LENGTH{};
struct d_level_shared_robot_joint_state {
unsigned N_robot_joints;
};
}
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
#ifdef dsx
constexpr auto weapon_none = weapon_id_type::unspecified;
namespace dsx {
#if defined(DXX_BUILD_DESCENT_II)
//robot info flags
#define RIF_BIG_RADIUS 1 //pad the radius to fix robots firing through walls
#define RIF_THIEF 2 //this guy steals!
#endif
// Robot information
struct robot_info : prohibit_void_ptr<robot_info>
@ -161,18 +142,9 @@ struct robot_info : prohibit_void_ptr<robot_info>
void attempt_to_steal_item(vmobjptridx_t objp, const robot_info &robptr, object &playerobjp);
#endif
}
constexpr auto weapon_none = weapon_id_type::unspecified;
namespace dsx {
imobjptridx_t robot_create(unsigned id, vmsegptridx_t segnum, const vms_vector &pos, const vms_matrix *orient, fix size, ai_behavior behavior, const imsegidx_t hide_segment = segment_none);
#if defined(DXX_BUILD_DESCENT_I)
// maximum number of robot types
constexpr std::integral_constant<unsigned, 30> MAX_ROBOT_TYPES{};
constexpr std::integral_constant<unsigned, 600> MAX_ROBOT_JOINTS{};
static inline int robot_is_companion(const robot_info &)
{
return 0;
@ -183,10 +155,6 @@ static inline int robot_is_thief(const robot_info &)
return 0;
}
#elif defined(DXX_BUILD_DESCENT_II)
// maximum number of robot types
constexpr std::integral_constant<unsigned, 85> MAX_ROBOT_TYPES{};
constexpr std::integral_constant<unsigned, 1600> MAX_ROBOT_JOINTS{};
static inline int robot_is_companion(const robot_info &robptr)
{
return robptr.companion;
@ -198,8 +166,6 @@ static inline int robot_is_thief(const robot_info &robptr)
}
#endif
using d_robot_info_array = std::array<robot_info, MAX_ROBOT_TYPES>;
//the array of robots types
struct d_level_shared_robot_info_state
{
@ -209,18 +175,11 @@ struct d_level_shared_robot_info_state
d_robot_info_array Robot_info;
};
extern d_level_shared_robot_info_state LevelSharedRobotInfoState;
#if defined(DXX_BUILD_DESCENT_II)
// returns ptr to escort robot, or NULL
imobjptridx_t find_escort(fvmobjptridx &vmobjptridx, const d_robot_info_array &Robot_info);
#endif
#if DXX_USE_EDITOR
using robot_names_array = std::array<std::array<char, ROBOT_NAME_LENGTH>, MAX_ROBOT_TYPES>;
extern robot_names_array Robot_names;
#endif
/* Robot joints can be customized by hxm files, which are per-level.
*/
struct d_level_shared_robot_joint_state : ::dcx::d_level_shared_robot_joint_state
@ -229,14 +188,6 @@ struct d_level_shared_robot_joint_state : ::dcx::d_level_shared_robot_joint_stat
std::array<jointpos, MAX_ROBOT_JOINTS> Robot_joints;
};
extern d_level_shared_robot_joint_state LevelSharedRobotJointState;
}
namespace dsx {
//given an object and a gun number, return position in 3-space of gun
//fills in gun_point
void calc_gun_point(vms_vector &gun_point, const object_base &obj, unsigned gun_num);
// Tells joint positions for a gun to be in a specified state.
// A gun can have associated with it any number of joints. In order to tell whether a gun is a certain
// state (such as FIRE or ALERT), you should call this function and check the returned joint positions
@ -261,21 +212,14 @@ partial_range_t<const jointpos *> robot_get_anim_state(const d_robot_info_array
/*
* reads n robot_info structs from a PHYSFS_File
*/
void robot_info_read(PHYSFS_File *fp, robot_info &r);
}
#endif
/*
* reads n jointpos structs from a PHYSFS_File
*/
void jointpos_read(PHYSFS_File *fp, jointpos &jp);
#if 0
void jointpos_write(PHYSFS_File *fp, const jointpos &jp);
#endif
#ifdef dsx
namespace dsx {
void robot_set_angles(robot_info *r,polymodel *pm, std::array<std::array<vms_angvec, MAX_SUBMODELS>, N_ANIM_STATES> &angs);
weapon_id_type get_robot_weapon(const robot_info &ri, const unsigned gun_num);
static inline void boss_link_see_sound(const vcobjptridx_t objp)
{
@ -289,5 +233,3 @@ static inline void boss_link_see_sound(const vcobjptridx_t objp)
}
}
#endif
#endif

View file

@ -9,6 +9,7 @@
#pragma once
#include <cstdint>
#include "dsx-ns.h"
#ifdef dsx
namespace dsx {