157cd67caf
Merged revisions 2622:2663 from branch 1.6. SMaterial bug, MS3D patch, LWO fix. Better Shift recognition under 2in32. D3D depth buffer MSAA problems fixed. string<c16> changed to io::path. Fix 2dimagebatch, add better mtl file finder. Fix some OpenGL extension checks. Fixed x86-64 warnings. Export symbols in gcc4. Scolling in GUITab fixed. Fixed PixelBlend16 and SW driver. FPS cam stuttering fixed. OSX project additions. New scene parameter to ignore obj's mtl files.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2664 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-08-24 09:12:27 +00:00
63a3790722
Fixed up version of the OpenGL ARB shader "parallax map and normal map with fog" patch. The code requires little changes to the ShaderMaterial in order to reuse existing shader renders, as we now have an array instead of one shader handle. Also, vertex and pixel shaders need to be adapted for fog usage, namely by setting the fogcoord in the vertex shader and adding a comment into which Irrlicht will add the proper fog option. Documentation will follow once we have cleaned up the shader usage.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2467 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-07-11 23:47:00 +00:00
7d00cc91d1
- Renamed texture setting function (setTexture) in most video drivers to setActiveTexture and made sure it has the same signature. This avoids confusion with similarly named methods in other classes (Such as SMaterial) and the consolidated method signature will hopefully help future plans for better abstracting texture usage across all drivers.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2438 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-07-02 06:43:24 +00:00
108f3333ff
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2277 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-03-14 18:15:04 +00:00
7472bcd83c
Merged from 1.5 branch to trunk, all changes from 2042 to 2071. cursor setVisible fix, OSX FPS cam fix, ALPHA_CHANNEL_REF fix, new method draw2dRectOutline, setOverrideFont fixes, getCollisisonPoint distance bug fix.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2072 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-01-14 12:37:51 +00:00
0b03402773
Merged from 1.5 branch to trunk, all changes from 1821 to 1835. Mostly warning fixes, GL ASM shaders repaired, d3d9 RTTs less memory consuming, skinned mesh bboxes updating.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1837 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-11-26 10:44:30 +00:00
cdffc4a5d6
Merge from branch 1.4, revisions 1344:1352, which are the doc updates from the 1.4.1 release.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1353 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-05-22 11:51:37 +00:00
7bfe4830d2
Fixed cleanup in case of failed shader compilation such that the base material is used.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1344 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-30 17:06:08 +00:00
f51d8bf3f0
Added debug data strings to most classes
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1340 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-29 20:54:12 +00:00
2f8299d3e3
Fixed OpenGL shader materials to always add a material renderer in order to avoid mismatched predefined material renderers. Moreover, this is also the behavior if no shader support is available.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1336 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-29 16:05:42 +00:00
4dc79e883f
added:
...
virtual void OnSetMaterial(const SMaterial& material) { }
to IShaderConstantSetCallBack, so the callback is able to set constants based on the properties of the used material.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1060 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-11-18 13:03:57 +00:00
fbdbc934a4
Some code doc updates by Dorth.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1040 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-11-06 23:29:59 +00:00
68cd81b194
Split texture layer properties from SMaterial. Changed all texture access etc. in source code and examples. There is also a method to access textures now, which would allow to grab and drop them...
...
Also disabled dx8 by default.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@992 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-20 15:33:36 +00:00
61a5af828e
Some fixes for method signature unification and some other C++ fixes.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@977 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-18 14:01:28 +00:00
445b40fd3b
Made both materials const in OnSetMaterial.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@975 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-18 12:11:10 +00:00
f74f7586e2
Some more constification, but still not done. Now we have also SEvent in OnEvent as const ref, so most user apps will need some kind of upgrade for the new library version.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@964 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-16 23:41:55 +00:00
ebb6f460b4
Use c++ casts instead of plain C ones.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@818 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-02 09:50:59 +00:00
b41385a3ff
Mem leak fixed in d3d RTT code identified by vitek. Some redundant code removed and OpenGL shader materials fixed for changing number of textures.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@807 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-07-25 12:51:43 +00:00
ae34762eee
Inlined the OpenGL access methods, also renamed some of them to make the names more durable in case the official methods are promoted.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@691 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-06-05 17:56:10 +00:00
c00ce1d372
Moved everything to /trunk
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@643 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-05-20 18:03:49 +00:00
hybrid
monstrobishi
bitplane
lukeph