Subversion Repository Public Repository

Divide-Framework

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

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
#include "core.h"

#include "Headers/Console.h"
#include "Core/Headers/ApplicationTimer.h"
#include "config.h"
#include <iomanip>
#include <stdarg.h>

static const int CONSOLE_OUTPUT_BUFFER_SIZE = 4096 * 16;

Console::Console() : Singleton()
{
    _textBuffer = new char[CONSOLE_OUTPUT_BUFFER_SIZE];
}

Console::~Console()
{
    delete [] _textBuffer;
}

//! Do not remove the following license without express permission granted bu DIVIDE-Studio
void Console::printCopyrightNotice() const {
    std::cout << "------------------------------------------------------------------------------" << std::endl;
    std::cout << "Copyright (c) 2014 DIVIDE-Studio" << std::endl;
    std::cout << "Copyright (c) 2009 Ionut Cava" << std::endl;
    std::cout << std::endl;
    std::cout << "This file is part of DIVIDE Framework." << std::endl;
    std::cout << std::endl;
    std::cout << "Permission is hereby granted, free of charge, to any person obtaining a copy of this software" << std::endl;
    std::cout << "and associated documentation files (the 'Software'), to deal in the Software without restriction," << std::endl;
    std::cout << "including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense," << std::endl;
    std::cout << "and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so," << std::endl;
    std::cout << "subject to the following conditions:" << std::endl;
    std::cout << std::endl;
    std::cout << "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software." << std::endl;
    std::cout << std::endl;
    std::cout << "THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED," << std::endl;
    std::cout << "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT." << std::endl;
    std::cout << "IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY," << std::endl;
    std::cout << "WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE" << std::endl;
    std::cout << "OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." << std::endl;
    std::cout << std::endl;
    std::cout << "For any problems or licensing issues I may have overlooked, please contact: " << std::endl;
    std::cout << "E-mail: ionut.cava@divide-studio.com | Website: http://wwww.divide-studio.com" << std::endl;
    std::cout << "-------------------------------------------------------------------------------" << std::endl;
    std::cout << std::endl;
}

#ifdef _DEBUG
const char* Console::d_printfn(const char* format, ...) const {
    va_list args;
    va_start(args, format);
    assert(_vscprintf(format, args) - 1 < CONSOLE_OUTPUT_BUFFER_SIZE);
    vsprintf_s(_textBuffer, sizeof(char)* CONSOLE_OUTPUT_BUFFER_SIZE, format, args);
    strcat(_textBuffer, "\n");
    va_end(args);
    return output(_textBuffer);
}

const char* Console::d_printf(const char* format, ...) const {
    va_list args;
    va_start(args, format);
    assert(_vscprintf(format, args) + 1 < CONSOLE_OUTPUT_BUFFER_SIZE);
    vsprintf_s(_textBuffer, sizeof(char)* CONSOLE_OUTPUT_BUFFER_SIZE, format, args);
    va_end(args);
    return output(_textBuffer);
}

const char* Console::d_errorfn(const char* format, ...) const {
    va_list args;
    va_start(args, format);
    assert(_vscprintf(format, args) + 3 < CONSOLE_OUTPUT_BUFFER_SIZE);
    vsprintf_s(_textBuffer, sizeof(char)* CONSOLE_OUTPUT_BUFFER_SIZE, format, args);
    strcat(_textBuffer, "\n");
    va_end(args);
    return output(_textBuffer,true);
}

const char* Console::d_errorf(const char* format, ...) const {
    va_list args;
    va_start(args, format);
    assert(_vscprintf(format, args) + 1 < CONSOLE_OUTPUT_BUFFER_SIZE);
    vsprintf_s(_textBuffer, sizeof(char)* CONSOLE_OUTPUT_BUFFER_SIZE, format, args);
    va_end(args);
    return output(_textBuffer,true);
}

#endif
const char* Console::printfn(const char* format, ...) const {
    va_list args;
    va_start(args, format);
    assert(_vscprintf(format, args) + 3 < CONSOLE_OUTPUT_BUFFER_SIZE);
    vsprintf_s(_textBuffer, sizeof(char)* CONSOLE_OUTPUT_BUFFER_SIZE, format, args);
    strcat(_textBuffer, "\n");
    va_end(args);
    return output(_textBuffer);
}

const char* Console::printf(const char* format, ...) const {
    va_list args;
    va_start(args, format);
    assert(_vscprintf(format, args) + 1 < CONSOLE_OUTPUT_BUFFER_SIZE);
    vsprintf_s(_textBuffer, sizeof(char)* CONSOLE_OUTPUT_BUFFER_SIZE, format, args);
    va_end(args);
    return output(_textBuffer);
}

