mirrors/IPUDOOM
1
0
Fork 0
mirror of https://github.com/jndean/IPUDOOM.git synced 2026-03-22 07:29:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

IPU enters and exits automap state on keypress

Browse Source
This commit is contained in:
jndean
2022-09-02 20:24:31 +00:00
parent 0ff7a84338
commit b07f036aa2
9 changed files with 551 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -10,6 +10,7 @@ IPU_OBJ = $(addprefix build/ipu_obj/, \
g_game_codelets.gp \
am_map.gp \
m_fixed.gp \
m_controls.gp \
p_setup.gp \
p_setup_codelets.gp \
p_tick.gp \

1
src/am_map.c
View File

@@ -507,7 +507,6 @@ void AM_Start(void) {
stopped = false;
if (lastlevel != gamemap || lastepisode != gameepisode) {
AM_LevelInit();
IPU_AM_LevelInit();
lastlevel = gamemap;
lastepisode = gameepisode;
}

1
src/d_loop.c
View File

@@ -799,6 +799,7 @@ void TryRunTics (void)
TicdupSquash(set);
}
NetUpdate (); // check for new console commands
}
}

109
src/ipu/am_map.c
View File

@@ -1,4 +1,7 @@
// State.
#include "doomstat.h"
#include "m_controls.h"
#include "m_fixed.h"
#include "p_local.h"
#include "r_state.h"
@@ -243,6 +246,61 @@ void AM_findMinMaxBoundaries(void) {
max_scale_mtof = FixedDiv(f_h << FRACBITS, 2 * PLAYERRADIUS);
}
//
//
//
void AM_initVariables(void) {
int pnum;
// static event_t st_notify = {ev_keyup, AM_MSGENTERED, 0, 0}; // LATER
automapactive = true;
// fb = I_VideoBuffer; // JOSEF, done in AM_Drawer
f_oldloc.x = INT_MAX;
amclock = 0;
lightlev = 0;
m_paninc.x = m_paninc.y = 0;
ftom_zoommul = FRACUNIT;
mtof_zoommul = FRACUNIT;
m_w = FTOM(f_w);
m_h = FTOM(f_h);
// find player to center on initially
/* JOSEF: Don't support multiplayer
if (playeringame[consoleplayer]) {
plr = &players[consoleplayer];
} else {
plr = &players[0];
for (pnum = 0; pnum < MAXPLAYERS; pnum++) {
if (playeringame[pnum]) {
plr = &players[pnum];
break;
}
}
}
*/
/* LATER:
plr = ... copy from CPU
m_x = plr->mo->x - m_w / 2;
m_y = plr->mo->y - m_h / 2;
AM_changeWindowLoc();
// for saving & restoring
old_m_x = m_x;
old_m_y = m_y;
old_m_w = m_w;
old_m_h = m_h;
*/
// inform the status bar of the change
// ST_Responder(&st_notify); // JOSEF
}
void AM_clearMarks(void) {
int i;
@@ -273,6 +331,38 @@ void AM_LevelInit(void) {
}
//
//
//
void AM_Stop(void) {
// static event_t st_notify = {0, ev_keyup, AM_MSGEXITED, 0}; // LATER
ipuprint("Stopping automap");
// AM_unloadPics(); // JOSEF
automapactive = false;
// ST_Responder(&st_notify); // LATER
stopped = true;
}
//
//
//
void AM_Start(void) {
static int lastlevel = -1, lastepisode = -1;
if (!stopped)
AM_Stop();
stopped = false;
if (lastlevel != gamemap || lastepisode != gameepisode) {
AM_LevelInit();
lastlevel = gamemap;
lastepisode = gameepisode;
}
AM_initVariables(); /// JOSEF Not Finished
// AM_loadPics(); // LATER
ipuprint("Starting automap");
}
//
// Handle events (user inputs) in automap mode
//
@@ -282,10 +372,9 @@ boolean AM_Responder(event_t *ev) {
static int bigstate = 0;
static char buffer[20];
int key;
ipuprint("AM_Responder responding\n");
/* LATER
rc = false;
/* LATER
if (ev->type == ev_joystick && joybautomap >= 0 &&
(ev->data1 & (1 << joybautomap)) != 0) {
joywait = I_GetTime() + 5;
@@ -301,6 +390,7 @@ boolean AM_Responder(event_t *ev) {
return true;
}
*/
if (!automapactive) {
if (ev->type == ev_keydown && ev->data1 == key_map_toggle) {
@@ -308,12 +398,15 @@ boolean AM_Responder(event_t *ev) {
viewactive = false;
rc = true;
}
} else if (ev->type == ev_keydown) {
}
else if (ev->type == ev_keydown) {
rc = true;
key = ev->data1;
if (key == key_map_east) // pan right
{
/* LATER
if (!followplayer)
m_paninc.x = FTOM(F_PANINC);
else
@@ -344,11 +437,14 @@ boolean AM_Responder(event_t *ev) {
{
mtof_zoommul = M_ZOOMIN;
ftom_zoommul = M_ZOOMOUT;
*/
} else if (key == key_map_toggle) {
bigstate = 0;
viewactive = true;
AM_Stop();
} else if (key == key_map_maxzoom) {
}
/* LATER
else if (key == key_map_maxzoom) {
bigstate = !bigstate;
if (bigstate) {
AM_saveScaleAndLoc();
@@ -405,11 +501,12 @@ boolean AM_Responder(event_t *ev) {
mtof_zoommul = FRACUNIT;
ftom_zoommul = FRACUNIT;
}
*/
}
if (bigstate) {} // DELETEME JOSEF prevent no unused var
return rc;
*/
return false; // TMP LATER
}

43
src/ipu/g_game.c
View File

@@ -22,6 +22,49 @@ boolean respawnmonsters;
int gameepisode;
int gamemap;
// If non-zero, exit the level after this number of minutes.
int timelimit;
boolean paused;
boolean sendpause; // send a pause event next tic
boolean sendsave; // send a save event next tic
boolean usergame; // ok to save / end game
boolean timingdemo; // if true, exit with report on completion
boolean nodrawers; // for comparative timing purposes
int starttime; // for comparative timing purposes
boolean viewactive;
int deathmatch; // only if started as net death
boolean netgame; // only true if packets are broadcast
boolean playeringame[MAXPLAYERS];
player_t players[MAXPLAYERS];
boolean turbodetected[MAXPLAYERS];
int consoleplayer; // player taking events and displaying
int displayplayer; // view being displayed
int levelstarttic; // gametic at level start
int totalkills, totalitems, totalsecret; // for intermission
char *demoname;
boolean demorecording;
boolean longtics; // cph's doom 1.91 longtics hack
boolean lowres_turn; // low resolution turning for longtics
boolean demoplayback;
boolean netdemo;
byte *demobuffer;
byte *demo_p;
byte *demoend;
boolean singledemo; // quit after playing a demo from cmdline
boolean precache = true; // if true, load all graphics at start
boolean testcontrols = false; // Invoked by setup to test controls
int testcontrols_mousespeed;
// from here... LATER

1
src/ipu/ipu_vertices.cpp
View File

@@ -40,6 +40,7 @@ class IPU_GetPrintBuf_Vertex : public poplar::Vertex {
bool compute() {
get_ipuprint_data(&printbuf[0], printbuf.size());
reset_ipuprint();
return true;
}
};

401
src/ipu/m_controls.c Normal file
View File

@@ -0,0 +1,401 @@
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 1993-2008 Raven Software
// Copyright(C) 2005-2014 Simon Howard
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
#include "doomkeys.h"
/* LATER
#include "m_config.h"
#include "m_misc.h"
*/
//
// Keyboard controls
//
int key_right = KEY_RIGHTARROW;
int key_left = KEY_LEFTARROW;
int key_up = KEY_UPARROW;
int key_down = KEY_DOWNARROW;
int key_strafeleft = ',';
int key_straferight = '.';
int key_fire = KEY_RCTRL;
int key_use = ' ';
int key_strafe = KEY_RALT;
int key_speed = KEY_RSHIFT;
//
// Heretic keyboard controls
//
int key_flyup = KEY_PGUP;
int key_flydown = KEY_INS;
int key_flycenter = KEY_HOME;
int key_lookup = KEY_PGDN;
int key_lookdown = KEY_DEL;
int key_lookcenter = KEY_END;
int key_invleft = '[';
int key_invright = ']';
int key_useartifact = KEY_ENTER;
//
// Hexen key controls
//
int key_jump = '/';
int key_arti_all = KEY_BACKSPACE;
int key_arti_health = '\\';
int key_arti_poisonbag = '0';
int key_arti_blastradius = '9';
int key_arti_teleport = '8';
int key_arti_teleportother = '7';
int key_arti_egg = '6';
int key_arti_invulnerability = '5';
//
// Strife key controls
//
// haleyjd 09/01/10
//
// Note: Strife also uses key_invleft, key_invright, key_jump, key_lookup, and
// key_lookdown, but with different default values.
int key_usehealth = 'h';
int key_invquery = 'q';
int key_mission = 'w';
int key_invpop = 'z';
int key_invkey = 'k';
int key_invhome = KEY_HOME;
int key_invend = KEY_END;
int key_invuse = KEY_ENTER;
int key_invdrop = KEY_BACKSPACE;
//
// Mouse controls
//
int mousebfire = 0;
int mousebstrafe = 1;
int mousebforward = 2;
int mousebjump = -1;
int mousebstrafeleft = -1;
int mousebstraferight = -1;
int mousebbackward = -1;
int mousebuse = -1;
int mousebprevweapon = -1;
int mousebnextweapon = -1;
int key_message_refresh = KEY_ENTER;
int key_pause = KEY_PAUSE;
int key_demo_quit = 'q';
int key_spy = KEY_F12;
// Multiplayer chat keys:
int key_multi_msg = 't';
int key_multi_msgplayer[8];
// Weapon selection keys:
int key_weapon1 = '1';
int key_weapon2 = '2';
int key_weapon3 = '3';
int key_weapon4 = '4';
int key_weapon5 = '5';
int key_weapon6 = '6';
int key_weapon7 = '7';
int key_weapon8 = '8';
int key_prevweapon = 0;
int key_nextweapon = 0;
// Map control keys:
int key_map_north = KEY_UPARROW;
int key_map_south = KEY_DOWNARROW;
int key_map_east = KEY_RIGHTARROW;
int key_map_west = KEY_LEFTARROW;
int key_map_zoomin = '=';
int key_map_zoomout = '-';
int key_map_toggle = KEY_TAB;
int key_map_maxzoom = '0';
int key_map_follow = 'f';
int key_map_grid = 'g';
int key_map_mark = 'm';
int key_map_clearmark = 'c';
// menu keys:
int key_menu_activate = KEY_ESCAPE;
int key_menu_up = KEY_UPARROW;
int key_menu_down = KEY_DOWNARROW;
int key_menu_left = KEY_LEFTARROW;
int key_menu_right = KEY_RIGHTARROW;
int key_menu_back = KEY_BACKSPACE;
int key_menu_forward = KEY_ENTER;
int key_menu_confirm = 'y';
int key_menu_abort = 'n';
int key_menu_help = KEY_F1;
int key_menu_save = KEY_F2;
int key_menu_load = KEY_F3;
int key_menu_volume = KEY_F4;
int key_menu_detail = KEY_F5;
int key_menu_qsave = KEY_F6;
int key_menu_endgame = KEY_F7;
int key_menu_messages = KEY_F8;
int key_menu_qload = KEY_F9;
int key_menu_quit = KEY_F10;
int key_menu_gamma = KEY_F11;
int key_menu_incscreen = KEY_EQUALS;
int key_menu_decscreen = KEY_MINUS;
int key_menu_screenshot = 0;
//
// Joystick controls
//
int joybfire = 0;
int joybstrafe = 1;
int joybuse = 3;
int joybspeed = 2;
int joybstrafeleft = -1;
int joybstraferight = -1;
int joybjump = -1;
int joybprevweapon = -1;
int joybnextweapon = -1;
int joybmenu = -1;
int joybautomap = -1;
// Control whether if a mouse button is double clicked, it acts like
// "use" has been pressed
int dclick_use = 1;
//
// Bind all of the common controls used by Doom and all other games.
//
/* LATER
void M_BindBaseControls(void)
{
M_BindIntVariable("key_right", &key_right);
M_BindIntVariable("key_left", &key_left);
M_BindIntVariable("key_up", &key_up);
M_BindIntVariable("key_down", &key_down);
M_BindIntVariable("key_strafeleft", &key_strafeleft);
M_BindIntVariable("key_straferight", &key_straferight);
M_BindIntVariable("key_fire", &key_fire);
M_BindIntVariable("key_use", &key_use);
M_BindIntVariable("key_strafe", &key_strafe);
M_BindIntVariable("key_speed", &key_speed);
M_BindIntVariable("mouseb_fire", &mousebfire);
M_BindIntVariable("mouseb_strafe", &mousebstrafe);
M_BindIntVariable("mouseb_forward", &mousebforward);
M_BindIntVariable("joyb_fire", &joybfire);
M_BindIntVariable("joyb_strafe", &joybstrafe);
M_BindIntVariable("joyb_use", &joybuse);
M_BindIntVariable("joyb_speed", &joybspeed);
M_BindIntVariable("joyb_menu_activate", &joybmenu);
M_BindIntVariable("joyb_toggle_automap", &joybautomap);
// Extra controls that are not in the Vanilla versions:
M_BindIntVariable("joyb_strafeleft", &joybstrafeleft);
M_BindIntVariable("joyb_straferight", &joybstraferight);
M_BindIntVariable("mouseb_strafeleft", &mousebstrafeleft);
M_BindIntVariable("mouseb_straferight", &mousebstraferight);
M_BindIntVariable("mouseb_use", &mousebuse);
M_BindIntVariable("mouseb_backward", &mousebbackward);
M_BindIntVariable("dclick_use", &dclick_use);
M_BindIntVariable("key_pause", &key_pause);
M_BindIntVariable("key_message_refresh", &key_message_refresh);
}
void M_BindHereticControls(void)
{
M_BindIntVariable("key_flyup", &key_flyup);
M_BindIntVariable("key_flydown", &key_flydown);
M_BindIntVariable("key_flycenter", &key_flycenter);
M_BindIntVariable("key_lookup", &key_lookup);
M_BindIntVariable("key_lookdown", &key_lookdown);
M_BindIntVariable("key_lookcenter", &key_lookcenter);
M_BindIntVariable("key_invleft", &key_invleft);
M_BindIntVariable("key_invright", &key_invright);
M_BindIntVariable("key_useartifact", &key_useartifact);
}
void M_BindHexenControls(void)
{
M_BindIntVariable("key_jump", &key_jump);
M_BindIntVariable("mouseb_jump", &mousebjump);
M_BindIntVariable("joyb_jump", &joybjump);
M_BindIntVariable("key_arti_all", &key_arti_all);
M_BindIntVariable("key_arti_health", &key_arti_health);
M_BindIntVariable("key_arti_poisonbag", &key_arti_poisonbag);
M_BindIntVariable("key_arti_blastradius", &key_arti_blastradius);
M_BindIntVariable("key_arti_teleport", &key_arti_teleport);
M_BindIntVariable("key_arti_teleportother", &key_arti_teleportother);
M_BindIntVariable("key_arti_egg", &key_arti_egg);
M_BindIntVariable("key_arti_invulnerability", &key_arti_invulnerability);
}
void M_BindStrifeControls(void)
{
// These are shared with all games, but have different defaults:
key_message_refresh = '/';
// These keys are shared with Heretic/Hexen but have different defaults:
key_jump = 'a';
key_lookup = KEY_PGUP;
key_lookdown = KEY_PGDN;
key_invleft = KEY_INS;
key_invright = KEY_DEL;
M_BindIntVariable("key_jump", &key_jump);
M_BindIntVariable("key_lookUp", &key_lookup);
M_BindIntVariable("key_lookDown", &key_lookdown);
M_BindIntVariable("key_invLeft", &key_invleft);
M_BindIntVariable("key_invRight", &key_invright);
// Custom Strife-only Keys:
M_BindIntVariable("key_useHealth", &key_usehealth);
M_BindIntVariable("key_invquery", &key_invquery);
M_BindIntVariable("key_mission", &key_mission);
M_BindIntVariable("key_invPop", &key_invpop);
M_BindIntVariable("key_invKey", &key_invkey);
M_BindIntVariable("key_invHome", &key_invhome);
M_BindIntVariable("key_invEnd", &key_invend);
M_BindIntVariable("key_invUse", &key_invuse);
M_BindIntVariable("key_invDrop", &key_invdrop);
// Strife also supports jump on mouse and joystick, and in the exact same
// manner as Hexen!
M_BindIntVariable("mouseb_jump", &mousebjump);
M_BindIntVariable("joyb_jump", &joybjump);
}
void M_BindWeaponControls(void)
{
M_BindIntVariable("key_weapon1", &key_weapon1);
M_BindIntVariable("key_weapon2", &key_weapon2);
M_BindIntVariable("key_weapon3", &key_weapon3);
M_BindIntVariable("key_weapon4", &key_weapon4);
M_BindIntVariable("key_weapon5", &key_weapon5);
M_BindIntVariable("key_weapon6", &key_weapon6);
M_BindIntVariable("key_weapon7", &key_weapon7);
M_BindIntVariable("key_weapon8", &key_weapon8);
M_BindIntVariable("key_prevweapon", &key_prevweapon);
M_BindIntVariable("key_nextweapon", &key_nextweapon);
M_BindIntVariable("joyb_prevweapon", &joybprevweapon);
M_BindIntVariable("joyb_nextweapon", &joybnextweapon);
M_BindIntVariable("mouseb_prevweapon", &mousebprevweapon);
M_BindIntVariable("mouseb_nextweapon", &mousebnextweapon);
}
void M_BindMapControls(void)
{
M_BindIntVariable("key_map_north", &key_map_north);
M_BindIntVariable("key_map_south", &key_map_south);
M_BindIntVariable("key_map_east", &key_map_east);
M_BindIntVariable("key_map_west", &key_map_west);
M_BindIntVariable("key_map_zoomin", &key_map_zoomin);
M_BindIntVariable("key_map_zoomout", &key_map_zoomout);
M_BindIntVariable("key_map_toggle", &key_map_toggle);
M_BindIntVariable("key_map_maxzoom", &key_map_maxzoom);
M_BindIntVariable("key_map_follow", &key_map_follow);
M_BindIntVariable("key_map_grid", &key_map_grid);
M_BindIntVariable("key_map_mark", &key_map_mark);
M_BindIntVariable("key_map_clearmark", &key_map_clearmark);
}
void M_BindMenuControls(void)
{
M_BindIntVariable("key_menu_activate", &key_menu_activate);
M_BindIntVariable("key_menu_up", &key_menu_up);
M_BindIntVariable("key_menu_down", &key_menu_down);
M_BindIntVariable("key_menu_left", &key_menu_left);
M_BindIntVariable("key_menu_right", &key_menu_right);
M_BindIntVariable("key_menu_back", &key_menu_back);
M_BindIntVariable("key_menu_forward", &key_menu_forward);
M_BindIntVariable("key_menu_confirm", &key_menu_confirm);
M_BindIntVariable("key_menu_abort", &key_menu_abort);
M_BindIntVariable("key_menu_help", &key_menu_help);
M_BindIntVariable("key_menu_save", &key_menu_save);
M_BindIntVariable("key_menu_load", &key_menu_load);
M_BindIntVariable("key_menu_volume", &key_menu_volume);
M_BindIntVariable("key_menu_detail", &key_menu_detail);
M_BindIntVariable("key_menu_qsave", &key_menu_qsave);
M_BindIntVariable("key_menu_endgame", &key_menu_endgame);
M_BindIntVariable("key_menu_messages", &key_menu_messages);
M_BindIntVariable("key_menu_qload", &key_menu_qload);
M_BindIntVariable("key_menu_quit", &key_menu_quit);
M_BindIntVariable("key_menu_gamma", &key_menu_gamma);
M_BindIntVariable("key_menu_incscreen", &key_menu_incscreen);
M_BindIntVariable("key_menu_decscreen", &key_menu_decscreen);
M_BindIntVariable("key_menu_screenshot",&key_menu_screenshot);
M_BindIntVariable("key_demo_quit", &key_demo_quit);
M_BindIntVariable("key_spy", &key_spy);
}
void M_BindChatControls(unsigned int num_players)
{
char name[32]; // haleyjd: 20 not large enough - Thank you, come again!
unsigned int i; // haleyjd: signedness conflict
M_BindIntVariable("key_multi_msg", &key_multi_msg);
for (i=0; i<num_players; ++i)
{
M_snprintf(name, sizeof(name), "key_multi_msgplayer%i", i + 1);
M_BindIntVariable(name, &key_multi_msgplayer[i]);
}
}
//
// Apply custom patches to the default values depending on the
// platform we are running on.
//
void M_ApplyPlatformDefaults(void)
{
// no-op. Add your platform-specific patches here.
}
*/

4
src/ipu_host.cpp
View File

@@ -37,7 +37,6 @@ class IpuDoom {
~IpuDoom();
void buildIpuGraph();
void run_AM_LevelInit();
void run_AM_Drawer();
void run_G_DoLoadLevel();
void run_G_Ticker();
@@ -228,7 +227,7 @@ void IpuDoom::buildIpuGraph() {
m_ipuEngine->load(m_ipuDevice);
}
void IpuDoom::run_AM_LevelInit() { m_ipuEngine->run(0); }
// void IpuDoom::run_AM_LevelInit() { m_ipuEngine->run(0); }
void IpuDoom::run_AM_Drawer() {
static bool setup = true;
if (setup) {
@@ -248,7 +247,6 @@ void IpuDoom::run_G_Responder(G_Responder_MiscValues_t* buf) {
static std::unique_ptr<IpuDoom> ipuDoomInstance = nullptr;
extern "C" {
void IPU_Init(void) { ipuDoomInstance = std::make_unique<IpuDoom>(); }
void IPU_AM_LevelInit() { ipuDoomInstance->run_AM_LevelInit(); }
void IPU_AM_Drawer() { ipuDoomInstance->run_AM_Drawer(); }
void IPU_G_DoLoadLevel() { ipuDoomInstance->run_G_DoLoadLevel(); }
void IPU_G_Ticker() { ipuDoomInstance->run_G_Ticker(); }

1
src/ipu_host.h
View File

@@ -10,7 +10,6 @@ extern "C" {
void IPU_Init(void);
void IPU_AM_LevelInit(void);
void IPU_AM_Drawer(void);
void IPU_G_DoLoadLevel(void);