Commit Graph

438 Commits (d03ce19fbe085cc38a74f80034ea0bf1c8844519)

Author SHA1 Message Date
Piotr Dziwinski 2ebe1fbcb6 Fixed spider and worm model loading 2012-12-28 13:23:49 +01:00
Piotr Dziwinski 45bee618f9 Fixed unicode rendering bug 2012-12-27 16:32:46 +01:00
Piotr Dziwinski 3582f107a5 Fixes and refactoring 2012-12-27 14:18:16 +01:00
Piotr Dziwinski 5574eccebd Engine optimization - rewritten model management
- new class CModelManager
 - rewritten engine object structure in CEngine
 - created shared model data instead of separate objects per each
   model instance
 - minor refactoring
2012-12-26 20:58:02 +01:00
Didier Raboud 7e9ef0c042 Put common CXX flags in common variables
CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific
flags are appended to it.
2012-12-19 16:55:00 +01:00
Didier Raboud 3c976c040b Don't enforce CMake build type on users.
Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
2012-12-19 16:52:17 +01:00
Piotr Dziwinski 56a170391f Split gtest and gmock, fixed using system packages
- split the bundled gtest and gmock libraries
- allowed the use of system gmock
- refactoring in CMakeLists
2012-12-16 13:22:58 +01:00
Piotr Dziwinski 4811defca2 Static objects using OpenGL VBOs and display lists 2012-12-14 21:30:35 +01:00
Piotr Dziwinski 3ce488307f Performance counters 2012-10-25 23:29:49 +02:00
Piotr Dziwinski 688315ab76 ComputeSphereVisibility and fixes in CEngine TODOs
- view frustum culling with ComputeSphereVisibility - game should run
  faster now
- resolved/removed most TODOs from CEngine
- fixed OpenGL tests
2012-10-20 23:06:56 +02:00
Piotr Dziwinski 728e7e405d Transparent plant textures 2012-10-20 18:40:24 +02:00
Piotr Dziwinski 40e065aea9 Ground spot texture drawing 2012-10-20 16:34:22 +02:00
Piotr Dziwinski 6d06c9f722 Flare textures should work now 2012-10-19 23:05:41 +02:00
Piotr Dziwinski be4654c63b Fix track mapping and sphere particle position 2012-10-19 22:43:18 +02:00
Piotr Dziwinski a90cd304ba Track texture mapping 2012-10-19 22:37:11 +02:00
Piotr Dziwinski f6e27099b2 Doxygen/comment fixes and some #include refactoring 2012-10-17 21:55:45 +02:00
Piotr Dziwinski 9738631e5e Removed unnecessary dynamic_casts 2012-10-17 21:48:40 +02:00
Zaba999 7575ffd49b Merge branch 'dev' of https://github.com/colobot/colobot into dev 2012-10-11 23:10:07 +02:00
Zaba999 8a932fed3e Added saving user scripts on game save. Fixed bug in writing script to file. 2012-10-11 23:09:29 +02:00
Piotr Dziwinski fbe19c49c5 Merge branch 'dev-graphics' into dev 2012-10-05 23:27:26 +02:00
Piotr Dziwinski b68c903747 Disabled window resize 2012-10-05 22:34:22 +02:00
Piotr Dziwinski 6fdaf5de46 CParticle rewrite 2012-10-05 18:59:49 +02:00
Piotr Dziwinski ff99b74b25 Some CPyro docs 2012-10-05 18:59:03 +02:00
Piotr Dziwinski 37302a2504 CLightning rewrite 2012-10-05 15:26:24 +02:00
Piotr Dziwinski 703f03f316 CPyro rewrite 2012-10-03 00:30:17 +02:00
Piotr Dziwinski 858b1e35ae Spot light angle fix 2012-10-03 00:29:59 +02:00
Piotr Dziwinski 85d253b094 Fixed bugs in texture coloring 2012-09-30 11:26:59 +02:00
Piotr Dziwinski 8ea4736a46 Font coloring; fix for resize hack
- added font coloring and changed default color to black
- fixed resize hack incorrectly changing video config,
  but font resizing will not work for now
