History

Merge pull request #4535 from ZappoMan/scriptCaching

Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts

Philip Rosedale committed 11 years ago

Commit ce05d312 parents e1da933 31072b27 files · +184 −47Browse files

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

Unified · Split

interface/src/Application.cpp+3−3
@@ -76,7 +76,7 @@ · 75 unmodified lines
76#include <PhysicsEngine.h>76#include <PhysicsEngine.h>
77#include <ProgramObject.h>77#include <ProgramObject.h>
78#include <ResourceCache.h>78#include <ResourceCache.h>
79//#include <ScriptCache.h>79#include <ScriptCache.h>
80#include <SettingHandle.h>80#include <SettingHandle.h>
81#include <SoundCache.h>81#include <SoundCache.h>
82#include <TextRenderer.h>82#include <TextRenderer.h>
@@ -221,7 +221,7 @@ bool setupEssentials(int& argc, char** argv) { · 138 unmodified lines
221 auto addressManager = DependencyManager::set<AddressManager>();221 auto addressManager = DependencyManager::set<AddressManager>();
222 auto nodeList = DependencyManager::set<NodeList>(NodeType::Agent, listenPort);222 auto nodeList = DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
223 auto geometryCache = DependencyManager::set<GeometryCache>();223 auto geometryCache = DependencyManager::set<GeometryCache>();
224 //auto scriptCache = DependencyManager::set<ScriptCache>();224 auto scriptCache = DependencyManager::set<ScriptCache>();
225 auto soundCache = DependencyManager::set<SoundCache>();225 auto soundCache = DependencyManager::set<SoundCache>();
226 auto glowEffect = DependencyManager::set<GlowEffect>();226 auto glowEffect = DependencyManager::set<GlowEffect>();
227 auto faceshift = DependencyManager::set<Faceshift>();227 auto faceshift = DependencyManager::set<Faceshift>();
@@ -620,7 +620,7 @@ Application::~Application() { · 392 unmodified lines
620 DependencyManager::destroy<AnimationCache>();620 DependencyManager::destroy<AnimationCache>();
621 DependencyManager::destroy<TextureCache>();621 DependencyManager::destroy<TextureCache>();
622 DependencyManager::destroy<GeometryCache>();622 DependencyManager::destroy<GeometryCache>();
623 //DependencyManager::destroy<ScriptCache>();623 DependencyManager::destroy<ScriptCache>();
624 DependencyManager::destroy<SoundCache>();624 DependencyManager::destroy<SoundCache>();
625 625
626 QThread* nodeThread = DependencyManager::get<NodeList>()->thread();626 QThread* nodeThread = DependencyManager::get<NodeList>()->thread();