Commit Graph

28 Commits (dc41969f1f20a762538812e930b1b1f84f376cdd)

Author SHA1 Message Date
hybrid 16bb785537 Fix last showstopper for GL2 GLSL instantations
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3227 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-02-16 20:17:25 +00:00
hybrid 9c4bb40b6c Fix some more typos in gl extension usage and new GLSL interface
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3226 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-02-16 19:55:47 +00:00
hybrid aee05c3199 Fix typo with using the wrong variable.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3225 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-02-16 14:33:06 +00:00
hybrid 3c6b62c127 Fix the old way for shaders to work properly.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3215 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-02-10 17:34:28 +00:00
hybrid b74a85df05 Add the new OpenGL2.x scheme for shader creation.
Properly clean up shaders, which were not completely removed before.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3214 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-02-10 17:17:33 +00:00
hybrid 1f574c6069 Add support for different primitive types for geometry shaders.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3019 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-12-07 17:27:22 +00:00
hybrid 69fd3110f4 Fix wrongly set ifdef
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2958 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-12-01 08:38:22 +00:00
hybrid f7c1b27558 Make sure we hide the GL enums whre they don't exist.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2957 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-12-01 02:08:27 +00:00
hybrid e7b200fef4 Merged revisions 2892:2947 from 1.6 branch. Mainly GUI fixes. Cylinder texturing enhanced. WIN64 defines everywhere also use _WIN64. Code layout and documentation updates.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2948 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-30 14:42:58 +00:00
hybrid 8e4002126f Geometry shaders need triangle_, not triangles, as output type
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2928 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-25 13:53:15 +00:00
hybrid 51545ba051 Add geometry shaders for OpenGL. Implementation is largely influenced by ideas from devsh. Right now the input and output types are fixed to EPT_TRIANGLES, the maximal output vertices are only limited by the driver, and some geometry shader extensions are wrongly used. Will be fixed in the near future.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2926 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-24 23:35:43 +00:00
monstrobishi 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
bitplane 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
hybrid 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
hybrid 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
hybrid 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
bitplane 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
lukeph 1abb464b49 -fixed a bug in setting shader constants.
passing arrays were not working, can an openGL programmer check this is now right?

-let the user add a shader without a pixel or vertex shader, as docs state.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1080 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-03 08:03:21 +00:00
lukeph 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
hybrid 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
hybrid 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
hybrid 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
hybrid 18f0aebac6 Fixed manual mipmap generation and removed the last glu function.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@889 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-02 19:45:17 +00:00
hybrid 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
hybrid 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
hybrid 2dc1051124 Added a name parameter to render target textures just as for usual textures.
Exposed findTexture in IVideoDriver to check if a texture was already loaded.
Reordered some more OpenGL render state settings in the materials.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@783 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-07-13 13:53:34 +00:00
hybrid 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
bitplane 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