2012-09-30 10:56:35 +02:00
adiblol 923616ccac Dirty hack to allow window resizing or even full screen.
Currently makes text buggy!
(full screen must be initiated by window manager, for example Alt+F11 in Fluxbox)
2012-09-30 03:18:11 +02:00
Piotr Dziwinski b46dc3850f Map texture painting 2012-09-30 00:23:26 +02:00
Piotr Dziwinski a8554cfae3 Texture coloring 2012-09-29 23:37:38 +02:00
Piotr Dziwinski 4193f8a3a9 Fix for transparent objects and fadeouts 2012-09-29 22:44:05 +02:00
Piotr Dziwinski 5a751d9c0d Fixed texture regression
There was a bug in texture modesetting but only visible after certain
mode changes.
2012-09-29 19:35:14 +02:00
Piotr Dziwinski 677ce3960c Some fixes and optimizations
- fixed 2nd texture setting
- added padding to some structs for faster access
- changed rendering primitives to glDrawArrays()
- optimized texture modesetting calls
- fixed some valgrind errors
2012-09-29 10:40:11 +02:00
adiblol 77952a85e6 Merge remote-tracking branch 'origin/dev' into dev-graphics 2012-09-27 23:55:13 +02:00
erihel 9f4c1454dc * Ingame help should now display correctly 2012-09-27 23:42:52 +02:00
Piotr Dziwinski 6d0ed0d26a Completely fixed light issues
Directional and spot lights are now set properly
2012-09-27 23:18:12 +02:00
Piotr Dziwinski a394c9efec Updated docs and some Doxygen fixes 2012-09-27 20:43:20 +02:00
Piotr Dziwinski 2ef1c8b6f8 Fixed blinking light problem
- temporarily commented out misbehaving code in CPhysics
- some fixes in CLightManager
- minor refactoring in CRobotMain
2012-09-27 20:36:52 +02:00
Piotr Dziwinski 80d3a9bff1 Lighting fix (experimental)
- changed fixed light allocation to prioritized per-use basis
- minor refactoring in CPlanet and CWater
2012-09-26 23:18:57 +02:00
Piotr Dziwinski 2fa4d7b0db Refactored resource and relief loading
- now loading can be from any image format
- added IntColor struct for precise pixel operations
2012-09-26 19:18:33 +02:00
Piotr Dziwinski 6bdc1e8ac1 Merge master & dev 2012-09-26 16:40:27 +02:00
Piotr Dziwinski 45fd8aad33 Fog color fix; refactoring
- fixed fog color setting
- removed unused glSecondaryColor and altered struct VertexCol
- minor refactoring in CText
2012-09-26 16:31:04 +02:00
Michał Zieliński dad42df4c7 made graphics/engine/text cleaner, I hope 2012-09-25 18:44:43 +02:00
erihel 2db419a1e0 * Building should work now without 'ground not flat' message 2012-09-25 18:26:16 +02:00
Michał Zieliński b06544871a made graphics/engine/text cleaner, I hope 2012-09-24 23:55:52 +02:00
Piotr Dziwinski b1edcc822f Various fixes
- disabled UserDir() in path lookup
 - fixed crashes on loading missions in CObject
 - fixed texture bug in CTerrain
 - changed mouse move event handling to avoid flooding event queue
 - enabled all missions for testing
2012-09-22 17:36:10 +02:00
Piotr Dziwinski fd09071c29 Data dir paths
- changed access to paths in data directory in CApplication
- models now load from data directory
2012-09-22 14:40:13 +02:00
Piotr Dziwinski 0ff419560d Event fixes & refactoring
- added new state tracking to Event
- removed old fields from Event
- fixed some issues with Events and fps counter
2012-09-22 00:38:17 +02:00
Piotr Dziwinski f5bc8e12d4 Alpha operation fix 2012-09-21 00:14:26 +02:00
Piotr Dziwinski 60c37aac3a robotmain, restext and engine fixes 2012-09-21 00:01:03 +02:00
Piotr Dziwinski bd36d76b31 Mouse pos setting, low cpu mode, stats display 2012-09-20 20:37:37 +02:00
Piotr Dziwinski 7b6bbf79c4 Namespace and styling fix 2012-09-19 23:50:28 +02:00
Piotr Dziwinski 7479f486b6 Forgotten fix in dev-graphics 2012-09-19 22:53:06 +02:00
Piotr Dziwinski 10c9d92cd2 Mouse wheel events, motion vectors
- added mouse wheel events
- added motion vectors to CRobotMain
- other minor changes in event.h
2012-09-19 21:23:42 +02:00
Piotr Dziwinski 51884cef8e Input bindings rewrite
- moved input bindings to CRobotMain
- added virtual keymod and joystick button key presses
- fixed putenv error; other minor fixes
2012-09-19 18:32:18 +02:00
Zaba999 7bce8f073c Merge branch 'dev' of https://github.com/adiblol/colobot into dev
Conflicts:
	src/ui/slider.cpp
