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
7373 #include <PhysicsEngine.h>
7474 #include <ProgramObject.h>
7575 #include <ResourceCache.h>
76+#include <ScriptCache.h>
7677 #include <SettingHandle.h>
7778 #include <SoundCache.h>
7879 #include <TextRenderer.h>
@@ -188,6 +189,7 @@ bool setupEssentials(int& argc, char** argv) { · 109 unmodified lines
188189 auto jsConsole = DependencyManager::set<StandAloneJSConsole>();
189190 auto dialogsManager = DependencyManager::set<DialogsManager>();
190191 auto bandwidthRecorder = DependencyManager::set<BandwidthRecorder>();
192+ auto resouceCacheSharedItems = DependencyManager::set<ResouceCacheSharedItems>();
191193 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
192194 auto speechRecognizer = DependencyManager::set<SpeechRecognizer>();
193195 #endif
@@ -514,6 +516,11 @@ Application::~Application() { · 320 unmodified lines
514516 _myAvatar = NULL;
515517
516518 DependencyManager::destroy<GLCanvas>();
519+ DependencyManager::destroy<AnimationCache>();
520+ DependencyManager::destroy<TextureCache>();
521+ DependencyManager::destroy<GeometryCache>();
522+ DependencyManager::destroy<ScriptCache>();
523+ DependencyManager::destroy<SoundCache>();
517524 }
518525
519526 void 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