github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 21:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve CVars a bit (#283)

Browse source 
* Improve CVars a bit

* Just use boolean operators on ptr
This commit is contained in:
Sirius902 2022-05-11 12:12:52 -07:00 • committed by GitHub
commit a5651742ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

53
libultraship/libultraship/Cvar.cpp
View file

@ -1,23 +1,22 @@
#include "Cvar.h" #include "Cvar.h"
#include <map> #include <map>
#include <string> #include <string>
#include <functional>
#include <memory>
#include <utility>
#include <PR/ultra64/gbi.h> #include <PR/ultra64/gbi.h>
std::map<std::string, CVar*> cvars; std::map<std::string, std::unique_ptr<CVar>, std::less<>> cvars;
CVar* CVar_GetVar(const char* name) {
std::string key(name);
return cvars.contains(key) ? cvars[key] : nullptr;
}
extern "C" CVar* CVar_Get(const char* name) { extern "C" CVar* CVar_Get(const char* name) {
return CVar_GetVar(name); auto it = cvars.find(name);
return (it != cvars.end()) ? it->second.get() : nullptr;
} }
extern "C" s32 CVar_GetS32(const char* name, s32 defaultValue) { extern "C" s32 CVar_GetS32(const char* name, s32 defaultValue) {
CVar* cvar = CVar_Get(name); CVar* cvar = CVar_Get(name);
if (cvar != nullptr) { if (cvar) {
if (cvar->type == CVAR_TYPE_S32) if (cvar->type == CVAR_TYPE_S32)
return cvar->value.valueS32; return cvar->value.valueS32;
} }
@ -28,7 +27,7 @@ extern "C" s32 CVar_GetS32(const char* name, s32 defaultValue) {
extern "C" float CVar_GetFloat(const char* name, float defaultValue) { extern "C" float CVar_GetFloat(const char* name, float defaultValue) {
CVar* cvar = CVar_Get(name); CVar* cvar = CVar_Get(name);
if (cvar != nullptr) { if (cvar) {
if (cvar->type == CVAR_TYPE_FLOAT) if (cvar->type == CVAR_TYPE_FLOAT)
return cvar->value.valueFloat; return cvar->value.valueFloat;
} }
@ -36,10 +35,10 @@ extern "C" float CVar_GetFloat(const char* name, float defaultValue) {
return defaultValue; return defaultValue;
} }
extern "C" char* CVar_GetString(const char* name, char* defaultValue) { extern "C" const char* CVar_GetString(const char* name, const char* defaultValue) {
CVar* cvar = CVar_Get(name); CVar* cvar = CVar_Get(name);
if (cvar != nullptr) { if (cvar) {
if (cvar->type == CVAR_TYPE_STRING) if (cvar->type == CVAR_TYPE_STRING)
return cvar->value.valueStr; return cvar->value.valueStr;
} }
@ -48,53 +47,43 @@ extern "C" char* CVar_GetString(const char* name, char* defaultValue) {
} }
extern "C" void CVar_SetS32(const char* name, s32 value) { extern "C" void CVar_SetS32(const char* name, s32 value) {
CVar* cvar = CVar_Get(name); auto& cvar = cvars[name];
if (!cvar) { if (!cvar) {
cvar = new CVar; cvar = std::make_unique<CVar>();
cvars[std::string(name)] = cvar;
} }
cvar->type = CVAR_TYPE_S32; cvar->type = CVAR_TYPE_S32;
cvar->value.valueS32 = value; cvar->value.valueS32 = value;
} }
void CVar_SetFloat(const char* name, float value) { void CVar_SetFloat(const char* name, float value) {
CVar* cvar = CVar_Get(name); auto& cvar = cvars[name];
if (!cvar) { if (!cvar) {
cvar = new CVar; cvar = std::make_unique<CVar>();
cvars[std::string(name)] = cvar;
} }
cvar->type = CVAR_TYPE_FLOAT; cvar->type = CVAR_TYPE_FLOAT;
cvar->value.valueFloat = value; cvar->value.valueFloat = value;
} }
void CVar_SetString(const char* name, char* value) { void CVar_SetString(const char* name, const char* value) {
CVar* cvar = CVar_Get(name); auto& cvar = cvars[name];
if (!cvar) { if (!cvar) {
cvar = new CVar; cvar = std::make_unique<CVar>();
cvars[std::string(name)] = cvar;
} }
cvar->type = CVAR_TYPE_STRING; cvar->type = CVAR_TYPE_STRING;
cvar->value.valueStr = value; cvar->value.valueStr = value;
} }
extern "C" void CVar_RegisterS32(const char* name, s32 defaultValue) { extern "C" void CVar_RegisterS32(const char* name, s32 defaultValue) {
CVar* cvar = CVar_Get(name); if (!CVar_Get(name))
if (cvar == nullptr)
CVar_SetS32(name, defaultValue); CVar_SetS32(name, defaultValue);
} }
extern "C" void CVar_RegisterFloat(const char* name, float defaultValue) { extern "C" void CVar_RegisterFloat(const char* name, float defaultValue) {
CVar* cvar = CVar_Get(name); if (!CVar_Get(name))
if (cvar == nullptr)
CVar_SetFloat(name, defaultValue); CVar_SetFloat(name, defaultValue);
} }
extern "C" void CVar_RegisterString(const char* name, char* defaultValue) { extern "C" void CVar_RegisterString(const char* name, const char* defaultValue) {
CVar* cvar = CVar_Get(name); if (!CVar_Get(name))
if (cvar == nullptr)
CVar_SetString(name, defaultValue); CVar_SetString(name, defaultValue);
} }

15
libultraship/libultraship/Cvar.h
View file

@ -6,13 +6,13 @@
typedef enum CVarType { CVAR_TYPE_S32, CVAR_TYPE_FLOAT, CVAR_TYPE_STRING } CVarType; typedef enum CVarType { CVAR_TYPE_S32, CVAR_TYPE_FLOAT, CVAR_TYPE_STRING } CVarType;
typedef struct CVar { typedef struct CVar {
char* name; const char* name;
CVarType type; CVarType type;
union { union {
s32 valueS32; s32 valueS32;
float valueFloat; float valueFloat;
char* valueStr; const char* valueStr;
} value; } value;
} CVar; } CVar;
@ -22,16 +22,15 @@ extern "C"
#endif #endif
//#include <ultra64.h> //#include <ultra64.h>
CVar* CVar_Get(const char* name); CVar* CVar_Get(const char* name);
s32 CVar_GetS32(const char* name, s32 defaultValue); s32 CVar_GetS32(const char* name, s32 defaultValue);
float CVar_GetFloat(const char* name, float defaultValue); float CVar_GetFloat(const char* name, float defaultValue);
char* CVar_GetString(const char* name, char* defaultValue); const char* CVar_GetString(const char* name, const char* defaultValue);
void CVar_SetS32(const char* name, s32 value); void CVar_SetS32(const char* name, s32 value);
void CVar_RegisterS32(const char* name, s32 defaultValue); void CVar_RegisterS32(const char* name, s32 defaultValue);
void CVar_RegisterFloat(const char* name, float defaultValue); void CVar_RegisterFloat(const char* name, float defaultValue);
void CVar_RegisterString(const char* name, char* defaultValue); void CVar_RegisterString(const char* name, const char* defaultValue);
#ifdef __cplusplus #ifdef __cplusplus
}; };
@ -40,10 +39,12 @@ void CVar_RegisterString(const char* name, char* defaultValue);
#ifdef __cplusplus #ifdef __cplusplus
#include <map> #include <map>
#include <string> #include <string>
#include <functional>
#include <memory>
extern std::map<std::string, CVar*> cvars; extern std::map<std::string, std::unique_ptr<CVar>, std::less<>> cvars;
CVar* CVar_GetVar(const char* name); CVar* CVar_GetVar(const char* name);
void CVar_SetFloat(const char* name, float value); void CVar_SetFloat(const char* name, float value);
void CVar_SetString(const char* name, char* value); void CVar_SetString(const char* name, const char* value);
#endif #endif
#endif #endif

2
libultraship/libultraship/SohConsole.cpp
View file

@ -92,7 +92,7 @@ void Console::Update() {
} }
for (auto [key, var] : BindingToggle) { for (auto [key, var] : BindingToggle) {
if (ImGui::IsKeyPressed(key)) { if (ImGui::IsKeyPressed(key)) {
CVar* cvar = CVar_GetVar(var.c_str()); CVar* cvar = CVar_Get(var.c_str());
Dispatch("set " + var + " " + std::to_string(cvar == nullptr ? 0 : !static_cast<bool>(cvar->value.valueS32))); Dispatch("set " + var + " " + std::to_string(cvar == nullptr ? 0 : !static_cast<bool>(cvar->value.valueS32)));
} }
} }

4
soh/soh/Enhancements/debugconsole.cpp
View file

@ -336,7 +336,7 @@ static bool SetCVarHandler(const std::vector<std::string>& args) {
int vType = CheckVarType(args[2]); int vType = CheckVarType(args[2]);
if (vType == VARTYPE_STRING) if (vType == VARTYPE_STRING)
CVar_SetString(args[1].c_str(), (char*)args[2].c_str()); CVar_SetString(args[1].c_str(), args[2].c_str());
else if (vType == VARTYPE_FLOAT) else if (vType == VARTYPE_FLOAT)
CVar_SetFloat(args[1].c_str(), std::stof(args[2])); CVar_SetFloat(args[1].c_str(), std::stof(args[2]));
else else
@ -353,7 +353,7 @@ static bool GetCVarHandler(const std::vector<std::string>& args) {
if (args.size() < 2) if (args.size() < 2)
return CMD_FAILED; return CMD_FAILED;
CVar* cvar = CVar_GetVar(args[1].c_str()); CVar* cvar = CVar_Get(args[1].c_str());
if (cvar != nullptr) if (cvar != nullptr)
{ {