2012-09-18 22:39:10 +02:00
Zaba999 a397922e8d warnings fight in progress. 2012-09-18 00:01:00 +02:00
Piotr Dziwinski 4b67386a69 Change of background image handling
- removed old 4 quarter backgrounds
- fixes in texture loading
- other minor fixes
2012-09-17 23:41:53 +02:00
Zaba999 844e11db4f changes needeto to cimpile on windows. 2012-09-17 20:47:27 +02:00
Piotr Dziwinski 050f9d2542 Fix max lights error 2012-09-16 20:39:32 +02:00
Piotr Dziwinski 2e21435f43 Some memory leaks fixed 2012-09-16 20:00:25 +02:00
Piotr Dziwinski 6a0d150539 Interface works
- removed mock of CInterface and fixed event passing to CRobotMain
- changed texture names from tga and bmp to png
- UI now works but interaction is still broken
2012-09-16 10:38:08 +02:00
Piotr Dziwinski ad6bc13dc2 Merge dev-common and various fixes to achieve compilation
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
2012-09-15 18:50:51 +02:00
Piotr Dziwinski 34d7dcf3be Simulation timestamps and input bindings
- added new simulation time calculations in CApplication
- added simulation frame updates
- rewritten old input binding code and input state tracking
2012-09-12 23:43:04 +02:00
Zaba999 1bb1eb7b87 half of task compile. 2012-09-11 23:11:34 +02:00
Zaba999 e57be247c2 commented new part in cmakelist and reverted stubs in camera.cpp. Will be commited later after implementation is finished in dev-object branch. 2012-09-10 23:39:22 +02:00
Zaba999 479a67a731 Merge with changes from Zaba999 fork. 2012-09-10 23:29:38 +02:00
Piotr Dziwinski 901f10b2ba Fixed old model format bugs 2012-09-09 23:34:52 +02:00
Piotr Dziwinski efe4f0badd Refactoring in src/common
- refactored CInstanceManager and some headers
- removed old headers
2012-09-09 17:51:10 +02:00
Piotr Dziwinski c6673b9aee Texture format detection; minor fixes
- detection of texture format
- fixed depth mask bug
- minor refactoring
2012-09-09 12:56:09 +02:00
Piotr Dziwinski c2c1294ec9 CTerrain refactoring & fixes
- refactored CTerrain code
- fixed some minor bugs
2012-09-08 23:44:14 +02:00
Piotr Dziwinski 31c29ea482 CModelFile fixes; test framework
- fixes in CModelFile IO
- added Google Test framework for automatic testing
- rewrote modelfile_test in the new framework
2012-09-08 03:05:12 +02:00
Piotr Dziwinski 08f1b68ffd Fix 2012-09-03 22:37:28 +02:00
Piotr Dziwinski 09fd0e205e Fix 2012-09-03 19:21:37 +02:00
Piotr Dziwinski 01fd19d2cd Fix 2012-08-31 21:51:28 +02:00
Piotr Dziwinski e94e26ae1e New model file format
- added new binary and text formats for models
- fixes and improvements in CModelFile
- tool for converting model files
- minor additions and fixes
2012-08-31 20:55:16 +02:00
Piotr Dziwinski 3e52ae4ca9 Fixes in terrain rendering 2012-08-27 01:02:25 +02:00
Piotr Dziwinski 5b45911856 Improved error messages
Added some logging and improved error messages displayed to user
2012-08-13 23:09:30 +02:00
Piotr Dziwinski b68dfcd155 Test fix 2012-08-13 18:03:12 +02:00
Piotr Dziwinski 712154bc4f Rendering functions, documentation
- rewrote the render functions for CEngine, CCloud and CWater
- added documentation
2012-08-13 00:14:42 +02:00
Piotr Dziwinski 45a5e1e865 Object handling in CEngine
- finished rewriting CEngine object, shadow, etc. handling
- refactored texture code
- added new log levels
2012-08-12 19:28:22 +02:00
Piotr Dziwinski b4b74c30e9 Fixes & testing in CEngine
- fixed bugs in settings modes, etc.
- some additions and minor refactoring
2012-08-12 10:45:04 +02:00
Piotr Dziwinski 1996507fd3 Documentation update
- updated Doxyfile
- added/changed file, dir and namespace descriptions
- fixed some errors in doxygen tags
2012-08-11 18:39:16 +02:00
Piotr Dziwinski 7f80ca2971 Render mode setting, refactoring
- finished SetState in CEngine
- refactored Size and IntSize back to Point and IntPoint
- other minor changes in CEngine
2012-08-11 17:17:04 +02:00
Piotr Dziwinski 63257034c9 Partial CEngine implementation
- added rewritten implementation for basic modesetting in CEngine
- started rewriting proper rendering and object handling in CEngine
2012-08-10 23:31:42 +02:00
Piotr Dziwinski c3ab23ac9d Graphics stubs
- added stubs for functions in CLightning, CParticle and CPyro
- cleaned object.h and physics.h headers
- created temporary stubs to compile CCamera
- other necessary changes to compile successfully
2012-08-09 22:50:04 +02:00
Piotr Dziwinski acff306cc1 CPlanet implementation
Added rewritten CPlanet implementation
2012-08-09 22:49:13 +02:00
Piotr Dziwinski c1936514c0 CWater and CCloud basic implementation
Added rewritten implementation for CWater and CCloud
Won't link yet because of missing functions
2012-08-08 23:51:19 +02:00
Piotr Dziwinski 878eec8eea CTerrain implementation
Added rewritten CTerrain implementation
Compiles OK, but functions are missing from other classes
Also needs testing
2012-08-08 21:32:44 +02:00
Piotr Dziwinski f7e78b21e9 Font rendering
- implemented rest of CText interface excluding some minor features
2012-08-06 20:20:50 +02:00
Piotr Dziwinski 61bfb22f27 Basic font rendering
- added basic font rendering
- minor refactoring & fixes
2012-08-03 23:23:13 +02:00
Piotr Dziwinski 5e637ca028 Switched to new style casts
- rewrote old C-style casts to new ..._cast<>
- corrected some dangerous casts
- added -Wold-style-cast to compile flags
2012-07-30 22:59:18 +02:00
Piotr Dziwinski d8a0c8d32e Lines and line strip primitives
Will probably be useful
2012-07-30 22:32:28 +02:00
Piotr Dziwinski 220ff9fe52 CCamera rewrite
Rewritten old code; doesn't compile yet because changes in other
modules are needed.
2012-07-29 18:42:56 +02:00
Piotr Dziwinski 7c5a3514dd Video mode changing
- added video mode querying & changing
- added joystick querying & changing
- cleaned up CApplication interface
2012-07-29 15:09:53 +02:00
Piotr Dziwinski 72c0188ec3 GLEW
Added GLEW for loading OpenGL extensions
2012-07-28 23:36:12 +02:00
Piotr Dziwinski 4ddcd9f810 Change of paths in src/graphics
- moved abstract core to src/graphics/core
- moved proper graphics engine to src/graphics/engine
2012-07-26 22:26:19 +02:00
Piotr Dziwinski 045f17a274 Dynamic light manager
- rewrote old CLight as CLightManager
2012-07-26 21:35:04 +02:00
Piotr Dziwinski d1fe0d2dcc Lighting
- fixed problems with lighting
- added light_test
2012-07-26 19:05:09 +02:00
Piotr Dziwinski bc1c9b5284 Fixed bug in texturing 2012-07-25 20:27:13 +02:00
Piotr Dziwinski 42963b341f Refactoring of texture code
- refactored texture structs & functions
- added note about OpenGL extensions
- removed device.cpp as unnecessary
- minor changes in CEngine
2012-07-25 00:27:01 +02:00
Piotr Dziwinski 9d59204531 Cursor drawing
- fixed cursor drawing in CEngine
- changed event loop to generate more events
2012-07-23 21:41:27 +02:00
Piotr Dziwinski 8797569d33 Texture & mouse functions; refactoring & fixes
- cleaned up and added documentation to engine.h
- refactored CEngine interface and associated structs
- added mouse handling functions in CApplication & CEngine
- fixed bugs in projection matrix setting
- changed texture loading & handling
- added const-values in CDevice & CGLDevice
- changed event management in CApplication
- other minor changes & bugfixes
2012-07-22 22:05:12 +02:00
Piotr Dziwinski 86ea086790 ComputeSphereVisibility function
- borrowed implementation of ComputeSphereVisibility from libwine
- added -lrt to Linux libs
2012-07-18 21:47:47 +02:00
Piotr Dziwinski f364f378cf Fixed OpenGL transformations
- fixed wrong order of transformations
- added transform_test
2012-07-18 19:08:34 +02:00
Piotr Dziwinski 68a7bafe37 Fixes in texture loading
- added other texture formats: BGR and BGRA
- fixed texture loading in model viewer
- moved code from texture.cpp module to texture.h
2012-07-16 19:17:26 +02:00
Piotr Dziwinski 54f4da8792 Fix in model loading; simple model viewer
- fixed model loading code
- added simple model viewer (model_test) in src/graphics/opengl/test
- added system time stamp code
- split the code in app/system modules to separate headers
- added debug messages in model loading
- minor fixes in OpenGL engine
2012-07-15 19:17:49 +02:00
Piotr Dziwinski eca6d26459 Minor changes
- moved mainpage src/doc/docmain.doc.txt to src/app/main.cpp
- removed old modfile modules from src/common
- removed Snd namespace in engine.h
2012-07-11 20:56:09 +02:00
Piotr Dziwinski 2383a42347 Rewritten model loading
- written new implementation of CModelFile (old CModFile)
- added stringutils and ioutils in src/common
- removed old CModel (model viewer)
2012-07-11 20:50:42 +02:00
Piotr Dziwinski 3204360515 Refactoring in math & texture modules
- moved texture-related structs to texture.h & code to texture.cpp
- cleaned up texture test code
- added Math:: namespace qualifiers to math modules for clarity
2012-07-06 19:00:22 +02:00
Piotr Dziwinski e8c9945e13 Fixed bug with texturing
- moved creation-time tex params to Gfx::TextureCreateParams
- fixed bug with texture creation
- added simple test for multitexturing
2012-07-05 23:47:29 +02:00
Piotr Dziwinski af3057df7e Merged changes from dev
Resolved conflicts & added fixes.
2012-07-04 19:56:22 +02:00
Piotr Dziwinski f95df35dc5 Multitexturing support
- added CImage class for loading/saving images and a simple test for it
- added libpng library to build
- added Gfx::Texture struct
- updated the Gfx::CDevice interface to include new features
- implemented the new features in Gfx::CGLDevice
2012-07-04 00:04:53 +02:00
Piotr Dziwinski d9c5a439d0 CGLDevice implementation
- extended Gfx::CDevice interface
  - written OpenGL implementation in Gfx::CGLDevice
  - rewrote color and light module
  - added Gfx::VertexCol
  - added array casts to Math::Vector, Math::Matrix and Gfx::Color
