improve accuracy + add editorconfig

This commit is contained in:
Misha 2023-06-25 12:23:47 +03:00
parent 288f861428
commit 2208573eb2
3 changed files with 38 additions and 32 deletions

3
.editorconfig Normal file
View file

@ -0,0 +1,3 @@
[*.{cpp,h}]
indent_style = space
indent_size = 2

View file

@ -1,48 +1,51 @@
#include "legobackgroundcolor.h" #include "legobackgroundcolor.h"
#include "legoomni.h" #include "legoomni.h"
#include "legoutil.h" #include "legoutil.h"
const char* Delimiter = "\t"; #include "legovideomanager.h"
const char *Delimiter = "\t";
const char *set = "set";
const char *reset = "reset";
// OFFSET: LEGO1 0x1003bfb0 // OFFSET: LEGO1 0x1003bfb0
LegoBackgroundColor::LegoBackgroundColor(const char* name, const char* colorString) LegoBackgroundColor::LegoBackgroundColor(const char *name, const char *colorString)
{ {
this->m_name.operator=(name); this->m_name.operator=(name);
this->m_name.ToUpperCase(); this->m_name.ToUpperCase();
SetColorString(colorString); SetColorString(colorString);
} }
// OFFSET: LEGO1 0x1003c070 // OFFSET: LEGO1 0x1003c070
void LegoBackgroundColor::SetColorString(const char* colorString) void LegoBackgroundColor::SetColorString(const char *colorString)
{ {
m_colorString.operator=(colorString); m_colorString.operator=(colorString);
m_colorString.ToLowerCase(); m_colorString.ToLowerCase();
if (colorString == NULL) LegoVideoManager *videomanager = VideoManager();
if (videomanager && colorString)
{ {
return; char *colorStringCopy = (char *)malloc(strlen(colorString) + 1);
} strcpy(colorStringCopy, colorString);
char* colorStringCopy = (char*)malloc(strlen(colorString) + 1); char *colorStringSplit = strtok(colorStringCopy, Delimiter);
strcpy(colorStringCopy, colorString); if (!strcmp(colorStringSplit, set))
char* colorStringSplit = strtok(colorStringCopy, Delimiter); {
if(!strcmp(colorStringSplit, "set")) // set it
{ char *red = strtok(0, Delimiter);
//set it if (red)
char* red = strtok(0, Delimiter); r = atoi(red) * 0.01;
if(red) char *blue = strtok(0, Delimiter);
r = (double)atoi(red)*0.01; if (blue)
char* blue = strtok(0, Delimiter); b = atoi(blue) * 0.01;
if(blue) char *green = strtok(0, Delimiter);
b = (double)atoi(blue)*0.01; if (green)
char* green = strtok(0, Delimiter); g = atoi(green) * 0.01;
if(green) }
g = (double)atoi(green)*0.01; else if (!strcmp(colorStringSplit, reset))
} {
else if(!strcmp(colorStringSplit, "reset")) // reset it
{ float converted_r;
//reset it float converted_b;
float converted_b; float converted_g;
float converted_g; ConvertColor(this->r, this->g, this->b, &converted_r, &converted_g, &converted_b);
float converted_r; videomanager->SetSkyColor(converted_r, converted_g, converted_b);
ConvertColor(this->r,this->g,this->b,&converted_r,&converted_g,&converted_b); }
VideoManager()->SetSkyColor(converted_r,converted_g,converted_b); free(colorStringCopy);
} }
} }

View file

@ -11,5 +11,5 @@ MxString* MxBackgroundColor::GetColorString()
// OFFSET: LEGO1 0x1003beb0 // OFFSET: LEGO1 0x1003beb0
void MxBackgroundColor::SetColorString(const char* colorString) void MxBackgroundColor::SetColorString(const char* colorString)
{ {
this->m_colorString.operator=(colorString); m_colorString.operator=(colorString);
} }