# Changes
- Add Debugstuff to main - Add IsType and AutoLoad to AssetManager - Add ID class for at compile time hashing - Add A8 to image (but not supported yet) - Fix error in Vertex constructor - Add PathClear to PathFill func - Add pCheckSize to check for overflows - Make Tex in Texture a pointer ref - Add default uv to texture - Add own c++ exception - Add FNV32 Hash func (compile and runtime) - Fix Power2 check in texture loader - Load Shader manualy in iron (cause it seems not working correctly with files)
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <amethyst/c3d.hpp>
|
||||
#include <amethyst/utils.hpp>
|
||||
#include <pica.hpp>
|
||||
// #include <pica.hpp>
|
||||
|
||||
namespace Amy {
|
||||
|
||||
@@ -46,7 +46,7 @@ void C3D::Shader::Load(const std::string& path) {
|
||||
auto code = Utils::LoadFile2Mem(path);
|
||||
if (!code.size()) {
|
||||
throw std::runtime_error(
|
||||
std::format("[amy] unsable to load shader ({})", path));
|
||||
std::format("[amy] unable to load shader ({})", path));
|
||||
}
|
||||
Load(code);
|
||||
}
|
||||
@@ -60,8 +60,9 @@ void C3D::Shader::Load(const std::vector<uc>& data) {
|
||||
}
|
||||
|
||||
void C3D::Shader::Compile(const std::string& code) {
|
||||
auto ret = Pica::AssembleCode(code.c_str());
|
||||
Load(ret);
|
||||
throw std::runtime_error("[amy]: unable to compile shader (not allowed)");
|
||||
/*auto ret = Pica::AssembleCode(code.c_str());
|
||||
Load(ret);*/
|
||||
}
|
||||
|
||||
void C3D::Shader::Use() {
|
||||
|
||||
Reference in New Issue
Block a user