Skip to content

Commit

Permalink
Merge pull request #155 from Wolf3s/Cleanup
Browse files Browse the repository at this point in the history
misc cleanup
  • Loading branch information
h4570 authored Nov 13, 2023
2 parents 5583c7b + c2e653c commit 22ecaff
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
1 change: 1 addition & 0 deletions .vscode/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/c_cpp_properties.json
/tasks.json
/settings.json
/ps2dev-intellisense
2 changes: 1 addition & 1 deletion README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Distributed under the Apache License 2.0 License. See `LICENSE` for more informa
Without these guys, Tyra would not happen:
* [Dr Henry Fortuna](http://ps2-edu.tensioncore.com/index.html) - for code sources, PS2 academy tutorials
* Whole [PS2DEV](https://github.com/ps2dev) team, and specially to [Rick Gaiser](https://github.com/rickgaiser), [fjtrujy](https://github.com/fjtrujy) - for a lot of good tips!
* [Wellington Carvalho](https://github.com/Wellinator), [André Guilheme](https://github.com/wolfysdl) - for testing, contributing to Tyra and sharing cool ideas!
* [Wellington Carvalho](https://github.com/Wellinator), [André Guilheme](https://github.com/Wolf3s) - for testing, contributing to Tyra and sharing cool ideas!
* [Leonardo Ono](https://github.com/leonardo-ono) - for software renderer example (with clipping!)
* [Lukasz D.K.](https://github.com/lukaszdk) - for huge archive of PS2 stuff
* [Guilherme Lampert](https://github.com/glampert) - for code sources
Expand Down
8 changes: 5 additions & 3 deletions engine/inc/file/file_utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#pragma once

#include <string>
#include <limits.h>
#include <syslimits.h>

namespace Tyra {

Expand Down Expand Up @@ -42,9 +44,9 @@ class FileUtils {

private:
// Argv name+path & just path
char cwd[255];
char elfName[255];
char elfPath[255 - 14];
char cwd[NAME_MAX];
char elfName[NAME_MAX];
char elfPath[NAME_MAX - 14];

void setPathInfo(const char* path);
};
Expand Down
9 changes: 5 additions & 4 deletions engine/inc/loaders/texture/builder/texture_builder_data.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ class TextureBuilderData {
std::string name;

int width, height;
unsigned char* data;
u8* data;
TextureBpp bpp;
unsigned char gsComponents;
u8 gsComponents;

int clutWidth, clutHeight;
unsigned char* clut;
u8* clut;
TextureBpp clutBpp;
unsigned char clutGsComponents;
u8 clutGsComponents;
};

} // namespace Tyra
3 changes: 0 additions & 3 deletions engine/inc/math/math.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ class Math {
static int randomi(const int& min, const int& max);
static bool equalf(const float& a, const float& b,
const float& epsilon = 0.00001F);

private:
Math();
};

} // namespace Tyra
3 changes: 1 addition & 2 deletions engine/src/file/file_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
#include <tamtypes.h>
#include <cstdio>
#include <kernel.h>
#include <limits.h>
#include <syslimits.h>

#include <unistd.h>
#include <cstring>
#include "file/file_utils.hpp"
Expand Down

0 comments on commit 22ecaff

Please sign in to comment.