238f3b7bd8
Fix string::replace which failed replacing substrings at the end when the replacement was longer (thx @ zerochen for reporting). Corresonding tests added.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4230 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-07 09:14:59 +00:00
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
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
614b6894f5
Update changes.txt.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4227 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-02 18:44:43 +00:00
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
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
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
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
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
2d01842f20
- Fixed "Error setting int array for HLSL variable" issue in example 10.Shaders.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4221 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-28 23:50:47 +00:00
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
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
8106d4200f
Add a shortcut return in case reallocate has nothing to do. Should reduce a lot of memory thrashing on irrArrays.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4218 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-27 17:16:19 +00:00
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
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
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
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
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
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
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
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
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
a02c523fa6
Ignore another .layout file.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4207 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-26 10:12:17 +00:00
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
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
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
4fb661abc4
Make Iterator types friend to each other
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4198 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-22 15:15:06 +00:00
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
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
b4f7ef5fd4
Add simple include files for easy alignment packing of data structures
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4195 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-22 13:39:44 +00:00
69d08c7b2f
Fix constness of operators
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4194 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-22 13:35:55 +00:00
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
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
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
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
a5d5488c48
Remove test isPointInsideWithSinglePrecision as triangle3d::isPointInside now rather includes more border points than risking to miss some anyway.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4187 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-12 21:32:42 +00:00
60d67565c4
Enable screenshot test.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4186 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-12 21:01:16 +00:00
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
94968c4a8c
Fix tests triangle3d:
...
- triangle3d::isPointInsideFast now using some epsilon to catch all points on the borders.
- triangle3d::getIntersectionOfPlaneWithLine calculates now with higher precision for more exact results.
- triangle3d::isOnSameSide (used by isPointInside) calculates now with higher precision and uses some epsilon to make it work with larger integers and less floating point troubles. Slightly slower now.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4183 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-11 15:24:38 +00:00
2ea755420c
Fix time for animated model in anti-aliasing test (we should kick out animations from such tests completely!). Results still not as in reference image, but model is anti-aliased. Lines not anti-aliased at value 2 (starts around 10 here). I suspect that's too much driver dependent. Increased requiredMatch to 99.4 as animation might have been reason for low test-value - decrease again if it still fails on other system and is really OK.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4182 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-05 19:13:24 +00:00
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
e33c2c5a9a
- equalsByUlp rewritten slightly to compile with our gcc release settings without warnings.
...
- fast_atof tests now running on 64-bit (should've been last 64-bit specific trouble in tests).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4180 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-05 15:27:28 +00:00
833ad991dd
- Add function equalsByUlp to test for spacing between floating point numbers.
...
- Allow difference of 1 ULP in fast_atof tests (as that is still correct). Note that this only fixes part of the fast_atof test, the whole tests still fails on 64-bit because test_strtol still fails (that looks more like a real bug).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4179 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-05 11:46:37 +00:00
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
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
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
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
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
3aa4260646
Prevent memoryleak in stabilizeScreenBackground.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4173 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-03 21:41:20 +00:00
4acc86e82a
Test matrixOps needs a slightly larger epsilon on 64-bit.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4172 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-03 18:59:24 +00:00
cutealien
Nadro
hybrid