mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize code in different files in prepartion for the cinematic camera patch (by Vladislav Belov).

Browse Source 
Refs #3301

This was SVN commit r17575.
This commit is contained in:
Yves
2015-12-30 21:16:35 +00:00
parent 969008befd
commit 8d9cfd66b8
13 changed files with 204 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/GameView.cpp
+5 -5
View File
@@ -20,7 +20,7 @@
#include "GameView.h"
#include "graphics/Camera.h"
#include "graphics/CinemaTrack.h"
#include "graphics/CinemaManager.h"
#include "graphics/ColladaManager.h"
#include "graphics/HFTracer.h"
#include "graphics/LOSTexture.h"
@@ -258,7 +258,7 @@ public:
*/
CLightEnv CachedLightEnv;
CCinemaManager TrackManager;
CCinemaManager CinemaManager;
/**
* Entity for the camera to follow, or INVALID_ENTITY if none.
@@ -395,7 +395,7 @@ CCamera* CGameView::GetCamera()
CCinemaManager* CGameView::GetCinema()
{
return &m->TrackManager;
return &m->CinemaManager;
};
CLOSTexture& CGameView::GetLOSTexture()
@@ -626,9 +626,9 @@ void CGameView::Update(const float deltaRealTime)
if (!g_app_has_focus)
return;
if (m->TrackManager.IsActive() && m->TrackManager.IsPlaying())
if (m->CinemaManager.IsActive() && m->CinemaManager.IsPlaying())
{
if (! m->TrackManager.Update(deltaRealTime))
if (! m->CinemaManager.Update(deltaRealTime))
{
// ResetCamera();
}