History

move static members of ResourceManager into DependencyManager

ZappoMan committed 11 years ago

Commit 4061e141 parent fe3f01b3 files · +39 −14Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+7−0
@@ -73,6 +73,7 @@ · 72 unmodified lines
73#include <PhysicsEngine.h>73#include <PhysicsEngine.h>
74#include <ProgramObject.h>74#include <ProgramObject.h>
75#include <ResourceCache.h>75#include <ResourceCache.h>
76#include <ScriptCache.h>
76#include <SettingHandle.h>77#include <SettingHandle.h>
77#include <SoundCache.h>78#include <SoundCache.h>
78#include <TextRenderer.h>79#include <TextRenderer.h>
@@ -188,6 +189,7 @@ bool setupEssentials(int& argc, char** argv) { · 109 unmodified lines
188 auto jsConsole = DependencyManager::set<StandAloneJSConsole>();189 auto jsConsole = DependencyManager::set<StandAloneJSConsole>();
189 auto dialogsManager = DependencyManager::set<DialogsManager>();190 auto dialogsManager = DependencyManager::set<DialogsManager>();
190 auto bandwidthRecorder = DependencyManager::set<BandwidthRecorder>();191 auto bandwidthRecorder = DependencyManager::set<BandwidthRecorder>();
192 auto resouceCacheSharedItems = DependencyManager::set<ResouceCacheSharedItems>();
191#if defined(Q_OS_MAC) || defined(Q_OS_WIN)193#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
192 auto speechRecognizer = DependencyManager::set<SpeechRecognizer>();194 auto speechRecognizer = DependencyManager::set<SpeechRecognizer>();
193#endif195#endif
@@ -514,6 +516,11 @@ Application::~Application() { · 320 unmodified lines
514 _myAvatar = NULL;516 _myAvatar = NULL;
515 517
516 DependencyManager::destroy<GLCanvas>();518 DependencyManager::destroy<GLCanvas>();
519 DependencyManager::destroy<AnimationCache>();
520 DependencyManager::destroy<TextureCache>();
521 DependencyManager::destroy<GeometryCache>();
522 DependencyManager::destroy<ScriptCache>();
523 DependencyManager::destroy<SoundCache>();
517}524}
518 525
519void Application::initializeGL() {526void Application::initializeGL() {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t