imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-01 21:17:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remaining compile errors

Browse Source
This commit is contained in:
WerWolv
2025-01-31 20:23:47 +01:00
parent e6ab2c3b7e
commit 8d1352ddff
24 changed files with 53 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libimhex/include/hex/api/content_registry.hpp
View File

@@ -576,7 +576,7 @@ namespace hex {
namespace impl {
void add(std::unique_ptr<View> &&view);
const std::map<std::string, std::unique_ptr<View>>& getEntries();
const std::map<UnlocalizedString, std::unique_ptr<View>>& getEntries();
}
@@ -1110,9 +1110,9 @@ namespace hex {
[[nodiscard]] const UnlocalizedString& getUnlocalizedName() const { return m_unlocalizedName; }
protected:
const static int TextInputFlags;
[[nodiscard]] static int DefaultTextInputFlags();
protected:
bool drawDefaultScalarEditingTextBox(u64 address, const char *format, ImGuiDataType dataType, u8 *data, ImGuiInputTextFlags flags) const;
bool drawDefaultTextEditingTextBox(u64 address, std::string &data, ImGuiInputTextFlags flags) const;

28
lib/libimhex/include/hex/helpers/opengl.hpp
View File

@@ -189,43 +189,43 @@ namespace hex::gl {
T &getElement(int row,int col) {
return this->mat[row*Columns+col];
return this->mat[row * Columns+col];
}
Vector<T,Rows> getColumn(int col) {
Vector<T,Rows> result;
for (size_t i = 0; i < Rows; i++)
result[i] = this->mat[i*Columns+col];
result[i] = this->mat[i * Columns + col];
return result;
}
Vector<T,Columns> getRow(int row) {
Vector<T,Columns> result;
for (size_t i = 0; i < Columns; i++)
result[i] = this->mat[row*Columns+i];
result[i] = this->mat[row * Columns+i];
return result;
}
void updateRow(int row, Vector<T,Columns> values) {
for (size_t i = 0; i < Columns; i++)
this->mat[row*Columns+i] = values[i];
this->mat[row * Columns + i] = values[i];
}
void updateColumn(int col, Vector<T,Rows> values) {
for (size_t i = 0; i < Rows; i++)
this->mat[i*Columns+col] = values[i];
this->mat[i * Columns + col] = values[i];
}
void updateElement( int row,int col, T value) {
this->mat[row*Columns + col] = value;
void updateElement(int row, int col, T value) {
this->mat[row * Columns + col] = value;
}
T &operator()( const unsigned&row, const unsigned&col) {
return this->mat[row*Columns + col];
T &operator()(const unsigned &row, const unsigned &col) {
return this->mat[row * Columns + col];
}
const T &operator()(const unsigned& row, const unsigned& col) const {
return this->mat[row*Columns + col];
const T &operator()(const unsigned &row, const unsigned &col) const {
return this->mat[row * Columns + col];
}
Matrix& operator=(const Matrix& A) {
@@ -243,7 +243,7 @@ namespace hex::gl {
for (size_t i = 0; i < Rows; i++)
for (size_t j = 0; j < Columns; j++)
result(i, j) = this->mat[i*Columns+j] + A(i, j);
result(i, j) = this->mat[i * Columns + j] + A(i, j);
return result;
}
@@ -252,7 +252,7 @@ namespace hex::gl {
for (size_t i = 0; i < Rows; i++)
for (size_t j = 0; j < Columns; j++)
result(i, j) = this->mat[i*Columns+j] - A(i, j);
result(i, j) = this->mat[i * Columns + j] - A(i, j);
return result;
}
@@ -269,7 +269,7 @@ namespace hex::gl {
Matrix t(0);
for (size_t i = 0; i < Columns; i++)
for (size_t j = 0; j < Rows; j++)
t.updateElement(i, j, this->mat[j*Rows+i]);
t.updateElement(i, j, this->mat[j * Rows + i]);
return t;
}