const char* Console::errorfn(const char* format, ...) const {
    va_list args;
    va_start(args, format);
    assert(_vscprintf(format, args) + 3 < CONSOLE_OUTPUT_BUFFER_SIZE);
    vsprintf_s(_textBuffer, sizeof(char)* CONSOLE_OUTPUT_BUFFER_SIZE, format, args);
    strcat(_textBuffer, "\n");
    va_end(args);
    return output(_textBuffer, true);
}

const char* Console::errorf(const char* format, ...) const {
    va_list args;
    va_start(args, format);
    assert(_vscprintf(format, args) + 1 < CONSOLE_OUTPUT_BUFFER_SIZE);
    vsprintf_s(_textBuffer, sizeof(char)* CONSOLE_OUTPUT_BUFFER_SIZE, format, args);
    va_end(args);
    return output(_textBuffer, true);
}

const char* Console::output(const char* output, const bool error) const {
    if(!_guiConsoleCallback.empty()){
        if(error){
            std::string outputString("Error: ");
            outputString.append(output);
            _guiConsoleCallback(outputString.c_str(),error);
        }else{
            _guiConsoleCallback(output,error);
        }
    }

    boost::mutex::scoped_lock lock(io_mutex);

    std::ostream& outputStream = error ? std::cerr : std::cout;

    if(_timestamps)
        outputStream << "[ " << std::setprecision(2) << GETTIME(true) << " ] ";

    if(error)
        outputStream << " Error: ";

    outputStream << output << std::flush;

    return output;
}

Commits for Divide-Framework/trunk/Source Code/Core/Console.cpp

Diff revisions: vs.
Revision Author Commited Message
286 Diff Diff IonutCava picture IonutCava Fri 18 Jul, 2014 16:32:03 +0000

[Ionut] [[BR]]

    • very buggy commit ** [[BR]]

- New rendering pipeline: [[BR]]
— Bumped OpenGL version to 4.4 [[BR]]
— Command based rendering. GFXDevice dispatches rendering commands to their respective buffers [[BR]]
— State changing is exclusively controlled by the GFXDevice class [[BR]]
— Material properties and transform matrices are stored in shader storage buffers that are updated after culling and uploaded once per RenderPass. Objects use drawIDs to index data in shaders [[BR]]
— Removed all custom matrices and other, per shader, bind data [[BR]]
— Removed per node light data. Light culling and shader buffers will replace the old light management system [[BR]]
— Framebuffers now use the Texture class for attachments [[BR]]
— Sampler objects now work like RenderStateBlocks. GL_API handles them and stores them in a hash indexed map [[BR]]
— Removed “prepareMaterial” calls. Pre-draw material setup is now only limited to texture binding [[BR]]
— Moved immediate mode emulation and primitive rendering from API level to GFXDevice level [[BR]]
— Framebuffer rendering must be completed with a call to end() to ensure proper MSAA resolve (asserts, otherwise) [[BR]]
- Fixed hash code generation for RenderStateBlock (and now, glSamplerObject) using boost::hash_combine [[BR]]
- Temporarily disabled XML caching for materials [[BR]]

262 Diff Diff k1ngp1n picture k1ngp1n Tue 06 May, 2014 21:04:00 +0000

[Ionut] [[BR]]
- Some AI refactoring (basic AIEntity <-> AESOP interoperability) [[BR]]
- Some render batch sorting code refactored and fixed (wasn’t properly sorted in FINAL_STAGE) [[BR]]
- Simplified RenderStateBlockDescriptor and deferred hash value calculation [[BR]]
- Basic draw call count implementation [[BR]]
- Renamed some classes [[BR]]

221 Diff Diff k1ngp1n picture k1ngp1n Wed 08 Jan, 2014 18:50:02 +0000

[Ionut] [[BR]]
- Merged branch “Shadows And Animations” back into trunk [[BR]]
- Added DoxygenGUI project file [[BR]]

  • Buggy *
182 Diff Diff k1ngp1n picture k1ngp1n Mon 18 Nov, 2013 09:02:04 +0000

[Ionut] [[BR]]
- Shader log buffer overflow fix [[BR]]
- More nVidia shader fixes [[BR]]

171 Diff Diff k1ngp1n picture k1ngp1n Sun 03 Nov, 2013 18:15:06 +0000

-Replaced all tabs with spaces [[BR]]

168 Diff Diff k1ngp1n picture k1ngp1n Sat 26 Oct, 2013 19:03:21 +0000

