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

Merge pull request #6756 from aws-lumberyard-dev/cgalvan/RemovedMoreUnusedEditorCodeAndImages

Browse Source 
Removed more unused Editor code and images
This commit is contained in:
Chris Galvan
2022-01-07 16:39:19 -06:00
committed by GitHub
parent b04cecc34d 641f7be041
commit 5e8c1aab29
25 changed files with 0 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/EditorViewportWidget.cpp
-3
View File
@@ -454,9 +454,6 @@ void EditorViewportWidget::Update()
// Render
{
// TODO: Move out this logic to a controller and refactor to work with Atom
ProcessRenderLisneters(m_displayContext);
m_displayContext.Flush2D();
// Post Render Callback
Code/Editor/IEditor.h
-1
View File
@@ -52,7 +52,6 @@ class CUIEnumsDatabase;
struct ISourceControl;
struct IEditorClassFactory;
struct ITransformManipulator;
class IFacialEditor;
class CDialog;
#if defined(AZ_PLATFORM_WINDOWS)
class C3DConnexionDriver;
Code/Editor/Include/IConsoleConnectivity.h
-85
View File
@@ -1,85 +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
*
*/
// Description : Standard interface for console connectivity plugins.
#ifndef CRYINCLUDE_EDITOR_INCLUDE_ICONSOLECONNECTIVITY_H
#define CRYINCLUDE_EDITOR_INCLUDE_ICONSOLECONNECTIVITY_H
#pragma once
//////////////////////////////////////////////////////////////////////////
// Description
// This interface provide access to the console connectivity
// functionality.
//////////////////////////////////////////////////////////////////////////
struct IConsoleConnectivity
: public IUnknown
{
DEFINE_UUID(0x4DAA85E1, 0x8498, 0x402f, 0x9B, 0x85, 0x7F, 0x62, 0x9D, 0x76, 0x79, 0x8A);
//////////////////////////////////////////////////////////////////////////
//TODO: Must add the useful interface here.
//////////////////////////////////////////////////////////////////////////
// Description:
// Checks if a development console is connected to the development PC.
// See Also:
// Arguments:
// Nothing
// Return:
// bool - true if it is connected, false otherwise.
virtual bool IsConnectedToConsole() = 0;
// Description:
// Send a file from the specified local filename to the console platform creating the full path
// as required so it can copy to the remote filename.
// See Also:
// Nothing
// Arguments:
// szLocalFileName - is the local filename from which you want to copy the file.
// szRemoteFilename - is the full path and filename to where you want to copy the file.
// Return:
// bool - true if the copy succeeded, false otherwise.
virtual bool SendFile(const char* szLocalFileName, const char* szRemoteFilename) = 0;
// Description:
// Notifies to the console that a file has been changed, typically uploaded.
// This will be usually called after a SendFile (see above) call, so that the
// system running on the console may decide what to do with this new file.
// Typically the system will have to load or reloads this new file.
// See Also:
// SendFile
// Arguments:
// szRemoteFilename - is the full path and filename in the console of the changed
// file.
// Return:
// bool - true if succeeded sending the notification, false otherwise.
virtual bool NotifyFileChange(const char* szRemoteFilename) = 0;
// Description:
// Gets the the title IP for the connected console .
// Arguments:
// dwConsoleAddressPlaceholder - is the pointer to the placeholder of the variable
// which will contain the title IP of the console.
// Return:
// bool - true if dwConsoleAddressPlaceholder now contains the IP address, else false.
virtual bool GetConsoleAddress(DWORD* dwConsoleAddressPlaceholder) = 0;
//////////////////////////////////////////////////////////////////////////
// IUnknown
//////////////////////////////////////////////////////////////////////////
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) { return E_NOINTERFACE; };
virtual ULONG STDMETHODCALLTYPE AddRef() { return 0; };
virtual ULONG STDMETHODCALLTYPE Release() { return 0; };
//////////////////////////////////////////////////////////////////////////
};
#endif // CRYINCLUDE_EDITOR_INCLUDE_ICONSOLECONNECTIVITY_H
Code/Editor/Include/IFacialEditor.h
-43
View File
@@ -1,43 +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
*
*/
#ifndef CRYINCLUDE_EDITOR_INCLUDE_IFACIALEDITOR_H
#define CRYINCLUDE_EDITOR_INCLUDE_IFACIALEDITOR_H
#pragma once
class IFacialEditor
{
public:
enum EyeType
{
EYE_LEFT,
EYE_RIGHT
};
virtual int GetNumMorphTargets() const = 0;
virtual const char* GetMorphTargetName(int index) const = 0;
virtual void PreviewEffector(int index, float value) = 0;
virtual void ClearAllPreviewEffectors() = 0;
virtual void SetForcedNeckRotation(const Quat& rotation) = 0;
virtual void SetForcedEyeRotation(const Quat& rotation, EyeType eye) = 0;
virtual int GetJoystickCount() const = 0;
virtual const char* GetJoystickName(int joystickIndex) const = 0;
virtual void SetJoystickPosition(int joystickIndex, float x, float y) = 0;
virtual void GetJoystickPosition(int joystickIndex, float& x, float& y) const = 0;
virtual void LoadJoystickFile(const char* filename) = 0;
virtual void LoadCharacter(const char* filename) = 0;
virtual void LoadSequence(const char* filename) = 0;
virtual void SetVideoFrameResolution(int width, int height, int bpp) = 0;
virtual int GetVideoFramePitch() = 0;
virtual void* GetVideoFrameBits() = 0;
virtual void ShowVideoFramePane() = 0;
};
#endif // CRYINCLUDE_EDITOR_INCLUDE_IFACIALEDITOR_H
Code/Editor/Include/IRenderListener.h
-29
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
*
*/
// Description : Interface for rendering custom 3D elements in the main
// render viewport. Particularly usefull for debug geometries.
#ifndef CRYINCLUDE_EDITOR_INCLUDE_IRENDERLISTENER_H
#define CRYINCLUDE_EDITOR_INCLUDE_IRENDERLISTENER_H
#pragma once
struct DisplayContext;
struct IRenderListener
: public IUnknown
{
DEFINE_UUID(0x8D52F857, 0x1027, 0x4346, 0xAC, 0x7B, 0xF6, 0x20, 0xDA, 0x7C, 0xCE, 0x42)
virtual void Render(DisplayContext& rDisplayContext) = 0;
};
#endif // CRYINCLUDE_EDITOR_INCLUDE_IRENDERLISTENER_H
Code/Editor/Include/ITextureDatabaseUpdater.h
-38
View File
@@ -1,38 +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
*
*/
// Description : This file declares the interface used by the texture viewer
// and (implemented first implemented by the Texture Database Creator) to
// syncronize their threads. A thread interace could be useful there.
#ifndef CRYINCLUDE_EDITOR_INCLUDE_ITEXTUREDATABASEUPDATER_H
#define CRYINCLUDE_EDITOR_INCLUDE_ITEXTUREDATABASEUPDATER_H
#pragma once
class CTextureDatabaseItem;
struct ITextureDatabaseUpdater
{
public:
//////////////////////////////////////////////////////////////////////////
// Thread control
virtual void NotifyShutDown() = 0;
virtual void Lock() = 0;
virtual void Unlock() = 0;
virtual void WaitForThread() = 0;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// Data access
virtual CTextureDatabaseItem* GetItem(const char* szAddItem) = 0;
//////////////////////////////////////////////////////////////////////////
};
#endif // CRYINCLUDE_EDITOR_INCLUDE_ITEXTUREDATABASEUPDATER_H
Code/Editor/MainWindow.qrc
-1
View File
@@ -166,7 +166,6 @@
<file>arhitype_tree_01.png</file>
<file>arhitype_tree_02.png</file>
<file>arhitype_tree_03.png</file>
<file>water.png</file>
<file>bmp00005_00.png</file>
<file>bmp00005_01.png</file>
<file>bmp00005_02.png</file>
Code/Editor/Resource.h
-2
View File
@@ -196,7 +196,6 @@
#define ID_FILE_EXPORT_TERRAINAREA 33904
#define ID_FILE_EXPORT_TERRAINAREAWITHOBJECTS 33910
#define ID_FILE_EXPORT_SELECTEDOBJECTS 33911
#define ID_TERRAIN_TIMEOFDAY 33912
#define ID_SPLINE_PREVIOUS_KEY 33916
#define ID_SPLINE_NEXT_KEY 33917
#define ID_SPLINE_FLATTEN_ALL 33918
@@ -290,7 +289,6 @@
#define ID_TV_TRACKS_TOOLBAR_LAST 35183 // for up to 100 "Add Tracks..." dynamically added Track View Track buttons
#define ID_OPEN_TERRAIN_EDITOR 36007
#define ID_OPEN_UICANVASEDITOR 36010
#define ID_TERRAIN_TIMEOFDAYBUTTON 36011
#define ID_OPEN_TERRAINTEXTURE_EDITOR 36012
#define ID_SKINS_REFRESH 36014
#define ID_FILE_GENERATETERRAIN 36016
Code/Editor/TimeOfDay/main-00.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5201dbba6c8114914ed680b04b72a5e18e22c0519a514bcccdc7ae8d32670b4e
size 993
Code/Editor/TimeOfDay/main-01.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48a7250ad41c5e298079ddd13910b58baca2ef592defcc162ccc9df542d28905
size 981
Code/Editor/TimeOfDay/main-02.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:98b9e9abcc54b4f3e6903ad74bb50f364bfe4c8cd9fedc9653a6603d64a1ee0a
size 838
Code/Editor/TimeOfDay/main-03.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1199c834fc8de69f9d7c76e8c7fbd84e9b92713b9f07b513137085e5089432cb
size 857
Code/Editor/TimeOfDay/main-04.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79b44be1dbe5518e06dc8c8823d00462136d39ffe60a32ef4f64dc0712654d33
size 646
Code/Editor/TimeOfDay/main-05.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ea7450c1a278570e2a1dba3a8b4d7d4e5f0d054e8371139ebdb5220c405d355
size 537
Code/Editor/TimeOfDay/main-06.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc73f0720f2ff877aff5c6646938b7fc509a69d92e766fecb9fa010eecadee7b
size 606
Code/Editor/TimeOfDay/main-07.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e63519ed54fc19a4b4a2a38cb2c5f148b7404ac614d4aab039b71fee64cd7425
size 569
Code/Editor/TimeOfDay/main-08.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8742cad4b8f8f5bba59abb9cc028db84de222ed8b393398f6837fea16bb4a1d8
size 563
Code/Editor/TimeOfDay/main-09.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ef85628301b4edc4f858f0988e4f072772be3feb92d27a2ec33b72a27bcee7ff
size 583
Code/Editor/TimeOfDay/main-10.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d17bfbdee6d37566b241adf64241ef47b62145aaac3e9e8f9691d1fb866b5fcb
size 717
Code/Editor/TimeOfDay/main-11.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:98b629abf927bcea41d8857b1761d12a37836471d7106b2f5210337c0ace0d9c
size 1103
Code/Editor/TimeOfDay/main-12.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e949111b33e28834995807cab30ecb58d988a81a2d58fa166117962c85b8e149
size 849
Code/Editor/Viewport.cpp
-68
View File
@@ -30,7 +30,6 @@
#include "Objects/ObjectManager.h"
#include "Util/3DConnexionDriver.h"
#include "PluginManager.h"
#include "Include/IRenderListener.h"
#include "GameEngine.h"
#include "Settings.h"
@@ -227,61 +226,6 @@ void QtViewport::GetDimensions(int* pWidth, int* pHeight) const
}
}
//////////////////////////////////////////////////////////////////////////
void QtViewport::RegisterRenderListener(IRenderListener* piListener)
{
#ifdef _DEBUG
size_t nCount(0);
size_t nTotal(0);
nTotal = m_cRenderListeners.size();
for (nCount = 0; nCount < nTotal; ++nCount)
{
if (m_cRenderListeners[nCount] == piListener)
{
assert(!"Registered the same RenderListener multiple times.");
break;
}
}
#endif //_DEBUG
m_cRenderListeners.push_back(piListener);
}
//////////////////////////////////////////////////////////////////////////
bool QtViewport::UnregisterRenderListener(IRenderListener* piListener)
{
size_t nCount(0);
size_t nTotal(0);
nTotal = m_cRenderListeners.size();
for (nCount = 0; nCount < nTotal; ++nCount)
{
if (m_cRenderListeners[nCount] == piListener)
{
m_cRenderListeners.erase(m_cRenderListeners.begin() + nCount);
return true;
}
}
return false;
}
//////////////////////////////////////////////////////////////////////////
bool QtViewport::IsRenderListenerRegistered(IRenderListener* piListener)
{
size_t nCount(0);
size_t nTotal(0);
nTotal = m_cRenderListeners.size();
for (nCount = 0; nCount < nTotal; ++nCount)
{
if (m_cRenderListeners[nCount] == piListener)
{
return true;
}
}
return false;
}
//////////////////////////////////////////////////////////////////////////
void QtViewport::AddPostRenderer(IPostRenderer* pPostRenderer)
{
@@ -1164,18 +1108,6 @@ bool QtViewport::GetAdvancedSelectModeFlag()
return m_bAdvancedSelectMode;
}
//////////////////////////////////////////////////////////////////////////
void QtViewport::ProcessRenderLisneters(DisplayContext& rstDisplayContext)
{
size_t nCount(0);
size_t nTotal(0);
nTotal = m_cRenderListeners.size();
for (nCount = 0; nCount < nTotal; ++nCount)
{
m_cRenderListeners[nCount]->Render(rstDisplayContext);
}
}
//////////////////////////////////////////////////////////////////////////
#if defined(AZ_PLATFORM_WINDOWS)
// Note: Both CreateAnglesYPR and CreateOrientationYPR were copied verbatim from Cry_Camera.h which has been removed.
Code/Editor/Viewport.h
-13
View File
@@ -43,7 +43,6 @@ class CLayoutViewPane;
class CViewManager;
class CBaseObjectsCache;
struct HitContext;
struct IRenderListener;
class CImageEx;
class QMenu;
@@ -104,10 +103,6 @@ public:
//! Access to view manager.
CViewManager* GetViewManager() const { return m_viewManager; };
virtual void RegisterRenderListener(IRenderListener* piListener) = 0;
virtual bool UnregisterRenderListener(IRenderListener* piListener) = 0;
virtual bool IsRenderListenerRegistered(IRenderListener* piListener) = 0;
virtual void AddPostRenderer(IPostRenderer* pPostRenderer) = 0;
virtual bool RemovePostRenderer(IPostRenderer* pPostRenderer) = 0;
@@ -477,10 +472,6 @@ public:
void ResetCursor() override;
void SetSupplementaryCursorStr(const QString& str) override;
void RegisterRenderListener(IRenderListener* piListener) override;
bool UnregisterRenderListener(IRenderListener* piListener) override;
bool IsRenderListenerRegistered(IRenderListener* piListener) override;
void AddPostRenderer(IPostRenderer* pPostRenderer) override;
bool RemovePostRenderer(IPostRenderer* pPostRenderer) override;
@@ -508,8 +499,6 @@ protected:
void setRenderOverlayVisible(bool);
bool isRenderOverlayVisible() const;
void ProcessRenderLisneters(DisplayContext& rstDisplayContext);
void mousePressEvent(QMouseEvent* event) override;
void mouseReleaseEvent(QMouseEvent* event) override;
void mouseDoubleClickEvent(QMouseEvent* event) override;
@@ -597,8 +586,6 @@ protected:
// Same construction matrix is shared by all viewports.
Matrix34 m_constructionMatrix[LAST_COORD_SYSTEM];
std::vector<IRenderListener*> m_cRenderListeners;
typedef std::vector<_smart_ptr<IPostRenderer> > PostRenderers;
PostRenderers m_postRenderers;
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
Code/Editor/editor_lib_files.cmake
-3
View File
@@ -270,7 +270,6 @@ set(FILES
Include/Command.h
Include/HitContext.h
Include/ICommandManager.h
Include/IConsoleConnectivity.h
Include/IDisplayViewport.h
Include/IEditorClassFactory.h
Include/IEventLoopHook.h
@@ -282,9 +281,7 @@ set(FILES
Include/IObjectManager.h
Include/IPlugin.h
Include/IPreferencesPage.h
Include/IRenderListener.h
Include/ISourceControl.h
Include/ITextureDatabaseUpdater.h
Include/ITransformManipulator.h
Include/IViewPane.h
Include/ObjectEvent.h
Code/Editor/water.png
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4abde33fa9c29e927e403e275979536e7defbb6476eb375e85f847396645953f
size 41419