2012-07-01 22:59:22 +02:00
Piotr Dziwinski 9bd4ec03b2 CDevice interface and stub of implementation
- added CDevice abstract interface
- began implementation of CGLDevice
- added stub for Texture struct
- created CGLDeviceConfig
- changed particule -> particle & other minor changes
2012-07-01 01:37:30 +02:00
Piotr Dziwinski 9a268f5538 Switched back to old standard; addded -Wall
- removed -std=c++11
- added -Wall and removed most reported warnings
2012-06-30 10:16:52 +02:00
Piotr Dziwinski e37019943c Event handling, CApplication and switch to c++-11
- added/changed event structs and event queue in common/event.h
 - added event handling and some minor functions in CApplication
 - switched to --std=c++11 because of union in Event struct
2012-06-30 00:12:04 +02:00
Piotr Dziwinski cf312c0b87 Fixed brief Doxygen description 2012-06-26 22:50:55 +02:00
Piotr Dziwinski ebed57aa22 Whitespace and language change
- changed tabs to spaces and DOS line endings to Unix
  (except in CBot and metafile)
- changed language to English
- fixed #include <d3d.h> in d3dengine.h
2012-06-26 22:23:05 +02:00
Piotr Dziwinski b08a63790c SDL project
- added (very basic) SDL template in CApplication and CEngine
- split project into two targets: colobot_old (dependent on DirectX and WinAPI)
  and colobot_new (dependent on SDL and OpenGL)
