Skip to content

Commit 5acdade

Browse files
ptxmacptxmac
committed
Removed logging
1 parent 8efa952 commit 5acdade

File tree

14 files changed

+47
-44
lines changed

14 files changed

+47
-44
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME}
5454
# Core library dependencies
5555
OpenEngine_Core
5656
OpenEngine_Math
57-
OpenEngine_Logging
57+
#OpenEngine_Logging
5858
OpenEngine_Display
5959
OpenEngine_Resources
6060
OpenEngine_Devices

‎Common/FaceListUtil.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "FaceListUtil.h"
22

3-
#include <Logging/Logger.h>
3+
//#include <Logging/Logger.h>
44

55
/** Max: returns the maximum of two floats */
66
float FaceListUtil::Max(float a, float b) {

‎DragonPanic.dist

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33

44
# main repository
55
darcs / http://openengine.dk/code/openengine
6-
darcs-dev / fh.daimi.au.dk:/users/cgd/code/openengine
6+
7+
darcs / http://openengine.dk/code/branches/bp10/openengine
8+
darcs-dev / fh.daimi.au.dk:/users/cgd/code/branches/bp10/openengine
79

810
# DragonPanic project
9-
darcs /projects/DragonPanic http://openengine.dk/code/projects/DragonPanic
10-
darcs-dev /projects/DragonPanic fh.daimi.au.dk:/users/cgd/code/projects/DragonPanic
11+
darcs /projects/MicroDragon http://openengine.dk/code/projects/MicroDragon
12+
darcs-dev /projects/DragonPanic fh.daimi.au.dk:/users/cgd/code/projects/MicroDragon
1113

1214
# standard set of extensions
1315
darcs /extensions/GLUT http://openengine.dk/code/extensions/GLUT

‎GameState.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "Modules/Boid/BoidsSystem.h"
44
#include "Modules/Boid/BoidSystemEvents.h"
55

6-
#include <Logging/Logger.h>
6+
//#include <Logging/Logger.h>
77

88
GameState::GameState(unsigned int duration) : duration(duration) {
99
timer.Start();

‎KeyHandler.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "Modules/OscSurface/OscSurface.h"
1818
#include "Modules/Target/Target.h"
1919

20-
#include <Logging/Logger.h>
20+
//#include <Logging/Logger.h>
2121
#include <Devices/IMouse.h>
2222
#include <Math/Vector.h>
2323
#ifdef DRAGON_SOUND
@@ -291,14 +291,14 @@ void KeyHandler::HandleDown(Key key) {
291291
timeFactor -= 0.01;
292292
if (timeFactor < 0.0) timeFactor = 0.0;
293293
timeModifier.SetFactor(timeFactor);
294-
logger.info << "time factor: " << timeFactor << logger.end;
294+
//logger.info << "time factor: " << timeFactor << logger.end;
295295
break;
296296
case KEY_m: //KEY_F12
297297
if (done) return;
298298
timeFactor += 0.01;
299299
if (timeFactor > 100.0) timeFactor = 100.0;
300300
timeModifier.SetFactor(timeFactor);
301-
logger.info << "time factor: " << timeFactor << logger.end;
301+
//logger.info << "time factor: " << timeFactor << logger.end;
302302
break;
303303
case KEY_PAGEUP:
304304
ZoomIn(moveChunkKeyboard);
@@ -428,7 +428,7 @@ void KeyHandler::Handle(JoystickButtonEventArg arg) {
428428
timeFactor -= 0.1;
429429
if (timeFactor < 0.0) timeFactor = 0.0;
430430
timeModifier.SetFactor(timeFactor);
431-
logger.info << "time factor: " << timeFactor << logger.end;
431+
//logger.info << "time factor: " << timeFactor << logger.end;
432432
break;
433433
}
434434
case JBUTTON_EIGHT:
@@ -437,7 +437,7 @@ void KeyHandler::Handle(JoystickButtonEventArg arg) {
437437
timeFactor += 0.1;
438438
if (timeFactor > 100.0) timeFactor = 100.0;
439439
timeModifier.SetFactor(timeFactor);
440-
logger.info << "time factor: " << timeFactor << logger.end;
440+
//logger.info << "time factor: " << timeFactor << logger.end;
441441
break;
442442
}
443443

‎LightFader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "LightFader.h"
22

3-
#include <Logging/Logger.h>
3+
//#include <Logging/Logger.h>
44

55
LightFader::LightFader(Light* from, Light* to, Light* lightNode, float time) {
66

‎Modules/Boid/Boid.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// OpenEngine Core
1919
#include <Meta/GLUT.h>
2020
#include <Math/Math.h>
21-
#include <Logging/Logger.h>
21+
//#include <Logging/Logger.h>
2222
#include <Scene/ISceneNode.h>
2323
#include <Scene/TransformationNode.h>
2424

‎Modules/Boid/BoidsSystem.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "../OscSurface/OscSurface.h"
77

88
#include <Math/Math.h>
9-
#include <Logging/Logger.h>
9+
//#include <Logging/Logger.h>
1010
#include <ParticleSystem/ParticleSystem.h>
1111
#include <Renderers/TextureLoader.h>
1212
#include <Scene/ISceneNode.h>
@@ -209,37 +209,37 @@ void BoidsSystem::DecNumberOfShownBoids() {
209209

210210
void BoidsSystem::IncAlignment() {
211211
if( alignment < 1 ) alignment += 0.05;
212-
logger.info << "Boids alignment: " << alignment << logger.end;
212+
//logger.info << "Boids alignment: " << alignment << logger.end;
213213
}
214214

215215
void BoidsSystem::DecAlignment() {
216216
if( alignment > 0 ) alignment -= 0.05;
217-
logger.info << "Boids alignment: " << alignment << logger.end;
217+
//logger.info << "Boids alignment: " << alignment << logger.end;
218218
}
219219

220220
float BoidsSystem::getAlignment() {
221221
return alignment;
222222
}
223223

224224
void BoidsSystem::toggleRenderState() {
225-
logger.info << "BoidsSystem status: ";
225+
//logger.info << "BoidsSystem status: ";
226226
enabled = true;
227227
renderState++;
228228
renderState %= numberOfRenderStates;
229229
switch ( renderState ){
230230
case 0: //without logic
231231
disableLogic = true;
232-
logger.info << "without logic";
232+
//logger.info << "without logic";
233233
break;
234234
case 1: //disabled
235235
enabled = false;
236-
logger.info << "disabled";
236+
//logger.info << "disabled";
237237
break;
238238
default: //render all, reset variables
239239
enabled = true;
240240
disableLogic = false;
241-
logger.info << "fully enabled";
241+
//logger.info << "fully enabled";
242242
break;
243243
}
244-
logger.info << logger.end;
244+
//logger.info << //logger.end;
245245
}

‎Modules/Island/HeightMap.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <Resources/ITexture2D.h>
99
#include <Scene/GeometryNode.h>
1010

11-
#include <Logging/Logger.h>
11+
//#include <Logging/Logger.h>
1212

1313
using OpenEngine::Core::Exception;
1414
using OpenEngine::Math::PI;
@@ -29,8 +29,8 @@ HeightMap::HeightMap(UCharTexture2DPtr heightMap,
2929
if (heightMap->GetChannels() != 1)
3030
throw Exception("can only generate heightmap from 8bit textures");
3131

32-
if(heightMap->GetWidth() != heightMap->GetHeight())
33-
logger.warning << "height map width != height - this has not been tested but should work!" << logger.end;
32+
if(heightMap->GetWidth() != heightMap->GetHeight()) {}
33+
//logger.warning << "height map width != height - this has not been tested but should work!" << logger.end;
3434

3535
width = heightmap->GetWidth() / stepSize;
3636
height = heightmap->GetHeight() / stepSize;

‎Modules/Island/Island.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <Math/Math.h>
1111
#include <iostream>
1212

13-
#include <Logging/Logger.h>
13+
//#include <Logging/Logger.h>
1414
#include <Renderers/IRenderingView.h>
1515
#include <Resources/DirectoryManager.h>
1616
#include <Resources/ITexture2D.h>
@@ -61,7 +61,7 @@ Island::Island(HeightMap* heightMap) : heightMap(heightMap) {
6161
numberOfTrees++;
6262
}
6363
}
64-
logger.info << "Number of trees generated: " << numberOfTrees << logger.end;
64+
//logger.info << "Number of trees generated: " << numberOfTrees << logger.end;
6565
}
6666

6767
Island::~Island() {

‎Modules/OscSurface/OscSurface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "../Island/HeightMap.h"
55

66
#include <Core/Exceptions.h>
7-
#include <Logging/Logger.h>
7+
//#include <Logging/Logger.h>
88
#include <Meta/OpenGL.h>
99
#include <Renderers/IRenderingView.h>
1010
#include <Utils/Convert.h>

‎Modules/Particle/BoidsModifier.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define _DRAGON_PANIC_BOIDS_MODIFIER_H_
1212

1313
#include "../Boid/BoidsSystem.h"
14-
#include <Logging/Logger.h>
14+
//#include <Logging/Logger.h>
1515

1616
/**
1717
* Particle Modifier to make boids react to fire

‎Modules/Target/Target.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <Meta/OpenGL.h>
77
#include <Meta/GLUT.h>
8-
#include <Logging/Logger.h>
8+
//#include <Logging/Logger.h>
99

1010
using namespace std;
1111

@@ -52,7 +52,7 @@ void Target::setTarget( Vector<3,float> v ){
5252
}
5353

5454
void Target::printTarget() {
55-
logger.info << target << logger.end;
55+
//logger.info << target << logger.end;
5656
}
5757

5858
Target::TargetRenderNode::TargetRenderNode() {

‎main.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
#include <Scene/PointLightNode.h>
5757

5858
// Utilities and logger
59-
#include <Logging/Logger.h>
60-
#include <Logging/StreamLogger.h>
59+
//#include <Logging/Logger.h>
60+
//#include <Logging/StreamLogger.h>
6161
#include <Utils/EventProfiler.h>
6262
#include <Utils/FPSSurface.h>
6363
#include <Scene/DotVisitor.h>
@@ -98,7 +98,7 @@
9898

9999
// Additional namespaces
100100
using namespace OpenEngine::Core;
101-
using namespace OpenEngine::Logging;
101+
//using namespace OpenEngine::Logging;
102102
using namespace OpenEngine::Devices;
103103
using namespace OpenEngine::Display;
104104
using namespace OpenEngine::Renderers;
@@ -186,19 +186,19 @@ void SetupDebugging(Config&);
186186

187187
int main(int argc, char** argv) {
188188
// Setup logging facilities.
189-
Logger::AddLogger(new StreamLogger(&std::cout));
189+
//Logger::AddLogger(new StreamLogger(&std::cout));
190190

191191
// Print usage info.
192-
logger.info << "========= ";
193-
logger.info << "Running The OpenEngine DragonPanic Project";
194-
logger.info << " =========" << logger.end;
192+
// logger.info << "========= ";
193+
// logger.info << "Running The OpenEngine DragonPanic Project";
194+
// logger.info << " =========" << logger.end;
195195

196-
logger.info << "This project is a simple testing project for OpenEngine.";
197-
logger.info << logger.end;
196+
// logger.info << "This project is a simple testing project for OpenEngine.";
197+
// logger.info << logger.end;
198198

199-
logger.info << " for control information see: ";
200-
logger.info << "KeyboardLayout.txt in the project repository" << logger.end;
201-
logger.info << logger.end;
199+
// logger.info << " for control information see: ";
200+
// logger.info << "KeyboardLayout.txt in the project repository" << logger.end;
201+
// logger.info << logger.end;
202202

203203
// Create an engine and config object
204204
Engine* engine = new Engine();
@@ -216,7 +216,7 @@ int main(int argc, char** argv) {
216216
SetupScene(config);
217217

218218
// Possibly add some debugging stuff
219-
SetupDebugging(config);
219+
//SetupDebugging(config);
220220

221221
// Start up the engine.
222222
engine->Start();
@@ -543,7 +543,7 @@ void SetupScene(Config& config) {
543543
config.engine.ProcessEvent().Attach(*hud);
544544
#endif
545545
}
546-
546+
/*
547547
void SetupDebugging(Config& config) {
548548
// #if OE_DEBUG
549549
// main engine events
@@ -604,3 +604,4 @@ void SetupDebugging(Config& config) {
604604
#endif
605605
}
606606
607+
*/

0 commit comments

Comments
 (0)