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/GUI/GUIConsoleCommandParser.cpp

Diff revisions: vs.
  @@ -22,10 +22,12 @@
22 22 _commandMap["editparam"] = DELEGATE_BIND(&GUIConsoleCommandParser::handleEditParamCommand, this, std::placeholders::_1);
23 23 _commandMap["playsound"] = DELEGATE_BIND(&GUIConsoleCommandParser::handlePlaySoundCommand, this, std::placeholders::_1);
24 24 _commandMap["createnavmesh"] = DELEGATE_BIND(&GUIConsoleCommandParser::handleNavMeshCommand, this, std::placeholders::_1);
25 - _commandMap["recompileshader"] = DELEGATE_BIND(&GUIConsoleCommandParser::handleShaderRecompileCommand, this, std::placeholders::_1);
26 25 _commandMap["setfov"] = DELEGATE_BIND(&GUIConsoleCommandParser::handleFOVCommand, this, std::placeholders::_1);
27 26 _commandMap["invalidcommand"] = DELEGATE_BIND(&GUIConsoleCommandParser::handleInvalidCommand, this, std::placeholders::_1);
28 27 _commandMap["addobject"] = DELEGATE_BIND(&GUIConsoleCommandParser::handleAddObject, this, std::placeholders::_1);
28 + _commandMap["recompileshader"] = DELEGATE_BIND(&GUIConsoleCommandParser::handleShaderRecompileCommand,
29 + this,
30 + std::placeholders::_1);
29 31
30 32 _commandHelp["say"] = Locale::get("CONSOLE_SAY_COMMAND_HELP");
31 33 _commandHelp["quit"] = Locale::get("CONSOLE_QUIT_COMMAND_HELP");
  @@ -154,7 +156,7 @@
154 156 AI::Navigation::NavigationMesh* temp = AI::AIManager::getInstance().getNavMesh(AI::AIEntity::AGENT_RADIUS_SMALL);
155 157 // Create a new NavMesh if we don't currently have one
156 158 if (!temp) {
157 - temp = New AI::Navigation::NavigationMesh();
159 + temp = MemoryManager_NEW AI::Navigation::NavigationMesh();
158 160 }
159 161 // Set it's file name
160 162 temp->setFileName(GET_ACTIVE_SCENE()->getName());
  @@ -203,7 +205,8 @@
203 205
204 206 FileData model;
205 207 model.ItemName = stringAlg::toBase(args1 + "_console" + args2);
206 - model.ModelName = stringAlg::toBase(((args1.compare("Box3D") == 0 || args1.compare("Sphere3D") == 0) ? "" : assetLocation) + args1);
208 + model.ModelName = stringAlg::toBase(((args1.compare("Box3D") == 0 ||
209 + args1.compare("Sphere3D") == 0) ? "" : assetLocation) + args1);
207 210 model.position = GET_ACTIVE_SCENE()->state().getRenderState().getCamera().getEye();
208 211 model.data = 1.0f;
209 212 model.scale = vec3<F32>(scale);