- moved sound.h/cpp to old/ and created new template in Snd namespace
- added platform-independent dialog boxes in app/system.h/cpp
2012-06-25 19:59:17 +02:00
Programerus f58918031c Declarations for graphics/common 2012-06-25 16:37:03 +02:00
Piotr Dziwinski 3478978c21 CApplication and Gfx::CEngine interfaces & other
- added CApplication and Gfx::CEngine interfaces
- added Gfx::Material struct
- added Math::IntPoint struct
- added template for Gfx::CDevice class
- added templates for Gfx::CGLDevice and Gfx::CGLEngine classes
2012-06-24 15:41:56 +02:00
Piotr Dziwinski 11c947f212 Fix in light.h 2012-06-22 16:54:02 +02:00
Piotr Dziwinski 8bb223e679 Templates for new implementation
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
2012-06-22 16:31:55 +02:00
Piotr Dziwinski 4531ac88d3 Moved old implementations to src/old 2012-06-22 15:54:16 +02:00
Piotr Dziwinski 11df0ebf94 Vertex and Light structures 2012-06-20 19:34:54 +02:00
Programerus 4ecc4bb4c0 Add functions to namespace. 2012-06-20 20:17:00 +03:00
Programerus 81468f8dc9 Struct ColorHSV copied to color.h 2012-06-20 20:07:54 +03:00
Programerus 918f677ae8 Color functions 2012-06-20 17:44:27 +03:00
Programerus 1415bf0bd2 Struct Color 2012-06-20 17:38:27 +03:00
Piotr Dziwinski 9f784e81f8 Switched to new implementation of the rest of math module
- changed structs from D3DVECTOR to Math::Vector
  and from D3DMATRIX to Math::Matrix
- changed functions to new Math namespace functions
- moved mainmovie module from graphics to object
- added Get and Set to Math::Matrix
2012-06-19 20:11:47 +02:00
Piotr Dziwinski b735913deb FPOINT -> Math::Point & other math functions
- changed FPOINT to Math::Point and some functions
  from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options
2012-06-13 22:48:35 +02:00
Piotr Dziwinski a8665d2042 Changed #defined constants to consts; typedef struct -> struct 2012-06-11 17:28:27 +02:00
Piotr Dziwinski 697fbdabf1 BOOL -> bool; additional fixes in constructors/destructors 2012-06-10 15:28:12 +02:00
Piotr Dziwinski 680af17819 Fixed include paths and CMakeLists.txt
Additionally, changed #ifndef to #pragma once everywhere
2012-06-10 00:18:08 +02:00
Piotr Dziwinski d57258ae1c Split math functions; beginning of common structures 2012-04-28 21:46:26 +02:00
Piotr Dziwinski 449cc186d5 Source files split into modules 2012-04-28 17:53:17 +02:00