Commit Graph

1881 Commits (d432f415a2c20b8125bf63518460d12659a545e8)

Author SHA1 Message Date
Nadro d432f415a2 - Added bool interface for a shaders constants.
- Fixed issue with an int array uniforms.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4229 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-04 13:59:21 +00:00
Nadro 7f01500fd1 - Improved texture handling in a shader callback (returned ability to bind a texture by a float interface).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4228 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-04 02:26:30 +00:00
cutealien 642f4080b4 - Modified struct packing solution to work with gcc 4.7 on MinGW. Which makes for example bmp-loader work again (textures in example 01 for example). Note: If this should be backported to 1.7 we should maybe just set the -mno-ms-bitfield flag for mingw there (not as nice, but will probably work good enough as workaround for what we use in Irrlicht and we don't have our nice packing headers there yet so we would have to do that all over the place).
- Also added new packing headers to c::b project file.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4226 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-02 18:40:30 +00:00
Nadro d0d209e2ef - Fixed "if" instructions for AMD extensions related to blending.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4225 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-01 17:15:09 +00:00
cutealien 27879dd9a7 - User can now set characters used for decimal point in fast_atof for localisation.
- Update changes.txt

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4224 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-29 17:04:18 +00:00
cutealien 3a608e8381 Add parameter useAlphaChannel to second IGUIEnvironment::addImage function as it's rather confusing when they have different defaults. Unfortunately can't use same parameter order anymore without messing up existing user-code now (some things can only be done right on first try...).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4223 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-29 15:41:23 +00:00
cutealien b2dcd0aa1d Get rid of unnecessary warning "Could not load sprite bank because the file does not exist" for "#defaultfont".
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4222 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-29 15:32:10 +00:00
hybrid 47b8c747b1 Fix ifdef hierarchy to correctly close the system check early and put all extension pointer calls into the large 'if use extension pointer' bracket.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4220 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-28 12:10:45 +00:00
hybrid e01700a9a4 Fix MRT disabling. Bug found and fixed by hendu.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4219 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-28 08:40:04 +00:00
cutealien d4ee640740 Use another solution to ensure first animation frame is at start. Solution yesterday had the trouble that it was no longer possible to use setCurrentFrame before otherwise. Tests b3dAnimation and md2Animation working again.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4217 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-27 13:54:33 +00:00
cutealien 26b2b68a13 - COpenGLTexture::getOpenGLFormatAndParametersFromColorFormat now returning values for ECF_R5G6B5 which can be used in glTexImage2D. Fixes test renderTargetTexture. I've also added a few more error-checks in debug.
- Remove assert in opengl driver (already logs and asserts prevent tests from running through).
- NOTE: 2 new tests failing: b3dAnimation and md2Animation. Maybe due to animation fix from yesterday.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4216 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-27 10:54:12 +00:00
cutealien d59ebca784 Add -fPic in c::b linux fast math shared build (found by teto).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4215 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-26 20:11:23 +00:00
cutealien b4d3b55205 Fix compiling for D3D8.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4214 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-26 18:03:40 +00:00
cutealien 9254ed9b27 Add 64 bit targets for examples and tests for VS2010.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4213 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-26 17:53:38 +00:00
cutealien 37d4c2f090 Document how to use the makefile with MinGW and use DNO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_ and DNO_IRR_COMPILE_WITH_DIRECT3D_9_ as defaults there.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4212 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-26 14:35:31 +00:00
hybrid e65e42d06a Fix dx8 init to use the params scheme as the other drivers do. This change reverts the last commit and fixes the problem in a different way.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4211 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-26 12:38:42 +00:00
cutealien e13f2d0a3e Remove D3DCREATE_MULTITHREADED from d3d8driver again (no one uses that anyway anymore and it caused compiled troubles).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4210 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-26 11:47:02 +00:00
cutealien c739925fbe Merge revisions 4188-4208 from release branch 1.7 into trunk:
- Update changes.txt 
- Change include order to get example 21 compiling on MinGW.
- Fix linker path in example 16 for C::B project file (linker path was in include path section). 
- Link with opengl32 and gdi32 in Example 14 in C::B. 
- Remove --no-export-all-symbols which got recently added to the windows build as that flag is not known by gcc on Windows. 


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4209 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-26 10:52:27 +00:00
hybrid c527d9ec04 Fix by Auria for starting the animated meshes only at first OnAnimate instead of at random times and animation frames.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4206 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-25 23:41:54 +00:00
hybrid 5feef493c1 Add support for MAX_COMBINED_TEXTURES, which allows more texture support than with the original fixed pipeline texture check under OpenGL. Now, more than 4 textures should also work with newer gfx cards and drivers, which often only support 4 fixed pipeline textures.
Moreover, now you can also set more than the maximal texture layers defined in IrrCompileConfig, simply by calling setTexture in the driver. The MAX_MATERIAL_TEXTURES thus only defines how many textures and configurations are stored in material properties. Currently only used under OpenGL.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4200 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-24 20:18:30 +00:00
hybrid 483c085f06 Make float to double conversions for explicit string conversions also explicit and this better visible. Fixes compilation issues with DMC
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4199 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-22 15:17:04 +00:00
hybrid 77c2ec8803 Avoid memory allocation and return value testing in one line
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4197 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-22 15:02:57 +00:00
hybrid 4bf7ef38c5 Fix pack and unpack include file to properly work under MSVC as well. Needs to suppress warning as we don't have the push and pop together anymore.
Fix push and pop usage - some files forgot to add the define, so effectively not work under gcc with special architectures - and move all files to use the new include files.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4196 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-22 14:28:33 +00:00
hybrid 8252d5677f Oops, typo in Windows code due to merge.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4192 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-15 12:56:50 +00:00
hybrid 4bc869596f Fix framebuffer postfix absence when not using extension pointers. Just use the so far only for OSX used version without _ARB postfix. Fix BlendEquationIndexed code which was wrongly copy-pasted.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4191 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-14 23:34:17 +00:00
hybrid 976a3daa72 Merge in version 1.2.7 of zlib from vendor branch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4190 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-14 23:06:35 +00:00
hybrid 823bc87bfe Merge from 1.7 branch, revisions 4090-4187. Device fixes, serialization bug fix, some compilation warnings. Bug in color conversion fixed, and some demo fixes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4188 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-14 22:37:53 +00:00
cutealien 1e4a0a77fd Fix screenshots under Linux/OpenGL for formats ECF_R5G6B5 (failed before) and ECF_R8G8B8 (red and blue where switched). Note that R5G6B5 still has strange results when writing to file. But that's due to a bug in color-conversion, which is fixed already in 1.7 and will be merged to trunk soon.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4185 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-12 20:59:47 +00:00
cutealien 8c14eebb1a Move defines out of header or add prefixes to avoid accidental name collisions.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4181 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-05 15:51:38 +00:00
cutealien 366c0e48b5 Fix another missing return in COpenGLExtensionHandler::extGlIsQuery. Found again by Randajad.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4178 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-05 10:44:53 +00:00
cutealien a6602ef67d Speedup collada writing.
Speedup xml writing once more and describe how to get rid of the remaining major bottleneck (another time).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4177 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-04 18:21:01 +00:00
cutealien 176d607f7f cleaner solution for xml-writing speedup.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4176 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-04 16:22:35 +00:00
cutealien 5703a48a43 Preallocate string in CXMLWriter::writeText to speedup xml-writing somewhat.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4175 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-04 14:13:23 +00:00
cutealien 8eb5398874 Add missing return for glIsOcclusionQueryNV (thx @ Randajad for reporting).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4174 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-04 11:03:22 +00:00
cutealien 17de62ac84 Add filename to error-message when jpg-loading fails.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4169 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-05-25 10:32:38 +00:00
cutealien fb80ea202c Linker version property must have type x.x (thx @Kojack for noticing).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4168 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-05-24 08:31:43 +00:00
cutealien ac94777f6d Allow setting D3DCREATE_MULTITHREADED when creating Direct3D drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4167 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-05-22 13:10:25 +00:00
cutealien 3810ecb40c Set correct define _IRR_STATIC_LIB instead of IRRLICHT_EXPORTS in c::b project file for target release-accurate math-static. Fixes Bugreport 3511127 reported by Demone (fixeworks).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4165 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-05-19 21:45:30 +00:00
cutealien dc8f25cc50 Fix several compile-troubles with Collada reported by several people. Also improve some internal function names. Should fix Bugtracker entry 3428843.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4163 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-05-14 22:11:36 +00:00
hybrid 098dc32a7a Avoid problems with Intel drivers when passing 0 as HDc, calls are equivalent when context is 0.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4161 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-05-03 15:42:33 +00:00
hybrid 01c9bd4c83 Fix 8bit grey image TGAs, which were not working due to missing palette. Also switched to RGB8 format, as otherwise a loss in precision would occur. Thanks to Klunk for the error report and a test image.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4160 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-04-29 23:16:29 +00:00
cutealien 390ee21b66 Fix font-drawing in CGUIButton to use EGDF_BUTTON again (thx @DJLinux for reporting).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4158 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-04-28 09:08:43 +00:00
Nadro 720d115ad4 - fixed an issue with a fbo color format.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4157 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-04-28 02:14:47 +00:00
hybrid f23c97088d Remove stray semicolon
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4156 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-04-27 11:25:29 +00:00
hybrid b600a805ba Fix warnings and duplicated variables
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4155 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-04-27 11:09:19 +00:00
hybrid 85260dd7d2 Add texture cache with proper reference handling. This avoids deletion of textures while still being active on the GPU. Test case and fix by m(att)giuca
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4151 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-04-25 20:58:23 +00:00
hybrid a346804bba Remove code which was regarding to legacy windows version support
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4149 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-04-25 13:12:39 +00:00
hybrid 36dabce5ba Fix window caption setting to use same method for both win32 and win64
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4148 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-04-25 12:43:53 +00:00
hybrid da5a5665c8 Fix warnings with pointer arithmetics under 64bit systems
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4147 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-04-25 09:24:43 +00:00
hybrid 0cc1b698da Fix software renderer inconsistency with rest of drivers in case of invalid destination rect for draw2DImage. Now no driver will render an image in these cases.
Added a test case to check behavior of all drivers for this situation.
Fixed comparison of similar test case to support fuzzy comparison and relaxed threshold.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4143 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-04-24 16:53:46 +00:00