Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/Managers/SceneManager.cpp

Diff revisions: vs.
  @@ -30,11 +30,8 @@
30 30 PRINT_FN(Locale::get("STOP_SCENE_MANAGER"));
31 31 //PRINT_FN(Locale::get("SCENE_MANAGER_DELETE"));
32 32 PRINT_FN(Locale::get("SCENE_MANAGER_REMOVE_SCENES"));
33 - for (SceneMap::value_type& it : _sceneMap) {
34 - MemoryManager::SAFE_DELETE( it.second );
35 - }
36 - MemoryManager::SAFE_DELETE( _renderPassCuller );
37 - _sceneMap.clear();
33 + MemoryManager::DELETE_HASHMAP(_sceneMap);
34 + MemoryManager::DELETE( _renderPassCuller );
38 35 //Destroy the model loader;
39 36 DVDConverter::getInstance().destroyInstance();
40 37 }
  @@ -44,11 +41,12 @@
44 41
45 42 //Load default material
46 43 PRINT_FN(Locale::get("LOAD_DEFAULT_MATERIAL"));
47 - _defaultMaterial = XML::loadMaterialXML(ParamHandler::getInstance().getParam<std::string>("scriptLocation")+"/defaultMaterial", false);
44 + _defaultMaterial = XML::loadMaterialXML(ParamHandler::getInstance().getParam<std::string>("scriptLocation")+"/defaultMaterial",
45 + false);
48 46 _defaultMaterial->dumpToFile(false);
49 47
50 48 _GUI = gui;
51 - _renderPassCuller = New RenderPassCuller();
49 + _renderPassCuller = MemoryManager_NEW RenderPassCuller();
52 50 _renderPassManager = &RenderPassManager::getOrCreateInstance();
53 51 _init = true;
54 52 return true;