RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2025-12-06 07:12:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
rpcsx/rpcs3/Emu/SysCalls/Modules/cellFont.cpp

651 lines
22 KiB
C++
Raw Normal View History

Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
#include "stdafx.h"
Seperate ConLog.h and ConLogFrame.h (for now only seperate headers) make precompiled header slimmer under Linux to increase CI and dev-machine build-times make sure unused modules don't compile add unused modules to the VS project to easier keep track of them
2014-06-02 19:27:24 +02:00
#include "Emu/Memory/Memory.h"
#include "Emu/SysCalls/Modules.h"
Include clearing
2014-08-23 22:40:04 +02:00
#include "stblib/stb_truetype.h"
Seperate ConLog.h and ConLogFrame.h (for now only seperate headers) make precompiled header slimmer under Linux to increase CI and dev-machine build-times make sure unused modules don't compile add unused modules to the VS project to easier keep track of them
2014-06-02 19:27:24 +02:00
#include "Emu/FS/vfsFile.h"
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
#include "cellFont.h"
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
//void cellFont_init();
//void cellFont_load();
//void cellFont_unload();
//Module cellFont(0x0019, cellFont_init, cellFont_load, cellFont_unload);
Module *cellFont = nullptr;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
RSX Bugfixes and plugging memory leaks BUGFIX: Add break after NV4097_SET_TEXTURE_BORDER_COLOR in RSXThread.cpp BUGFIX: Fix parameters passed to RSXTexture::SetControl3 (they were being passed in reverse order) BUGFIX: Remove invalid, non-sensical call to glPixelStorei in GLGSRender.h BUGFIX: Fix signed/unsigned comparison compiler warnings in GLGSRender.h CHANGE: Make GLFragmentProgram::Decompiler synchronous by default CHANGE: Update wxWidgets submodule to latest commit BUGFIX: Fix several memory leaks ADDED: Created a new MSVC debug configuration to output locations of allocations that end up leaking after the program is closed. BUGFIX: Fix the stupid PadHandler crash due to the lack of a virtual d'tor
2014-04-15 16:12:15 +02:00
CCellFontInternal* s_fontInternalInstance = nullptr;
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
// Functions
int cellFontInitializeWithRevision(u64 revisionFlags, mem_ptr_t<CellFontConfig> config)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontInitializeWithRevision(revisionFlags=0x%llx, config=0x%x)", revisionFlags, config.GetAddr());
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
if (s_fontInternalInstance->m_bInitialized)
return CELL_FONT_ERROR_ALREADY_INITIALIZED;
if (config->FileCache.size < 24)
return CELL_FONT_ERROR_INVALID_PARAMETER;
if (config->flags != 0)
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontInitializeWithRevision: Unknown flags (0x%x)", config->flags);
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
s_fontInternalInstance->m_buffer_addr = config->FileCache.buffer_addr;
s_fontInternalInstance->m_buffer_size = config->FileCache.size;
s_fontInternalInstance->m_userFontEntrys_addr = config->userFontEntrys_addr;
s_fontInternalInstance->m_userFontEntryMax = config->userFontEntryMax;
s_fontInternalInstance->m_bInitialized = true;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontGetRevisionFlags(mem64_t revisionFlags)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontInit(mem_ptr_t<CellFontConfig> config)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontInit(config=0x%x)", config.GetAddr());
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Implemented vm::var. MemoryAllocator replaced with vm::var
2014-07-31 18:08:02 +02:00
vm::var<u64> revisionFlags;
revisionFlags.value() = 0;
cellFontGetRevisionFlags(revisionFlags.addr());
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
return cellFontInitializeWithRevision(revisionFlags, config.GetAddr());
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontEnd()
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontEnd()");
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
if (!s_fontInternalInstance->m_bInitialized)
return CELL_FONT_ERROR_UNINITIALIZED;
s_fontInternalInstance->m_bInitialized = false;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
s32 cellFontSetFontsetOpenMode(u32 openMode)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontSetFontsetOpenMode(openMode=0x%x)", openMode);
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
int cellFontOpenFontMemory(mem_ptr_t<CellFontLibrary> library, u32 fontAddr, u32 fontSize, u32 subNum, u32 uniqueId, mem_ptr_t<CellFont> font)
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontOpenFontMemory(library_addr=0x%x, fontAddr=0x%x, fontSize=%d, subNum=%d, uniqueId=%d, font_addr=0x%x)",
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
library.GetAddr(), fontAddr, fontSize, subNum, uniqueId, font.GetAddr());
if (!s_fontInternalInstance->m_bInitialized)
return CELL_FONT_ERROR_UNINITIALIZED;
Include clearing
2014-08-23 22:40:04 +02:00
font->stbfont = (stbtt_fontinfo*)((u8*)&(font->stbfont) + sizeof(void*)); // hack: use next bytes of the struct
if (!stbtt_InitFont(font->stbfont, (unsigned char*)Memory.VirtualToRealAddr(fontAddr), 0))
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
return CELL_FONT_ERROR_FONT_OPEN_FAILED;
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
Fix some int/ptr comparisons.
2014-04-28 05:34:33 +02:00
font->renderer_addr = 0;
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
font->fontdata_addr = fontAddr;
font->origin = CELL_FONT_OPEN_MEMORY;
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
return CELL_FONT_OK;
}
vm::ptr for u8/char types, mem_list_ptr_t removed
2014-08-31 17:01:48 +02:00
int cellFontOpenFontFile(mem_ptr_t<CellFontLibrary> library, vm::ptr<const char> fontPath, u32 subNum, s32 uniqueId, mem_ptr_t<CellFont> font)
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
{
vm::ptr for u8/char types, mem_list_ptr_t removed
2014-08-31 17:01:48 +02:00
std::string fp(fontPath.get_ptr());
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontOpenFontFile(library_addr=0x%x, fontPath=\"%s\", subNum=%d, uniqueId=%d, font_addr=0x%x)",
replace all instances of wxString with std::string in all cases not directly involved in either the GUI or other wxWidget classes like wxFile
2014-04-01 02:33:55 +02:00
library.GetAddr(), fp.c_str(), subNum, uniqueId, font.GetAddr());
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
log fixes (to wx_str())
2014-02-13 17:59:13 +01:00
vfsFile f(fp);
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
if (!f.IsOpened())
return CELL_FONT_ERROR_FONT_OPEN_FAILED;
Some warnings fixed
2014-08-30 22:41:01 +02:00
u32 fileSize = (u32)f.GetSize();
u32 bufferAddr = (u32)Memory.Alloc(fileSize, 1); // Freed in cellFontCloseFont
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
f.Read(Memory.VirtualToRealAddr(bufferAddr), fileSize);
int ret = cellFontOpenFontMemory(library.GetAddr(), bufferAddr, fileSize, subNum, uniqueId, font.GetAddr());
font->origin = CELL_FONT_OPEN_FONT_FILE;
return ret;
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontOpenFontset(mem_ptr_t<CellFontLibrary> library, mem_ptr_t<CellFontType> fontType, mem_ptr_t<CellFont> font)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontOpenFontset(library_addr=0x%x, fontType_addr=0x%x, font_addr=0x%x)",
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
library.GetAddr(), fontType.GetAddr(), font.GetAddr());
if (!s_fontInternalInstance->m_bInitialized)
return CELL_FONT_ERROR_UNINITIALIZED;
if (fontType->map != CELL_FONT_MAP_UNICODE)
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontOpenFontset: Only Unicode is supported");
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
std::string file;
This is squashed commit from the follwing commits: * various changes to make it compile with clang * don't compile recompiler on linux yet but make the CMake build include asmjit already * add experimental travis bot * modify yml to match * try to build and install wxWidgets, since it's not in the travis repo * use newer cmake version for travis * add keys with sudo * use sudo for all apt- commands * Add additional dependencies * use version approriate gcc flags for c++11 * try clang, gcc too old * set c++0x flag for clang * use gcc 4.8 * use gcc 4.8 and add the repo for it * use gcc 4.8 even for clang to get newer headers * fix ambiguous conversions * add lz from hykem and more explicit conversions from be for x86 * more switch disambiguation * more switch disambiguation * add additional unigned int casts to deal with be_t conversion ambiguity * remove unnecessary clang flag * add lz.cpp to vcxproj and cast to u32 instead of unsigned int * correct temporaray #ifdefs
2014-04-25 18:57:00 +02:00
switch((u32)fontType->type)
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
{
case CELL_FONT_TYPE_RODIN_SANS_SERIF_LATIN: file = "/dev_flash/data/font/SCE-PS3-RD-R-LATIN.TTF"; break;
case CELL_FONT_TYPE_RODIN_SANS_SERIF_LIGHT_LATIN: file = "/dev_flash/data/font/SCE-PS3-RD-L-LATIN.TTF"; break;
case CELL_FONT_TYPE_RODIN_SANS_SERIF_BOLD_LATIN: file = "/dev_flash/data/font/SCE-PS3-RD-B-LATIN.TTF"; break;
case CELL_FONT_TYPE_RODIN_SANS_SERIF_LATIN2: file = "/dev_flash/data/font/SCE-PS3-RD-R-LATIN2.TTF"; break;
case CELL_FONT_TYPE_RODIN_SANS_SERIF_LIGHT_LATIN2: file = "/dev_flash/data/font/SCE-PS3-RD-L-LATIN2.TTF"; break;
case CELL_FONT_TYPE_RODIN_SANS_SERIF_BOLD_LATIN2: file = "/dev_flash/data/font/SCE-PS3-RD-B-LATIN2.TTF"; break;
case CELL_FONT_TYPE_MATISSE_SERIF_LATIN: file = "/dev_flash/data/font/SCE-PS3-MT-R-LATIN.TTF"; break;
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_JAPANESE: file = "/dev_flash/data/font/SCE-PS3-NR-R-JPN.TTF"; break;
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_LIGHT_JAPANESE: file = "/dev_flash/data/font/SCE-PS3-NR-L-JPN.TTF"; break;
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_BOLD_JAPANESE: file = "/dev_flash/data/font/SCE-PS3-NR-B-JPN.TTF"; break;
case CELL_FONT_TYPE_YD_GOTHIC_KOREAN: file = "/dev_flash/data/font/SCE-PS3-YG-R-KOR.TTF"; break;
case CELL_FONT_TYPE_SEURAT_MARU_GOTHIC_LATIN: file = "/dev_flash/data/font/SCE-PS3-SR-R-LATIN.TTF"; break;
case CELL_FONT_TYPE_SEURAT_MARU_GOTHIC_LATIN2: file = "/dev_flash/data/font/SCE-PS3-SR-R-LATIN2.TTF"; break;
case CELL_FONT_TYPE_VAGR_SANS_SERIF_ROUND: file = "/dev_flash/data/font/SCE-PS3-VR-R-LATIN.TTF"; break;
case CELL_FONT_TYPE_VAGR_SANS_SERIF_ROUND_LATIN2: file = "/dev_flash/data/font/SCE-PS3-VR-R-LATIN2.TTF"; break;
case CELL_FONT_TYPE_SEURAT_MARU_GOTHIC_JAPANESE: file = "/dev_flash/data/font/SCE-PS3-SR-R-JPN.TTF"; break;
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_JP_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_LATIN_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_RODIN_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_RODIN2_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_YG_RODIN2_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_YG_DFHEI5_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_YG_DFHEI5_RODIN_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_YG_DFHEI5_RODIN2_SET:
case CELL_FONT_TYPE_DFHEI5_GOTHIC_YG_NEWRODIN_TCH_SET:
case CELL_FONT_TYPE_DFHEI5_GOTHIC_YG_NEWRODIN_RODIN_TCH_SET:
case CELL_FONT_TYPE_DFHEI5_GOTHIC_YG_NEWRODIN_RODIN2_TCH_SET:
case CELL_FONT_TYPE_DFHEI5_GOTHIC_YG_NEWRODIN_SCH_SET:
case CELL_FONT_TYPE_DFHEI5_GOTHIC_YG_NEWRODIN_RODIN_SCH_SET:
case CELL_FONT_TYPE_DFHEI5_GOTHIC_YG_NEWRODIN_RODIN2_SCH_SET:
case CELL_FONT_TYPE_SEURAT_MARU_GOTHIC_RSANS_SET:
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_RSANS_SET:
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_JP_SET:
case CELL_FONT_TYPE_SEURAT_MARU_GOTHIC_YG_DFHEI5_RSANS_SET:
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_YG_DFHEI5_RSANS_SET:
case CELL_FONT_TYPE_VAGR_SEURAT_CAPIE_MARU_GOTHIC_RSANS_SET:
case CELL_FONT_TYPE_VAGR_SEURAT_CAPIE_MARU_GOTHIC_YG_DFHEI5_RSANS_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_YG_LIGHT_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_YG_RODIN_LIGHT_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_YG_RODIN2_LIGHT_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_RODIN_LIGHT_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_RODIN2_LIGHT_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_YG_BOLD_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_YG_RODIN_BOLD_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_YG_RODIN2_BOLD_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_RODIN_BOLD_SET:
case CELL_FONT_TYPE_NEWRODIN_GOTHIC_RODIN2_BOLD_SET:
case CELL_FONT_TYPE_SEURAT_MARU_GOTHIC_RSANS2_SET:
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_RSANS2_SET:
case CELL_FONT_TYPE_SEURAT_MARU_GOTHIC_YG_DFHEI5_RSANS2_SET:
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_YG_DFHEI5_RSANS2_SET:
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_YG_DFHEI5_VAGR2_SET:
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_VAGR2_SET:
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontOpenFontset: fontType->type = %d not supported yet. RD-R-LATIN.TTF will be used instead.", fontType->type);
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
file = "/dev_flash/data/font/SCE-PS3-RD-R-LATIN.TTF";
break;
default:
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontOpenFontset: fontType->type = %d not supported.", fontType->type);
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
return CELL_FONT_ERROR_NO_SUPPORT_FONTSET;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
vm::ptr for u8/char types, mem_list_ptr_t removed
2014-08-31 17:01:48 +02:00
vm::var<const char> f((u32)file.length() + 1, 1);
Memory.WriteString(f.addr(), file);
int ret = cellFontOpenFontFile(library.GetAddr(), vm::ptr<const char>::make(f.addr()), 0, 0, font.GetAddr()); //TODO: Find the correct values of subNum, uniqueId
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
font->origin = CELL_FONT_OPEN_FONTSET;
RSX Debugger & cellFont improved RSX Debugger: *Better way to add name:value pairs to the tabs. *Added some entries in the Settings/Texture/Lightning tabs. *Experimental DisAsm. *Support for previewing RGB textures (buggy!). *Minor cleanups and improvements cellFont: *Added cellFontOpenFontMemory, cellFontOpenFontFile, cellFontOpenFontset. They still need some modifications (e.g. bind these functions to stblib/stb_truetype.h).
2014-01-02 02:13:08 +01:00
return ret;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontOpenFontInstance(mem_ptr_t<CellFont> openedFont, mem_ptr_t<CellFont> font)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontOpenFontInstance(openedFont=0x%x, font=0x%x)", openedFont.GetAddr(), font.GetAddr());
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
font->renderer_addr = openedFont->renderer_addr;
font->scale_x = openedFont->scale_x;
font->scale_y = openedFont->scale_y;
font->slant = openedFont->slant;
font->stbfont = openedFont->stbfont;
font->origin = CELL_FONT_OPEN_FONT_INSTANCE;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
s32 cellFontSetFontOpenMode(u32 openMode)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontSetFontOpenMode(openMode=0x%x)", openMode);
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontCreateRenderer(mem_ptr_t<CellFontLibrary> library, mem_ptr_t<CellFontRendererConfig> config, mem_ptr_t<CellFontRenderer> Renderer)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontCreateRenderer(library_addr=0x%x, config_addr=0x%x, Renderer_addr=0x%x)",
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
library.GetAddr(), config.GetAddr(), Renderer.GetAddr());
if (!s_fontInternalInstance->m_bInitialized)
return CELL_FONT_ERROR_UNINITIALIZED;
//Write data in Renderer
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
void cellFontRenderSurfaceInit(mem_ptr_t<CellFontRenderSurface> surface, u32 buffer_addr, s32 bufferWidthByte, s32 pixelSizeByte, s32 w, s32 h)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontRenderSurfaceInit(surface_addr=0x%x, buffer_addr=0x%x, bufferWidthByte=%d, pixelSizeByte=%d, w=%d, h=%d)",
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
surface.GetAddr(), buffer_addr, bufferWidthByte, pixelSizeByte, w, h);
surface->buffer_addr = buffer_addr;
surface->widthByte = bufferWidthByte;
surface->pixelSizeByte = pixelSizeByte;
surface->width = w;
surface->height = h;
TextureBorderColor & cellFont problems fixed * Fixed tabs/spaces problem in cellSysutil.h too. NOTE: The problem with cellFont (crash on line 604) has been fixed, but for a high price: There is now a huge memory leak when a NULL pointer is passed to cellFontRenderSurfaceInit.
2014-03-18 17:45:26 +01:00
if (!buffer_addr)
Some warnings fixed
2014-08-30 22:41:01 +02:00
surface->buffer_addr = (u32)Memory.Alloc(bufferWidthByte * h, 1); // TODO: Huge memory leak
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
}
void cellFontRenderSurfaceSetScissor(mem_ptr_t<CellFontRenderSurface> surface, s32 x0, s32 y0, s32 w, s32 h)
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontRenderSurfaceSetScissor(surface_addr=0x%x, x0=%d, y0=%d, w=%d, h=%d)",
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
surface.GetAddr(), x0, y0, w, h);
surface->Scissor.x0 = x0;
surface->Scissor.y0 = y0;
surface->Scissor.x1 = w;
surface->Scissor.y1 = h;
}
int cellFontSetScalePixel(mem_ptr_t<CellFont> font, float w, float h)
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontSetScalePixel(font_addr=0x%x, w=%f, h=%f)", font.GetAddr(), w, h);
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
font->scale_x = w;
font->scale_y = h;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontGetHorizontalLayout(mem_ptr_t<CellFont> font, mem_ptr_t<CellFontHorizontalLayout> layout)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontGetHorizontalLayout(font_addr=0x%x, layout_addr=0x%x)",
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
font.GetAddr(), layout.GetAddr());
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
int ascent, descent, lineGap;
Include clearing
2014-08-23 22:40:04 +02:00
float scale = stbtt_ScaleForPixelHeight(font->stbfont, font->scale_y);
stbtt_GetFontVMetrics(font->stbfont, &ascent, &descent, &lineGap);
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
layout->baseLineY = ascent * scale;
layout->lineHeight = (ascent-descent+lineGap) * scale;
layout->effectHeight = lineGap * scale;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontBindRenderer(mem_ptr_t<CellFont> font, mem_ptr_t<CellFontRenderer> renderer)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontBindRenderer(font_addr=0x%x, renderer_addr=0x%x)",
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
font.GetAddr(), renderer.GetAddr());
IsGood() check elimination Reasons: 1) It's unsafe - we cannot guarantee that address is still good while it is used. 2) It's wrong in many modules which are usually just compare pointer with zero.
2014-08-05 12:18:22 +02:00
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
if (font->renderer_addr)
return CELL_FONT_ERROR_RENDERER_ALREADY_BIND;
font->renderer_addr = renderer.GetAddr();
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontUnbindRenderer(mem_ptr_t<CellFont> font)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontBindRenderer(font_addr=0x%x)", font.GetAddr());
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
if (!font->renderer_addr)
return CELL_FONT_ERROR_RENDERER_UNBIND;
Fix some int/ptr comparisons.
2014-04-28 05:34:33 +02:00
font->renderer_addr = 0;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontDestroyRenderer()
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
int cellFontSetupRenderScalePixel(mem_ptr_t<CellFont> font, float w, float h)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontSetupRenderScalePixel(font_addr=0x%x, w=%f, h=%f)", font.GetAddr(), w, h);
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
if (!font->renderer_addr)
return CELL_FONT_ERROR_RENDERER_UNBIND;
// TODO: ?
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
int cellFontGetRenderCharGlyphMetrics(mem_ptr_t<CellFont> font, u32 code, mem_ptr_t<CellFontGlyphMetrics> metrics)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontGetRenderCharGlyphMetrics(font_addr=0x%x, code=0x%x, metrics_addr=0x%x)",
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
font.GetAddr(), code, metrics.GetAddr());
if (!font->renderer_addr)
return CELL_FONT_ERROR_RENDERER_UNBIND;
// TODO: ?
return CELL_FONT_OK;
}
int cellFontRenderCharGlyphImage(mem_ptr_t<CellFont> font, u32 code, mem_ptr_t<CellFontRenderSurface> surface, float x, float y, mem_ptr_t<CellFontGlyphMetrics> metrics, mem_ptr_t<CellFontImageTransInfo> transInfo)
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontRenderCharGlyphImage(font_addr=0x%x, code=0x%x, surface_addr=0x%x, x=%f, y=%f, metrics_addr=0x%x, trans_addr=0x%x)",
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
font.GetAddr(), code, surface.GetAddr(), x, y, metrics.GetAddr(), transInfo.GetAddr());
if (!font->renderer_addr)
return CELL_FONT_ERROR_RENDERER_UNBIND;
// Render the character
int width, height, xoff, yoff;
Include clearing
2014-08-23 22:40:04 +02:00
float scale = stbtt_ScaleForPixelHeight(font->stbfont, font->scale_y);
unsigned char* box = stbtt_GetCodepointBitmap(font->stbfont, scale, scale, code, &width, &height, &xoff, &yoff);
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
if (!box) return CELL_OK;
// Get the baseLineY value
int baseLineY;
int ascent, descent, lineGap;
Include clearing
2014-08-23 22:40:04 +02:00
stbtt_GetFontVMetrics(font->stbfont, &ascent, &descent, &lineGap);
Some warnings fixed
2014-08-30 22:41:01 +02:00
baseLineY = (int)((float)ascent * scale); // ???
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
// Move the rendered character to the surface
unsigned char* buffer = (unsigned char*)Memory.VirtualToRealAddr(surface->buffer_addr);
Fixed few warnings and typos
2014-02-14 01:30:15 +01:00
for (u32 ypos = 0; ypos < (u32)height; ypos++){
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
if ((u32)y + ypos + yoff + baseLineY >= surface->height)
break;
Fixed few warnings and typos
2014-02-14 01:30:15 +01:00
for (u32 xpos = 0; xpos < (u32)width; xpos++){
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
if ((u32)x + xpos >= surface->width)
break;
// TODO: There are some oddities in the position of the character in the final buffer
buffer[((int)y + ypos + yoff + baseLineY)*surface->width + (int)x+xpos] = box[ypos*width + xpos];
}
}
stbtt_FreeBitmap(box, 0);
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
return CELL_FONT_OK;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontEndLibrary()
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontSetEffectSlant(mem_ptr_t<CellFont> font, float slantParam)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontSetEffectSlant(font_addr=0x%x, slantParam=%f)", font.GetAddr(), slantParam);
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
IsGood() check elimination Reasons: 1) It's unsafe - we cannot guarantee that address is still good while it is used. 2) It's wrong in many modules which are usually just compare pointer with zero.
2014-08-05 12:18:22 +02:00
if (slantParam < -1.0 || slantParam > 1.0)
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
return CELL_FONT_ERROR_INVALID_PARAMETER;
font->slant = slantParam;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
Some warnings fixed
2014-08-30 22:41:01 +02:00
int cellFontGetEffectSlant(mem_ptr_t<CellFont> font, mem_ptr_t<be_t<float>> slantParam)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontSetEffectSlant(font_addr=0x%x, slantParam_addr=0x%x)", font.GetAddr(), slantParam.GetAddr());
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Some warnings fixed
2014-08-30 22:41:01 +02:00
*slantParam = font->slant;
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
return CELL_FONT_OK;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontGetFontIdCode(mem_ptr_t<CellFont> font, u32 code, mem32_t fontId, mem32_t fontCode)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
IsGood() check elimination Reasons: 1) It's unsafe - we cannot guarantee that address is still good while it is used. 2) It's wrong in many modules which are usually just compare pointer with zero.
2014-08-05 12:18:22 +02:00
cellFont->Todo("cellFontGetFontIdCode(font_addr=0x%x, code=0x%x, fontId_addr=0x%x, fontCode_addr=0x%x",
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
font.GetAddr(), code, fontId.GetAddr(), fontCode.GetAddr());
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
// TODO: ?
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
int cellFontCloseFont(mem_ptr_t<CellFont> font)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontCloseFont(font_addr=0x%x)", font.GetAddr());
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
if (font->origin == CELL_FONT_OPEN_FONTSET ||
font->origin == CELL_FONT_OPEN_FONT_FILE ||
font->origin == CELL_FONT_OPEN_MEMORY)
Memory.Free(font->fontdata_addr);
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontGetCharGlyphMetrics(mem_ptr_t<CellFont> font, u32 code, mem_ptr_t<CellFontGlyphMetrics> metrics)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Log("cellFontGetCharGlyphMetrics(font_addr=0x%x, code=0x%x, metrics_addr=0x%x",
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
font.GetAddr(), code, metrics.GetAddr());
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
int x0, y0, x1, y1;
int advanceWidth, leftSideBearing;
Include clearing
2014-08-23 22:40:04 +02:00
float scale = stbtt_ScaleForPixelHeight(font->stbfont, font->scale_y);
stbtt_GetCodepointBox(font->stbfont, code, &x0, &y0, &x1, &y1);
stbtt_GetCodepointHMetrics(font->stbfont, code, &advanceWidth, &leftSideBearing);
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
// TODO: Add the rest of the information
metrics->width = (x1-x0) * scale;
metrics->height = (y1-y0) * scale;
metrics->Horizontal.bearingX = (float)leftSideBearing * scale;
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
metrics->Horizontal.bearingY = 0;
cellFont rendering functions -Now, all the games using rendering text using cellFontRenderCharGlyphImage and all the related functions should work, or at least don't crash. -There are still issues with the character position on surface, and in some cases, it renders the text with a different font than the one the game specified. A lot of cellFont stuff is still missing or may be not properly implemented. -For games using system-embedded fontsets you have to find a *legal* way to copy the .TTF files from your PS3 into dev_flash/data/font.
2014-02-09 12:07:50 +01:00
metrics->Horizontal.advance = (float)advanceWidth * scale;
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
metrics->Vertical.bearingX = 0;
metrics->Vertical.bearingY = 0;
metrics->Vertical.advance = 0;
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
int cellFontGraphicsSetFontRGBA()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
int cellFontOpenFontsetOnMemory()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
int cellFontGraphicsSetScalePixel()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
int cellFontGraphicsGetScalePixel()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
int cellFontSetEffectWeight()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
int cellFontGlyphSetupVertexesGlyph()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
int cellFontGetVerticalLayout()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
int cellFontGetRenderCharGlyphMetricsVertical()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontSetScalePoint()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontSetupRenderEffectSlant()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontGraphicsSetLineRGBA()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontGraphicsSetDrawType()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontEndGraphics()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontGraphicsSetupDrawContext()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontSetupRenderEffectWeight()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontGlyphGetOutlineControlDistance()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontGlyphGetVertexesGlyphSize()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontGenerateCharGlyph()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontDeleteGlyph()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
int cellFontExtend(u32 a1, u32 a2, u32 a3)
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->Warning("cellFontExtend(a1=0x%x, a2=0x%x, a3=0x%x)", a1, a2, a3);
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
//In a test I did: a1=0xcfe00000, a2=0x0, a3=(pointer to something)
if (a1 == 0xcfe00000)
{
if (a2 != 0 || a3 == 0)
{
//Something happens
}
if (Memory.Read32(a3) == 0)
{
//Something happens
}
//Something happens
}
//Something happens?
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontRenderCharGlyphImageVertical()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontSetResolutionDpi()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.
2013-11-25 12:49:55 +01:00
int cellFontGetCharGlyphMetricsVertical()
{
UNIMPLEMENTED_FUNC(cellFont);
return CELL_FONT_OK;
}
void cellFont_init()
{
initial start to eliminate static func init, not compilable atm move module initialization into a module manager, still has some issues like stopping not working and debug crashing add #idef 0 to modules that aren't in the windows project don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable add secondary project, no real use for it now add some memleak config to the emucore and add asmjit path to rpcs3 small rebase error fixed to get it to compile again add filters for emucore re-add the module manager and static file WIP commit, linker errors abound some more abstraction layer stuff fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers rebasing fix memset undefined and re() usage of se_t before declaration Add wxGUI define by default for cmake builds fix copy constructors of Datetime header fix copy constructors of other wx interface classes remove static declarations of global variables make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls remove duplicate definition for FromUTF8 and ToUTF8 temp changes
2014-05-02 08:30:32 +02:00
cellFont->AddFunc(0x25c107e6, cellFontInit);
cellFont->AddFunc(0x6bf6f832, cellFontSetFontsetOpenMode);
cellFont->AddFunc(0x6cfada83, cellFontSetFontOpenMode);
cellFont->AddFunc(0x042e74e3, cellFontCreateRenderer);
cellFont->AddFunc(0x1387c45c, cellFontGetHorizontalLayout);
cellFont->AddFunc(0x21ebb248, cellFontDestroyRenderer);
cellFont->AddFunc(0x227e1e3c, cellFontSetupRenderScalePixel);
cellFont->AddFunc(0x29329541, cellFontOpenFontInstance);
cellFont->AddFunc(0x297f0e93, cellFontSetScalePixel);
cellFont->AddFunc(0x2da9fd9d, cellFontGetRenderCharGlyphMetrics);
cellFont->AddFunc(0x40d40544, cellFontEndLibrary);
cellFont->AddFunc(0x66a23100, cellFontBindRenderer);
cellFont->AddFunc(0x7ab47f7e, cellFontEnd);
cellFont->AddFunc(0x8657c8f5, cellFontSetEffectSlant);
cellFont->AddFunc(0xe16e679a, cellFontGetEffectSlant);
cellFont->AddFunc(0x88be4799, cellFontRenderCharGlyphImage);
cellFont->AddFunc(0x90b9465e, cellFontRenderSurfaceInit);
cellFont->AddFunc(0x98ac5524, cellFontGetFontIdCode);
cellFont->AddFunc(0xa885cc9b, cellFontOpenFontset);
cellFont->AddFunc(0xb276f1f6, cellFontCloseFont);
cellFont->AddFunc(0xb422b005, cellFontRenderSurfaceSetScissor);
cellFont->AddFunc(0xd8eaee9f, cellFontGetCharGlyphMetrics);
cellFont->AddFunc(0xf03dcc29, cellFontInitializeWithRevision);
cellFont->AddFunc(0x061049ad, cellFontGraphicsSetFontRGBA);
cellFont->AddFunc(0x073fa321, cellFontOpenFontsetOnMemory);
cellFont->AddFunc(0x0a7306a4, cellFontOpenFontFile);
cellFont->AddFunc(0x16322df1, cellFontGraphicsSetScalePixel);
cellFont->AddFunc(0x2388186c, cellFontGraphicsGetScalePixel);
cellFont->AddFunc(0x25253fe4, cellFontSetEffectWeight);
cellFont->AddFunc(0x53f529fe, cellFontGlyphSetupVertexesGlyph);
cellFont->AddFunc(0x698897f8, cellFontGetVerticalLayout);
cellFont->AddFunc(0x700e6223, cellFontGetRenderCharGlyphMetricsVertical);
cellFont->AddFunc(0x70f3e728, cellFontSetScalePoint);
cellFont->AddFunc(0x78d05e08, cellFontSetupRenderEffectSlant);
cellFont->AddFunc(0x7c83bc15, cellFontGraphicsSetLineRGBA);
cellFont->AddFunc(0x87bd650f, cellFontGraphicsSetDrawType);
cellFont->AddFunc(0x8a35c887, cellFontEndGraphics);
cellFont->AddFunc(0x970d4c22, cellFontGraphicsSetupDrawContext);
cellFont->AddFunc(0x9e19072b, cellFontOpenFontMemory);
cellFont->AddFunc(0xa6dc25d1, cellFontSetupRenderEffectWeight);
cellFont->AddFunc(0xa8fae920, cellFontGlyphGetOutlineControlDistance);
cellFont->AddFunc(0xb4d112af, cellFontGlyphGetVertexesGlyphSize);
cellFont->AddFunc(0xc17259de, cellFontGenerateCharGlyph);
cellFont->AddFunc(0xd62f5d76, cellFontDeleteGlyph);
cellFont->AddFunc(0xdee0836c, cellFontExtend);
cellFont->AddFunc(0xe857a0ca, cellFontRenderCharGlyphImageVertical);
cellFont->AddFunc(0xfb3341ba, cellFontSetResolutionDpi);
cellFont->AddFunc(0xfe9a6dd7, cellFontGetCharGlyphMetricsVertical);
cellFont->AddFunc(0xf16379fa, cellFontUnbindRenderer);
cellFont->AddFunc(0xb015a84e, cellFontGetRevisionFlags);
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
}
RSX Bugfixes and plugging memory leaks BUGFIX: Add break after NV4097_SET_TEXTURE_BORDER_COLOR in RSXThread.cpp BUGFIX: Fix parameters passed to RSXTexture::SetControl3 (they were being passed in reverse order) BUGFIX: Remove invalid, non-sensical call to glPixelStorei in GLGSRender.h BUGFIX: Fix signed/unsigned comparison compiler warnings in GLGSRender.h CHANGE: Make GLFragmentProgram::Decompiler synchronous by default CHANGE: Update wxWidgets submodule to latest commit BUGFIX: Fix several memory leaks ADDED: Created a new MSVC debug configuration to output locations of allocations that end up leaking after the program is closed. BUGFIX: Fix the stupid PadHandler crash due to the lack of a virtual d'tor
2014-04-15 16:12:15 +02:00
void cellFont_load()
{
s_fontInternalInstance = new CCellFontInternal();
}
First cellFont functions & minor changes * Edited .gitignore * Moved some functions to cellFontFT. * Now cellFont initializes correctly, but it doesn't render anything yet. There are still several things to change and functions to implement. I will take care of it.
2013-12-09 17:56:04 +01:00
void cellFont_unload()
{
RSX Bugfixes and plugging memory leaks BUGFIX: Add break after NV4097_SET_TEXTURE_BORDER_COLOR in RSXThread.cpp BUGFIX: Fix parameters passed to RSXTexture::SetControl3 (they were being passed in reverse order) BUGFIX: Remove invalid, non-sensical call to glPixelStorei in GLGSRender.h BUGFIX: Fix signed/unsigned comparison compiler warnings in GLGSRender.h CHANGE: Make GLFragmentProgram::Decompiler synchronous by default CHANGE: Update wxWidgets submodule to latest commit BUGFIX: Fix several memory leaks ADDED: Created a new MSVC debug configuration to output locations of allocations that end up leaking after the program is closed. BUGFIX: Fix the stupid PadHandler crash due to the lack of a virtual d'tor
2014-04-15 16:12:15 +02:00
// s_fontInternalInstance->m_bInitialized = false;
// s_fontInternalInstance->m_bFontGcmInitialized = false;
delete s_fontInternalInstance;
This is squashed commit from the follwing commits: * various changes to make it compile with clang * don't compile recompiler on linux yet but make the CMake build include asmjit already * add experimental travis bot * modify yml to match * try to build and install wxWidgets, since it's not in the travis repo * use newer cmake version for travis * add keys with sudo * use sudo for all apt- commands * Add additional dependencies * use version approriate gcc flags for c++11 * try clang, gcc too old * set c++0x flag for clang * use gcc 4.8 * use gcc 4.8 and add the repo for it * use gcc 4.8 even for clang to get newer headers * fix ambiguous conversions * add lz from hykem and more explicit conversions from be for x86 * more switch disambiguation * more switch disambiguation * add additional unigned int casts to deal with be_t conversion ambiguity * remove unnecessary clang flag * add lz.cpp to vcxproj and cast to u32 instead of unsigned int * correct temporaray #ifdefs
2014-04-25 18:57:00 +02:00
}
Reference in a new issue Copy permalink