- Reworked the Camera class[[BR]]
— Now fully quaternion based [[BR]]
— Basic camera types added but not used yet (third person, first person, orbit) [[BR]]
- Cleaned up Material and Texture handling [[BR]]
- Added clipping plane support [[BR]]
— Similar to OpenGL fixed-function clip planes but fully shader driven [[BR]]
— Added a new class, “Plane”, that helps define clip planes [[BR]]
- Optimized the Singleton class to allow faster “getInstance” calls without performance penalties [[BR]]
-- “createInstance” must be called for each singleton class before usage. Or “gerOrCreateInstance” can be used, which is basically the former “getInstance” implementation [[BR]]
- Improved console logging by changing some heap allocations to stack and removing dependencies on the std::string class [[BR]]
- Added a lot of performance optimizations related to coding standards and redundant calculations [[BR]]
— e.g. Frustum AABB check didn’t need to recompute the AABB points as they were calculated already [[BR]]
— e.g. A vector did not need to be set to 0 on initialization as that is already it’s default state on creation [[BR]]
— e.g. Faster Framerate and Timing calculations by using less member variables that are not needed outsied of calling functions [[BR]]
- The SceneState now contains the SceneRenderState and is passed on to the SceneGraph’s update calls [[BR]]
- Better material export/import to/from XML format [[BR]]
- More bug fixes and cleanups [[BR]]

160 Diff Diff k1ngp1n picture k1ngp1n Wed 10 Jul, 2013 17:07:04 +0000

[Ionut] [[BR]]
- Changed licensing from LGPL to the MIT license [[BR]]
— Code can now be used in non-commercial or commercial closed or open source projects [[BR]]

152 Diff Diff k1ngp1n picture k1ngp1n Thu 20 Jun, 2013 14:23:31 +0000

[Ionut] [[BR]]
- New rendering pipeline (experimental and unstable): [[BR]]
— OpenGL 3.x clean context (glLight commands are still used for now, but UBO support is there, but not used yet) [[BR]]
— Custom matrix stacks and UBO based shader data (UBOs cause some link errors on some nVidia cards)[[BR]]
— Multi-threaded texture loading and shader compilation (mt shader compilation disabled for now. needs more tests) [[BR]]
— VAO rendering is self contained (no more enable/disable calls before a draw request) [[BR]]
— Render instance class used for rendering information [[BR]]
[[BR]]
- New unique ID generation base class: GUIDWrapper. Each class that derives from this, gets an application wide unique id on construction [[BR]]
- Added base code for an in-game editor using CEGUI [[BR]]
- Replaced some mutex locks with lockless data structures or atomic data [[BR]]
- CEGUI 0.8.2, FTGL-GL3 and GLIM 0.4 modified to support GLEW_MX if defined [[BR]]
- Dropped VS2008 support [[BR]]
- Networking library, server framework and ReCast files are now projects inside the Divide Framework solution [[BR]]
- New console command “setFov” that modifies the horizontal FoV value in realtime [[BR]]
- New console command “recompileShader” that reparses shader files, recompiles shaders and relinks shader programs who’s names match or contain the argument string [[BR]]
- New debug utility: axis angle drawn in corner of the screen if needed [[BR]]
- More ‘const’-s pasted around the code, more loop performance tweaks (allocations before a loop, tighter loops, etc), more utility member functions added to various classes [[BR]]

149 Diff Diff k1ngp1n picture k1ngp1n Sun 21 Apr, 2013 21:38:05 +0000

[Ionut] [[BR]]
- Major GUI revamp: [[BR]]
— Fixed CEGUI rendering (invalid state reset after VBO/VAO unbind) [[BR]]
— Added a working Console window with a basic command parser [[BR]]
— GUI inputs take priority over scene (e.g. pressing a key in the console, does not affect the scene)[[BR]]
— Added AutoKey repeat [[BR]]
— Added config options for the GUI [[BR]]
- Revamped OpenGL Vertex Array Object class [[BR]]
— VBO’s without a shader attached will not use VAO’s [[BR]]
— VAO’s and VBO’s cleanup all states after them [[BR]]
- Added multiple Joystick support [[BR]]
- FrameBufferObject take in account the combination of texture id and bind slot when checking for double binds [[BR]]
- Upgraded Framerate/timing system [[BR]]
- Fixed Deferred rendering (typo in normal buffer creation) [[BR]]
- Fixed initial camera placement via scene config (RotateX(Y) replace with setAngleX(Y)) on camera init) [[BR]]
- Added better thread deletion in Event class [[BR]]
- Major mutex/semaphore/shared_lock rework in threaded classes [[BR]]
- Better A.I. initialization/destruction [[BR]]
- Fixed a typo in window positioning [[BR]]
- Better Unit movement code [[BR]]

141 k1ngp1n picture k1ngp1n Wed 30 Jan, 2013 19:35:31 +0000

[Ionut] [[BR]]
-Updated to boost 1.52 and CEGUI 0.7.9 [[BR]]
-Updated to PhysX 3.2 [[BR]]
-Updated copyright notices [[BR]]