Skip to content

Optional replacement of short radar forward tick with dashed forward line #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 2.4
Choose a base branch
from
Open

Optional replacement of short radar forward tick with dashed forward line #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59e4221
Optional replacement of short radar forward tick with dashed forward …
Paula90 Apr 10, 2020
e5b9fdf
Fixed incorrect argument usage of glPushAttrib
Paula90 Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/BZDBCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class BZDBCache
static Int radarStyle;
static Float radarTankPixels;
static Int leadingShotLine;
static Int radarForwardMarker;
static Float linedRadarShots;
static Float sizedRadarShots;
static Int radarPosition;
Expand Down
17 changes: 17 additions & 0 deletions src/bzflag/GUIOptionsMenu.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,17 @@ GUIOptionsMenu::GUIOptionsMenu()
option->update();
listHUD.push_back(option);

// radar marker for forward direction
option = new HUDuiList;
option->setFontFace(fontFace);
option->setLabel("Radar Forward Marker:");
option->setCallback(callback, "m");
options = &option->getList();
options->push_back(std::string("Tick"));
options->push_back(std::string("Line"));
option->update();
listHUD.push_back(option);

// set radar position
option = new HUDuiList;
option->setFontFace(fontFace);
Expand Down Expand Up @@ -403,6 +414,8 @@ void GUIOptionsMenu::resize(int _width, int _height)
((HUDuiList*)listHUD[i++])->setIndex(static_cast<int>(BZDB.eval("linedradarshots")));
// Radar Shot Line
((HUDuiList*)listHUD[i++])->setIndex(static_cast<int>(BZDB.eval("leadingShotLine")));
// Radar Forward Marker
((HUDuiList*)listHUD[i++])->setIndex(static_cast<int>(BZDB.eval("radarForwardMarker")));
// Radar Position
((HUDuiList*)listHUD[i++])->setIndex(static_cast<int>(BZDB.eval("radarPosition")));
// Colored shots on radar
Expand Down Expand Up @@ -526,6 +539,10 @@ void GUIOptionsMenu::callback(HUDuiControl* w, const void* data)
BZDB.setInt("leadingShotLine", list->getIndex());
break;

case 'm':
BZDB.setInt("radarForwardMarker", list->getIndex());
break;

case 'P':
BZDB.setInt("radarPosition", list->getIndex());
controlPanel->resize();
Expand Down
28 changes: 24 additions & 4 deletions src/bzflag/RadarRenderer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,31 @@ void RadarRenderer::render(SceneRenderer& renderer, bool blank, bool observer)
// always up
glPopMatrix();

// forward tick
glBegin(GL_LINES);
glVertex2f(0.0f, radarRange - ps);
glVertex2f(0.0f, radarRange - 4.0f * ps);
// forward tick/line
bool isLineRadarMarker = (BZDB.eval("radarForwardMarker") == 1);
if (isLineRadarMarker)
{
// spec for glPushAttrib not precise in this case,
// pushing both bits to be on the safe side here
glPushAttrib(GL_ENABLE_BIT | GL_LINE_BIT);
glLineStipple(1, 0xF0F0);
glEnable(GL_LINE_STIPPLE);
glColor3f(0.7f, 0.425f, 0.1f);

glBegin(GL_LINES);
glVertex2f(0.0f, radarRange - ps);
glVertex2f(0.0f, 0.0f);
}
else
{
glBegin(GL_LINES);
glVertex2f(0.0f, radarRange - ps);
glVertex2f(0.0f, radarRange - 4.0f * ps);
}
glEnd();
if (isLineRadarMarker) glPopAttrib();



if (!observer)
{
Expand Down
1 change: 1 addition & 0 deletions src/bzflag/defaultBZDB.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ DefaultDBItem defaultDBItems[] =
{ "scrollPages", "20", true, StateDatabase::ReadWrite, NULL },
{ "remoteSounds", "1", true, StateDatabase::ReadWrite, NULL },
{ "leadingShotLine", "1", true, StateDatabase::ReadWrite, NULL },
{ "radarForwardMarker", "1", true, StateDatabase::ReadWrite, NULL },
{ "saveIdentity", "2", true, StateDatabase::ReadWrite, NULL },
{ "showCollisionGrid", "0", true, StateDatabase::ReadWrite, NULL },
{ "showCullingGrid", "0", true, StateDatabase::ReadWrite, NULL },
Expand Down
4 changes: 4 additions & 0 deletions src/common/BZDBCache.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ BZDBCache::Bool BZDBCache::smooth;
BZDBCache::Bool BZDBCache::colorful;
BZDBCache::Bool BZDBCache::animatedTreads;
BZDBCache::Int BZDBCache::leadingShotLine;
BZDBCache::Int BZDBCache::radarForwardMarker;
BZDBCache::Int BZDBCache::radarStyle;
BZDBCache::Float BZDBCache::radarTankPixels;
BZDBCache::Float BZDBCache::linedRadarShots;
Expand Down Expand Up @@ -113,6 +114,7 @@ void BZDBCache::init()
BZDB.addCallback("animatedTreads", clientCallback, NULL);
BZDB.addCallback("shotLength", clientCallback, NULL);
BZDB.addCallback("leadingShotLine", clientCallback, NULL);
BZDB.addCallback("radarForwardMarker", clientCallback, NULL);
BZDB.addCallback("radarPosition", clientCallback, NULL);
BZDB.addCallback("flagChunks", clientCallback, NULL);
BZDB.addCallback("pulseRate", clientCallback, NULL);
Expand Down Expand Up @@ -203,6 +205,8 @@ void BZDBCache::clientCallback(const std::string& name, void *)
shotLength = BZDB.eval("shotLength");
else if (name == "leadingShotLine")
leadingShotLine = BZDB.evalInt("leadingShotLine");
else if (name == "radarForwardMarker")
leadingShotLine = BZDB.evalInt("radarForwardMarker");
else if (name == "radarPosition")
radarPosition = BZDB.evalInt("radarPosition");
else if (name == "flagChunks")
Expand Down