birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AtomLyIntegration

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
monroegm-disable-blank-issue-2
Esteban Papp 4 years ago
parent f07d00df65
commit 6ce0874295
18 changed files with 12 additions and 46 deletions
Show Stats Download Patch File Download Diff File

1
Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
Unescape Escape View File

@ -13,6 +13,7 @@
#include <Cry_Vector2.h>
#include <IXml.h>
#include <CryCommon/IFont.h>
#include <AzCore/std/containers/map.h>
#include <AzCore/std/smart_ptr/weak_ptr.h>
#include <AzCore/std/parallel/shared_mutex.h>

29
Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
Unescape Escape View File

@ -1,29 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include <vector>
#define ATOMFONT_EXPORTS
#include <platform.h>
#include <IFont.h>
#include <ILog.h>
#include <IConsole.h>
#include <IRenderer.h>
#include <CrySizer.h>
#define USE_NULLFONT
#if defined(DEDICATED_SERVER)
#define USE_NULLFONT_ALWAYS 1
#endif

2
Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h
Unescape Escape View File

@ -8,9 +8,9 @@
// Description : Dummy font implementation (dedicated server)
#pragma once
#define USE_NULLFONT
#if defined(USE_NULLFONT)

2
Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h
Unescape Escape View File

@ -18,6 +18,8 @@
#include <CryCommon/Cry_Math.h>
#include <CryCommon/Cry_Color.h>
#include <CryCommon/CryString.h>
#include <CryCommon/VertexFormats.h>
#include <CryCommon/IRenderer.h>
#include "AtomFont.h"
#include <AzCore/std/parallel/mutex.h>

2
Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h
Unescape Escape View File

@ -13,6 +13,8 @@
#include <AzCore/std/smart_ptr/unique_ptr.h>
#include <AtomLyIntegration/AtomFont/FontCommon.h>
class ICrySizer;
namespace AZ
{
class GlyphBitmap

1
Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp
Unescape Escape View File

@ -5,7 +5,6 @@
*
*/
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#if !defined(USE_NULLFONT_ALWAYS)
#include <AtomLyIntegration/AtomFont/FontTexture.h>

1
Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp
Unescape Escape View File

@ -5,7 +5,6 @@
*
*/
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#if !defined(USE_NULLFONT_ALWAYS)
#include <AtomLyIntegration/AtomFont/FontTexture.h>

1
Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
Unescape Escape View File

@ -9,7 +9,6 @@
// Description : AtomFont class.
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#if !defined(USE_NULLFONT_ALWAYS)

7
Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp
Unescape Escape View File

@ -5,7 +5,8 @@
*
*/
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#define USE_NULLFONT
#include "AtomFontSystemComponent.h"
#include <AzCore/Serialization/SerializeContext.h>
@ -95,8 +96,8 @@ namespace AZ
#else
// The NULL font implementation must be present for all platforms
// supporting running as a pure dedicated server.
system->GetILog()->LogError("Missing NULL font implementation for dedicated server");
env.pCryFont = NULL;
system.GetILog()->LogError("Missing NULL font implementation for dedicated server");
gEnv->pCryFont = NULL;
#endif
}
else

2
Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp
Unescape Escape View File

@ -8,7 +8,7 @@
// Description : Dummy font implementation (dedicated server)
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#define USE_NULLFONT
#if defined(USE_NULLFONT)

1
Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
Unescape Escape View File

@ -9,7 +9,6 @@
// Description : Font class.
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#if !defined(USE_NULLFONT_ALWAYS)

1
Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp
Unescape Escape View File

@ -9,7 +9,6 @@
// Description : XML parsing to load a font.
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#if !defined(USE_NULLFONT_ALWAYS)

1
Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h
Unescape Escape View File

@ -8,7 +8,6 @@
#pragma once
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#if !defined(USE_NULLFONT_ALWAYS)

1
Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp
Unescape Escape View File

@ -10,7 +10,6 @@
// Purpose:
// - Render a glyph outline into a bitmap using FreeType 2
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#if !defined(USE_NULLFONT_ALWAYS)

1
Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp
Unescape Escape View File

@ -9,7 +9,6 @@
// Purpose:
// - Create and update a texture with the most recently used glyphs
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#if !defined(USE_NULLFONT_ALWAYS)

3
Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp
Unescape Escape View File

@ -9,10 +9,9 @@
// Purpose:
// - Hold a glyph bitmap and blit it to the main texture
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#include <AtomLyIntegration/AtomFont/GlyphBitmap.h>
#include <math.h>
#include <CryCommon/Cry_Math.h>
//-------------------------------------------------------------------------------------------------
AZ::GlyphBitmap::GlyphBitmap()

1
Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp
Unescape Escape View File

@ -9,7 +9,6 @@
// Purpose:
// - Manage and cache glyphs, retrieving them from the renderer as needed
#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
#if !defined(USE_NULLFONT_ALWAYS)

1
Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake
Unescape Escape View File

@ -28,5 +28,4 @@ set(FILES
Include/AtomLyIntegration/AtomFont/GlyphCache.h
Include/AtomLyIntegration/AtomFont/AtomNullFont.h
Include/AtomLyIntegration/AtomFont/resource.h
Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
)

Write Preview
Loading…
Cancel
Save