Changesets: spring
|
develop 3242b7ba
Timestamp: 2013-02-01 17:38:26 Author: rt [ Details ] [ Diff ] |
cleanup ProjectileHandler.h | ||
| mod - rts/Lua/LuaSyncedCtrl.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/ProjectileDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/ProjectileDrawer.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/CMakeLists.txt | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/PieceProjectile.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Projectile.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Projectile.h | [ Diff ] [ File ] | ||
| add - rts/Sim/Projectiles/ProjectileFunctors.cpp | [ Diff ] [ File ] | ||
| add - rts/Sim/Projectiles/ProjectileFunctors.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.h | [ Diff ] [ File ] | ||
|
develop d622ca3e
Timestamp: 2013-02-01 15:36:46 Author: rt [ Details ] [ Diff ] |
- | ||
| mod - rts/Rendering/Models/3DModel.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/OBJParser.h | [ Diff ] [ File ] | ||
|
develop c1f6d412
Timestamp: 2013-02-01 15:04:13 Author: rt [ Details ] [ Diff ] |
refactor/cleanup FlyingPiece | ||
| mod - rts/Rendering/Models/3DOParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/ProjectileDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.h | [ Diff ] [ File ] | ||
|
develop 3ae0eb95
Timestamp: 2013-02-01 07:29:01 Author: jK [ Details ] [ Diff ] |
switch to glDrawRangeElements it's preferred by Nvidia (with the knowledge of the range it can do some additional optimizations) |
||
| mod - rts/Rendering/Models/AssParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/OBJParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
|
develop 58a8f721
Timestamp: 2013-02-01 07:27:10 Author: jK [ Details ] [ Diff ] |
use VBO in AssimpParser, too | ||
| mod - rts/Rendering/Models/3DModel.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/AssParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/AssParser.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/OBJParser.cpp | [ Diff ] [ File ] | ||
|
develop 99fae7cb
Timestamp: 2013-02-01 07:25:27 Author: jK [ Details ] [ Diff ] |
merge tangents into interleaved VBO this doesn't increase memusag, cause only xTangents.clear() was called and that does not free the alloc'ed memory in fact there is no way to free alloc'ed memory of a std::vector except destroying its instance |
||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.h | [ Diff ] [ File ] | ||
|
develop 38126067
Timestamp: 2013-02-01 07:21:38 Author: jK [ Details ] [ Diff ] |
fix typo | ||
| mod - rts/Rendering/Models/OBJParser.cpp | [ Diff ] [ File ] | ||
|
develop 58ae65c7
Timestamp: 2013-02-01 04:13:51 Author: jK [ Details ] [ Diff ] |
resize XCursors to pow2, too (to workaround broken FOSS ati drivers) | ||
| mod - rts/Game/UI/HwMouseCursor.cpp | [ Diff ] [ File ] | ||
|
develop 0081d6b1
Timestamp: 2013-02-01 04:12:20 Author: jK [ Details ] [ Diff ] |
remove #error in needed for debugging | ||
| mod - rts/Rendering/GL/VBO.h | [ Diff ] [ File ] | ||
|
develop 9f6c39ea
Timestamp: 2013-02-01 00:37:19 Author: zerver [ Details ] [ Diff ] |
2a8e976: use Threading::IsSimThread instead (thanks jK) | ||
| mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.h | [ Diff ] [ File ] | ||
|
develop f42c7d4b
Timestamp: 2013-02-01 00:31:10 Author: jK [ Details ] [ Diff ] |
fix compile error regarding double used VBO for class & enum | ||
| mod - rts/Map/SMF/ROAM/Patch.cpp | [ Diff ] [ File ] | ||
| mod - rts/Map/SMF/ROAM/Patch.h | [ Diff ] [ File ] | ||
| mod - rts/Map/SMF/SMFGroundDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.h | [ Diff ] [ File ] | ||
|
develop 1c682f6b
Timestamp: 2013-02-01 00:29:04 Author: jK [ Details ] [ Diff ] |
fix grass shadow grass shadowgen code is added too but disabled (it looks strange) |
||
| add - cont/base/springcontent/shaders/GLSL/GrassFragProg.glsl | [ Diff ] [ File ] | ||
| mod - cont/base/springcontent/shaders/GLSL/GrassVertProg.glsl | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Env/AdvTreeDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Env/AdvTreeDrawer.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Env/GrassDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Env/GrassDrawer.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Env/ITreeDrawer.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/ShadowHandler.cpp | [ Diff ] [ File ] | ||
|
develop c28a0e44
Timestamp: 2013-02-01 00:25:08 Author: jK [ Details ] [ Diff ] |
add float3 test | ||
| mod - test/CMakeLists.txt | [ Diff ] [ File ] | ||
| add - test/engine/System/testFloat3.cpp | [ Diff ] [ File ] | ||
|
develop 6232fd73
Timestamp: 2013-02-01 00:24:42 Author: jK [ Details ] [ Diff ] |
use interleaved VBOs 1. sorry for the reverts but the commits where conflicting too much with my changes 2. interleaved VBOs are preferred in OpenGL -> they are much faster and easier to manage 3. my solution merges VBO & VertexArray rendering in one code and has runtime check if VBOs are supported at all Again sorry, normally I dislike reverts (esp. after such revert fights), still in this case my changes really make sense and are worth it. |
||
| mod - rts/Rendering/GL/PBO.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/GL/VBO.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/GL/VBO.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/3DModel.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/3DModel.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/IModelParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/OBJParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/OBJParser.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.cpp | [ Diff ] [ File ] | ||
|
develop 5aac9b36
Timestamp: 2013-02-01 00:14:43 Author: jK [ Details ] [ Diff ] |
Revert "S3O: upload vertices/normals/texcoors separately" This reverts commit cb220bd2ae65b9e6d2df0e9ebb571fbca8727451. |
||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.h | [ Diff ] [ File ] | ||
|
develop 1ef02c7a
Timestamp: 2013-02-01 00:14:22 Author: jK [ Details ] [ Diff ] |
Revert "oops" This reverts commit dc46348a6671b87199400d6b68e27fbcd736f27e. |
||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.h | [ Diff ] [ File ] | ||
|
develop 1e72da8d
Timestamp: 2013-02-01 00:14:00 Author: jK [ Details ] [ Diff ] |
Revert "last typos" This reverts commit 0af57f740aba40296bcb8c5dcfc08796b21fc8c1. |
||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
|
develop 0af57f74
Timestamp: 2013-01-31 23:41:45 Author: rt [ Details ] [ Diff ] |
last typos | ||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
|
develop dc46348a
Timestamp: 2013-01-31 23:15:11 Author: rt [ Details ] [ Diff ] |
oops | ||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.h | [ Diff ] [ File ] | ||
|
develop cb220bd2
Timestamp: 2013-01-31 22:26:44 Author: rt [ Details ] [ Diff ] |
S3O: upload vertices/normals/texcoors separately | ||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.h | [ Diff ] [ File ] | ||
|
develop 2a8e976f
Timestamp: 2013-01-31 16:54:03 Author: zerver [ Details ] [ Diff ] |
[MT] Fix crash due to concurrent access to (un)syncedProjectileIDs | ||
| mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.h | [ Diff ] [ File ] | ||
| mod - rts/System/EventBatchHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/EventHandler.h | [ Diff ] [ File ] | ||
| mod - rts/lib/gml/ThreadSafeContainers.h | [ Diff ] [ File ] | ||
|
develop 5c671c11
Timestamp: 2013-01-31 16:06:46 Author: rt [ Details ] [ Diff ] |
kill error-prone default arguments in IPathManager | ||
| mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaPathFinder.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/MoveTypes/ClassicGroundMoveType.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/Default/PathManager.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/Default/PathManager.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/IPathManager.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/PathManager.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/PathManager.hpp | [ Diff ] [ File ] | ||
|
develop 9d9485ea
Timestamp: 2013-01-31 14:02:57 Author: rt [ Details ] [ Diff ] |
qtpfs: add debug-info about queued updates | ||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/Default/PathManager.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/Default/PathManager.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/IPathManager.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/NodeLayer.hpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/PathManager.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/PathManager.hpp | [ Diff ] [ File ] | ||
|
develop 7261fb70
Timestamp: 2013-01-31 01:59:01 Author: zerver [ Details ] [ Diff ] |
use boost cstdint | ||
| mod - rts/System/Platform/Threading.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/StartScriptGen.cpp | [ Diff ] [ File ] | ||
|
develop 294e9c8c
Timestamp: 2013-01-31 01:15:39 Author: zerver [ Details ] [ Diff ] |
vertexDrawIndices don't need + 1 | ||
| mod - rts/Rendering/Models/OBJParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | ||