mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-05-15 14:32:53 +00:00
add uicontroller code
This commit is contained in:
parent
d329707d75
commit
3b1b282ec7
|
|
@ -294,21 +294,21 @@ set(Common__Source_Files__Tutorial__Tasks
|
|||
source_group("Common\\Source Files\\Tutorial\\Tasks" FILES ${Common__Source_Files__Tutorial__Tasks})
|
||||
|
||||
set(Common__Source_Files__UI
|
||||
# "Common/UI/UI.h"
|
||||
# "Common/UI/UIBitmapFont.cpp"
|
||||
# "Common/UI/UIBitmapFont.h"
|
||||
# "Common/UI/UIController.cpp"
|
||||
# "Common/UI/UIController.h"
|
||||
# "Common/UI/UIFontData.cpp"
|
||||
# "Common/UI/UIFontData.h"
|
||||
# "Common/UI/UIGroup.cpp"
|
||||
# "Common/UI/UIGroup.h"
|
||||
# "Common/UI/UILayer.cpp"
|
||||
# "Common/UI/UILayer.h"
|
||||
# "Common/UI/UIScene.cpp"
|
||||
# "Common/UI/UIScene.h"
|
||||
# "Common/UI/UITTFFont.cpp"
|
||||
# "Common/UI/UITTFFont.h"
|
||||
"Common/UI/UI.h"
|
||||
"Common/UI/UIBitmapFont.cpp"
|
||||
"Common/UI/UIBitmapFont.h"
|
||||
"Common/UI/UIController.cpp"
|
||||
"Common/UI/UIController.h"
|
||||
"Common/UI/UIFontData.cpp"
|
||||
"Common/UI/UIFontData.h"
|
||||
"Common/UI/UIGroup.cpp"
|
||||
"Common/UI/UIGroup.h"
|
||||
"Common/UI/UILayer.cpp"
|
||||
"Common/UI/UILayer.h"
|
||||
"Common/UI/UIScene.cpp"
|
||||
"Common/UI/UIScene.h"
|
||||
"Common/UI/UITTFFont.cpp"
|
||||
"Common/UI/UITTFFont.h"
|
||||
)
|
||||
source_group("Common\\Source Files\\UI" FILES ${Common__Source_Files__UI})
|
||||
|
||||
|
|
|
|||
|
|
@ -1284,7 +1284,7 @@ void UIController::setupCustomDrawGameStateAndMatrices(UIScene *scene, CustomDra
|
|||
|
||||
void UIController::endCustomDrawGameState()
|
||||
{
|
||||
#ifdef __ORBIS__
|
||||
#if defined(__ORBIS__) || defined(__linux__)
|
||||
// TO BE IMPLEMENTED
|
||||
RenderManager.Clear(GL_DEPTH_BUFFER_BIT);
|
||||
#else
|
||||
|
|
@ -2505,7 +2505,7 @@ C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox(UINT
|
|||
|
||||
if (message == -1)
|
||||
{
|
||||
#if defined(_XBOX_ONE) || defined(_WINDOWS64)
|
||||
#if defined(_XBOX_ONE) || defined(_WINDOWS64) || defined(__linux__)
|
||||
// IDS_CONTENT_RESTRICTION doesn't exist on XB1
|
||||
message = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE;
|
||||
#else
|
||||
|
|
@ -3012,4 +3012,4 @@ void UIController::SendTouchInput(unsigned int iPad, unsigned int key, bool bPre
|
|||
}
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue