Commit Graph

201 Commits (master)

Author SHA1 Message Date
nadro b371f08d4a - Merged rev 5258-5275 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5286 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-17 22:17:43 +00:00
cutealien cc3823e853 Merge revision 5248:5253 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5254 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-02-04 23:09:30 +00:00
nadro db0dac2f09 - Merged rev 5226-5244 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5246 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-17 13:08:20 +00:00
nadro e604a608eb - Merged rev 5212-5219 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5220 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-15 21:06:53 +00:00
cutealien d845c35e7d Merge revision 5207:5210 from trunk to ogl-es
- Initialize ContextManager pointer and release it's memory at the end.
- Fix: Prevent division by 0 in CGUIScrollBar::setPos
- Fix: addFileArchive now grab()'s the archive when you pass one in by pointer.
Android example now no longer crashes. But it's textures are still broken.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5211 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-12 20:42:55 +00:00
nadro 58cba0b3c6 - Merged revision 5195-5197 from trunk.
Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
* Support for OSX
(If you need one of those features please use rev 5180)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5198 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-28 23:18:00 +00:00
nadro 0cc2e6dc45 - Merged revision 5185-5190 from trunk.
- Fixed cubemap texture support for OpenGL drivers.

Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
* Support for OSX
(If you need one of those features please use rev 5180)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5191 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-27 22:39:12 +00:00
nadro ce6b7562ce Merge revision 4977:5180 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5181 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-12 22:32:01 +00:00
cutealien 19a829138d Merge revision 4961:4971 from trunk to ogl-es:
- Allow moving the camera around with the mouse in the MaterialViewer.
- Allow compiling on VS with (/Zc:wchar_t-) set.
- bugfix: CUserPointerAttribute::setString had used wrong scanf string parameters (and as far as I can see never worked).
- Can now enable/disable backround drawing for IGUITable and IGUIProfiler.
- Make profiler start/stop calls use counters to make profiling recursive functions easier.
- IGUIProfiler can now work with any profiler using the IProfiler interface.
- Allow to freeze the IGUIProfiler interface.
- Allow IGUIProfiler to display all profile groups on the same page.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4972 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-15 00:55:50 +00:00
cutealien 43817f07f7 Merge revision 4939:4954 from trunk to ogl-es:
- Bugfix: Cloning CBillboardSceneNode now copies colors and sizes.
- Last fix to enable numkeys on X11 had broken the normal DELETE key on X11. So reworked the fix some more.
- Array index was used before limit check
- Add an array with driver name strings for the driver enums.
- Cleaning up Meshviewer example. 
Also added a project target for LinuxGLES2 for the MaterielViewer cbp (this should be done for all examples at some point).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4955 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-01 22:02:09 +00:00
cutealien 0e9e909bed Add IVideoDriver::getAmbientLight function so shader callbacks can access global ambient light easier.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4941 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-24 23:51:06 +00:00
cutealien 89df868452 Merge revision 4926:4931 from trunk to ogl-es:
- EditBox works now with numpad on X11
- Remove unnecessary cast


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4938 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 22:25:25 +00:00
cutealien 8c0d397d52 Merge revision 4924:4925 from trunk to ogl-es:
- Fix bug with multiple SetPixelFormat calls.
- Fixed bug related to memory release in PNG image loader. Thanks elephoenix for it.
- Fix crash in CGUIListBox when users pressed end key folled by any other key in an empty, focused list box (thanks at porcus for report and patch).
- Fix use of enabling defines for wal2 (halflife) image loader. Thanks to hendu for noticing.
- Fix proper screenshot creation in test by inserting the stabilizeScreenBackground call.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4937 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 22:19:49 +00:00
cutealien 22bf85884d Merge revision 4922:4923 from trunk to ogl-es:
- Added helper functions for converting between wchar and utf-8.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4936 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 22:03:14 +00:00
cutealien 6a85f02978 Merge revision 4911:4919 from trunk to ogl-es (4918 ignored as it got reverted again in trunk):
- Fixed issues with setViewPort method under OpenGL


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4933 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 13:22:35 +00:00
cutealien 8880c053c6 Merge revision 4887:4910 from trunk to ogl-es:
- Reduce amount of logging output in skinned mesh loading a little bit.
- Removed DllMain from the static windows build 
- Fixed several selection, highlighting and clipping bugs in CGUITreeview 


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4931 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 12:19:24 +00:00
cutealien d8b0866947 Merge (manually) revision 4883:4886 from trunk to ogl-es:
- Added NETWM support for maximize/minimize under Linux. Fixed aliasing in X11 text conversion.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4930 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 12:16:16 +00:00
cutealien ee30e8b369 Merge 4854:4872 from trunk:
- Ignore some more files (*.d, *.layout, *.depend)
- Fixed issue with missing separate blending entry in OpenGL query feature.
- ISceneNode::deserializeAttributes uses now old values for parameters which are not in the attributes


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4928 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 11:11:43 +00:00
cutealien 901ec7b0da Merge revision 4812:4822 from trunk to ogl-es:
- Fix compile troubles on VS. Thx @Foaly for reporting.
- Animated dwarfes are more fun.
- Reset group-page as well when calling CGUIProfiler::firstPage.
- Ignore binary 17.
- Add examples 17 and 30+ to Linux build support.
- Fix warnings.
- Fix typo in comment.
- CGUIProfiler can now handle it when a group doesn't fit on a single page.
- Add interface for easier access to scrollbars for IGUIListBox, IGUITreeView and IGUITable
- Add IGUITable::getItemHeight


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4853 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 17:38:19 +00:00
cutealien bf9f3a3b5d Merge revision 4802:4812 from trunk to ogl-es:
- Fix serializing colors as strings and add a general test for serializing attributes as strings.
- Link to X11 on c::b project file for tests (got changed recently in other project files).
- Fix IAttributes::setAttribute implementation for textures (did do nothing before).
- Fix recently introduced crash when there is no hovered element but a focused gui element. Thanks @  christianclavet for reporting.
- Fixed D3D8 compilation issues.
- Fixed one problem with Borland compiler, but gave up after that. (Borland 5.5 just doesn't cut it anymore).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4852 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 17:34:24 +00:00
cutealien c8fe2d4e3b Merge revision 4793:4795 from trunk to ogl-es.
NOTE: not yet 100% certain if bridgecalls are deleted in the correct place - will have to let Nadro check that later on.
- Minor improvement in SMaterial::isTransparent method.
- Added separate blending support for both OpenGL and D3D9.
- Added blend factor to SMaterial.
- Improved transparent nodes handling.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4846 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:58:33 +00:00
cutealien 374912b476 Merge revision 4790:4793 from trunk to ogl-es:
- Add a code profiler (stop-watch style).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4845 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:40:08 +00:00
cutealien 5508ba4d23 Merge revision 4789:4790 from trunk to ogl-es:
- Add override font to IGUITable


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4843 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:10:30 +00:00
cutealien 2fc9d4403b Merge revision 4785:4788 from trunk to ogl-es:
- IGUITable can now disable the active column.
- IGUIElement::getElementFromPoint now virtual.
- remove redundant includes.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4841 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:05:21 +00:00
cutealien f50e1af202 Merge revision 4771:4781 from trunk to ogl-es:
- Example 22 no longer select a random texture after loading a new texture (thanks at mongoose7 for reporting).
- Fix bug in IGUISkin serialization which messed up serialization of the button-pressed offsets (Thanks at @Midnight for reporting).
- Remove force blending mechanism and improve blending handling in material renderers.
- Fixed issue with wrongly enabled Z-writing for transparent shader materials. Thanks Hendu for this fix.
- Fixed issue with missing blending when transparent shader material is used with blending operation set to EBO_NONE.
- IGUIStaticText::getTextHeight returns now the correct height for texts with newlines even WordWrap is not set.
- Crashfix for CGUIEditBox. CGUIEditBox::setMultiLine must break text when changed or other functions like getTextDimension can crash afterward for strings with newline characters.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4838 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:27:32 +00:00
cutealien 25a02805d3 Merge revision 4761:4771 from trunk to ogl-es:
- Add same compiler flags to c::b project file as are used in Makefile (-fno-exceptions -fno-rtti -fstrict-aliasing).
- More behavior control for particles:
  - ParticleSystemSceneNode does now affect the particle movement direction by default. Can be disabled to get old behavior.
  - Allow interpolating postions which is useful when particles are attached to fast-moving nodes (to avoid regular patterns).
- Invisible behavior flags from check-in yesterday re-implemented with new general behavior flags.
- Allow more control over particle behavior when the ParticleSystemSceneNode is invisible.
- Remove unusued member variables (found with clang)
- ISceneNodeAnimators can now be disabled and paused.
- Moved StartTime in the ISceneNodeAnimators class instead of derived classes.
- Get rid of some nested anon types.
- Remove superfluous parantheses (causing warnings in clang).
- Fix missing return value in CGUIButton::ButtonImage::operator=
- Remove comma at end of enum.
- Maya camera no longer get's stuck in "rotating" state when a mouse-up event is lost (thx @ JLouisB for reporting).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4837 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:23:50 +00:00
cutealien 6d650ec027 Merge revision 4745:4761 from trunk to ogl-es:
- Focus behavior of IGUIEnvironment now controllable (right-click focus, mouse-over focus). Disabled elements no longer get the focus unless users enforce it.
- CGUITreeView: Irrlicht elements can't just set ID's otherwise user-elements stop working.
- CGUITreeView: Make the horizontal scrollbar (mostly) work. Selection still messed up, but was that way before and least h-scrolling works now somewhat.
- Remove lot's of setFocus and removeFocus calls. Also several places where elements check if they have the focus inside events.
- Buttons can now now have 7 more image-states, 1 more sprite-state and the sprites are now scaleable.
- IGUIEnvironment::hasFocus can work with a const pointer.
- Spritebanks can now draw scaled sprites.
- Improve spritebank slightly (more comfort functions and documentation).
- CGUIEditBox and the GUI-Editor now convert pasted text correctly using mbstowcs.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4836 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:16:46 +00:00
cutealien 7df315e8e1 Merge revision 4742:4743 from trunk to ogl-es:
- Improved i18n key input for X11. Which means languages like cyrillic work now.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4834 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 14:36:17 +00:00
cutealien 863ae8d7a9 Merge revision 4732:4741 from trunk to ogl-es:
- Fix bug that ListBox would not allow to 'tab' to the next element (thx @ FlavourBoat for reporting)
- Fix: Buttons can now change the image several times and the pressed image will always be updated. Fixing Bug #197 by some anonymous coder.
- Fix some ignore files.
- IGUIEnvironment::getNextElement now public (was only in CGUIEnvironment before).
- Add an overwrite mode to editbox. This is patch #275 provided by Adam (aka kingadami)
- Add serialization for the CGUIImage::DrawBounds stuff from last check-in.
- Add IGUIImages::setDrawBounds/getDrawBounds to allow coding stuff like progress bars.
- Irrlichtify variable names (membervariables start upper-case).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4832 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 14:12:33 +00:00
cutealien 549d13ab04 Merge revision 4724:4732 from trunk to ogl-es (also noticed I did a copy-paste error on last check-in and wrote "branch" instead of "trunk" - I always meant trunk certainly):
- Improve documentation for tabcontrol.
- Write (subjectively) nicer xml's by using slightly different linebreak rules.
- Add IGUIImages::setSourceRect/getSourceRect to allow using only parts of an image (can also be used to mirror and scroll them).
- Reduce a bunch of log messages in B3DLoader from ELL_INFORMATION to ELL_DEBUG (thx@ entity for telling
- Collada dae-loader now set's the vertex colors (thx @sf17k for report and test-models)
- Change the rest of the attributes interfaces to pass parameters by const ref instead of per value.
- Ensure vector3df and all classes containing a vector3df are passed by reference instead of per value. Thanks @Danyal Zia for the patch (#280).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4831 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 14:01:54 +00:00
cutealien fbc4fa7da1 Merge revision 4711:4723 from branch to ogl-es:
- Fix c::b project obj folder names. Some static builds had used the shared folders (thx @ gerdb for reporting)
- C::B project files work again on newer Linux-distributions which have cleaned up their dev-lib dependencies.
- Fix a reorder warning.
- triangle3d constructor and line3d::getIntersectionWithSphere passing vectors now as const-ref instead of per value. Thx @nemo for reporting.
- Mention another fonttool to create Irrlicht fonts (by Armen).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4829 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 13:25:22 +00:00
cutealien fd180c7ed5 Merge material changes for COGLES1MaterialRenderer_LIGHTMAP and COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL which had been done in OGL in trunk (r2740) to ensure materials look the same on all platforms (thx @porcus for reporting the problem with TRANSPARENT_ALPHA_CHANNEL_REF).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4716 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-10 11:08:23 +00:00
cutealien 5ec052ff0f Merge revision 4668-4710 from branch to ogl-es:
- Add ITexture::getSource which can be used to check where the last IVideoDriver::getTexture call found the texture.
- Add IMeshTextureLoader interface and replace texture-loading algorithms in most meshloaders.
- Prevent some precision troubles on some compilers when working with vector3d<s32>.
- CGUICheckBox no longer gives up focus on EMIE_LMOUSE_LEFT_UP (thx @Demre for reporting)
- Bugfix: IGUIElement::addChild now prevents setting an element as it's own child.
- GUI editor improvements (prevent crash, improve UI)
- Add IrrlichtDevice::setWindowSize. 


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4711 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-03 18:30:39 +00:00
cutealien 37b154102b Merge trunk revisions 4630 to 4685:
- Makefile for the new IrrFontTool links now correctly to libfontconfig
- Bugfix: getFont for xml-fonts now also works for fonts inside archives (thx @Neirdan for bugreport)
- Add function mergeFilename + tests
- Add ISceneNodeAnimator::setStartTime/getStartTime to allow resetting movement animators. 
- Get Irrlicht to compile with IRRLICHT_FAST_MATH on Linux (out-define code which was written for VS and remove #warn which is not a preprocessor command recognized by GCC).
- Make key-release events also show the correct Char value on Windows (thx @zerochen for report+fix here: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49499)
- Fix input with numlock-keys on Linux. Thx @zerochen for report and help with bugfixing.
- Linux version of makedocumentation.sh now works like the DOS version and creates html docs.
- Add some error checking in test.
- Indentation


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4686 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-13 13:01:14 +00:00
cutealien b74d7c5ed5 Merge r4618-4629 from trunk. Branch has now catched up to trunk again :-)
Fix memory access in d3dx mipmap generation. Thanks to hellflip for the hint.
Developer documentation - adding a release checklist.
Improve speed for finalizing skinned meshes (removal of unnecessary frames after loading) (thx @ichtyander for the testmodel)
Down from ~20 seconds to ~0,5 seconds :-)
Minor bugfix for my last check-in. dropBadKeys now finds some more broken frames.
Changing calling convention for static lib release fast CPU to Cdecl because FastCall did not actually compile (conflicts with pnglib). Also the same setting is used when compiling as dll, so I guess this setting was simply not tested. Thanks @AReich for reporting. See thread for more info:  http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49462


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4651 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 00:09:09 +00:00
cutealien d87aec8a3b Merge r4616-4617 from trunk:
Merged updates from 1.8.1 release to trunk, revisions 4579-4615.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4650 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 00:00:33 +00:00
cutealien 4ea8bd628f Merge r4602-4608 from trunk:
Collada loader now instantiates camera nodes which had been ignore so far (thx @NemoStein for the test .dae)
Add render calls to two windows, where possible


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4649 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:55:58 +00:00
cutealien 52ce5d3127 Merge r4580-4594 from trunk:
Removed unnecessary glFinish call on OSX platform. Thanks devonsoft for report this bug.
Merge near identical code in CTriangleSelector::createFromMesh and CTriangleSelector::updateFromMesh (createFromMesh now using updateFromMesh).
vector2d::equals now has an tolerance parameter for passing the epsilon (like vector3d has already). Note that this changes the default behavior of vector2d::equals as well as functions using it like the operators for ==, !=, <, >, <=, >= when using vector2d with f64 as the tolerance is increased in that case (for f32 and integer values it shouldn't make any difference).
line2d::intersectWith has a new parameter to allow ignoring intersections with coincident lines
Revert VS10 project file to previous version as it got accidentally checked in with static linking enabled (sorry).
Fix more typos in documentation and add a little more docs (thx @Yoran for reporting).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4647 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:38:20 +00:00
cutealien 7dc4d7c9e3 Merge r4579 from trunk:
Merged revision 4534-4578 from 1.8 branch:
- Fix crash in SoftwareDriver2 when Material was EMT_DETAIL_MAP but texture[1] was not set (Thanks for fix by chronologicaldot)
- Fix issue in CAnimatedMeshSceneNode::clone which cause crash. (reported and fixed by luthyr)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4646 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:31:31 +00:00
cutealien 2be14de251 Merge r4562-4570 from trunk:
Remove wrong _IRR_OVERRIDE_'s which prevented compiling on Linux.
Updated changes text file.
EMT_TRANSPARENT_ALPHA_CHANNEL_REF working again like in older Irrlicht versions (1.4 or so):
It uses again SMaterial::MaterialTypeParam instead of a hardcoded values and makes an exception when MaterialTypeParam is 0 (using it like 0.5 instead) to ensure it works by default. See http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=48940 for new discussion.
_IRR_OVERRIDE_ needed a few more checks on gcc to prevent compile warnings on some systems.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4643 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:14:52 +00:00
nadro 9acca683c9 - Updated changes text file.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4565 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-07-22 20:40:49 +00:00
hybrid 3f0c8e3a3b Final merge of ancient file revisions. Most stuff seems up to date now, only OSX device is probably completely broken and needs a fresh copy from trunk. Will merge latest trunk again in next run in order to have a proper version number in the logs again.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4492 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-04 16:15:53 +00:00
hybrid d5e6d04769 Merged another, now very ancient, revision from trunk in order to remove the old msvc6 project files. Seems we missed this merge also. And added two missing files, to reduce the distance between trunk and branch some more
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4491 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-02 17:27:12 +00:00
hybrid 4f4ca75a4f Merged some older revisions which seemed to be missing, namely 3986-4057 from trunk
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4490 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-02 16:01:12 +00:00
hybrid 0753afac9d Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-28 17:04:07 +00:00
hybrid 5caf2b4045 Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3910 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-08 22:15:27 +00:00
hybrid 7ae68647e9 Next large merge from trunk, revisions 3729-3830
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3831 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 07:08:47 +00:00
hybrid e379658827 Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3727 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-05-18 22:21:50 +00:00
hybrid de2e004b83 Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3560 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-01-14 15:36:50 +00:00
hybrid ab5739f571 Merged from trunk, revisions 3300-3365. Another large bugfix merge.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3369 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-07-18 21:25:27 +00:00
hybrid 7bae34bc61 Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3301 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-06-01 22:52:38 +00:00
hybrid d07fc00916 Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3174 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-01-23 20:13:43 +00:00
hybrid 329f550b17 Merged revisions 2781:2892 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2893 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-20 10:08:00 +00:00
hybrid 2061a3862f Merged revisions 2695:2780 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2781 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-02 17:20:21 +00:00
hybrid 72e83023ec Merged revisions 2441:2694 from trunk. This is a huge update which brings the ogl-es branch to the latest 1.6 state. No updates for the ogl-es driver have been incorporated, this branch might not even compile properly right now. I'm just very happy that the merge finally went through...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2695 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-09-16 12:48:19 +00:00
hybrid b24d213745 Merged revisions 2375:2440 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2441 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-07-03 09:11:53 +00:00
hybrid 75b5403b5b Merged from trunk revisions 2144:2363
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2364 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-05-05 00:09:53 +00:00
hybrid 55e2c6d600 Merged from trunk, all revisions from 1977 to 2143.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2144 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-01-27 13:23:36 +00:00
hybrid 30100db0a5 Merged all revisions up to 1976 from trunk into ogl-es branch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1977 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-12-19 09:56:25 +00:00
hybrid cc7f977f60 Merged revisions 1726:1852 from trunk for the recent updates.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1853 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-11-27 23:52:13 +00:00
hybrid 51484af6d3 Merge rev. 1524:1721 from trunk in order to get latest initialisation code and feature support for ogl-es driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1722 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-11-12 10:11:25 +00:00
engineer_apple d4dd74ffff small bugfix winCE
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1524 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-09-01 15:41:36 +00:00
hybrid 07518fba46 New glext.h and glxext.h including support in ExtensionHandler for OpenGL 3.0 additions.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1502 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-18 15:17:03 +00:00
hybrid 763acaa745 Merge revisions 1495:1497 from 1.4 branch. GUIImage fix by CuteAlien. Default value changes in particle system and scene manager.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1498 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-14 15:36:21 +00:00
hybrid 9f390fe59c Make isBetweenPoints-check include the begin and end points.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1483 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-10 16:14:03 +00:00
hybrid aca761b6d6 Fix XML reader creation for non-existing files and invalid callbacks to return 0.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1482 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-10 16:08:25 +00:00
hybrid b5d6000f8d Added new mMeshManipulator method scaleTCoords to scale texture coords of a mesh. Added two new access methods to texture coords of vertices of a meshbuffer. This allowed to replace the template for planar mapping as well.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1479 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-09 12:04:56 +00:00
hybrid 69389d0c9e Renamed scaleMesh to scale, added support for meshbuffer scaling.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1478 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-09 10:34:58 +00:00
hybrid 3c45d6f44a Merge with 1..4 branch revisions 1444:1475, namely the irrMap bug and changes.txt updates.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1476 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-08 15:25:43 +00:00
hybrid 19d7272808 Update of changes.txt with all trunk changes since the 1.4 branch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1472 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-08 11:25:26 +00:00
bitplane 3d51b275d4 Checking for IsEnabled is now consistent across all GUI elements (bug 2003234 by CuteAlien)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1412 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-07-08 19:47:51 +00:00
hybrid c55da82a0c Merged revisions 1357:1366 from 1.4 branch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1367 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-06-12 11:15:45 +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 f524ab2b03 ISceneNodeAnimator now inherits IEventReceiver, cameras send events to their animators. FPS and Maya cameras are now animators.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1321 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-24 21:39:22 +00:00
hybrid 0e63486fbe Merged revisions 1309:1314 from 1.4 branch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1315 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-12 23:02:15 +00:00
hybrid 897a3fa6a6 Merged from branch 1.4 revisions 1290:1305.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1306 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-03-30 23:19:12 +00:00
hybrid e7add51880 Merged from 1.4 branch revisions 1272:1279
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1280 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-03-05 00:02:00 +00:00
hybrid beea38a195 Merged from 1.4 branch revisions 1235:1250
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1251 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-21 00:20:39 +00:00
bitplane daedda8523 Fixed a performance bug in ISceneNode constructor reported by izhbq412
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1237 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-11 20:00:54 +00:00
bitplane 6f4a9f921a Compiling without the BMP loader now compiles without the built-in font data. Added some comments and a warning about this. CGUIPanel draws background when border is on
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1236 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-11 19:34:12 +00:00
bitplane f6db869698 Added IGUIComboBox::setTextAlignment and made combo boxes properly serializable
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1233 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-08 08:23:38 +00:00
hybrid 5bc1bdc13e Merged from 1.4 branch revisions 1198:1217
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1218 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-30 00:07:52 +00:00
bitplane 1608f3f6fe Table serialization fix, small update to gui editor colour attribute, updated readme.txt
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1180 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-16 05:10:27 +00:00
bitplane 6436ded4e1 Huge GUITable update by CuteAlien.
Modal screen no longer flashes invisible children.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1172 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-11 15:56:37 +00:00
bitplane 2d698c4397 Added RogerBorg's better fix for hires timers on dual core machines.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1155 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-04 17:52:39 +00:00
engineer_apple 24334f193c added Initial Windows Mobile 6 Version.
- Windows Mobile 6 SDK
- Visual Studio 2005 only
Minor:
- Burningvideo: MipMap Selection repaired
- renamed private Driver function getTextureSizeFromImageSize to
  getTextureSizeFromSurfaceSize


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1146 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-02 10:28:12 +00:00
engineer_apple 1f349d836a - Burningvideo: repaired MipMap Selection
- renamed private Driver function name getTextureSizeFromImageSize to
  getTextureSizeFromSurfaceSize ( now equal in all drivers )


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1143 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-30 16:51:28 +00:00
bitplane 0dffdd46a6 table serialization
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1132 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-23 02:48:02 +00:00
bitplane 41bfa7d990 Added collision manager optimization by rogerborg, adds early-out optimizations in ray-triangle intersection.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1126 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-22 08:15:22 +00:00
bitplane aab1dfa7cb Added StarSonata GUI patch from the tracker, const corrected. Fixed some bugs and changed the style and behaviour of the tabs. Tables aren't fully tested and don't serialize properly yet.
Changed gui editor to show off and test the new tab features.
Updated project files and makefile, have only tested vc8 and dev-cpp. Didn't know how to do the OSX project so I'll leave it for Dean.
Moved EGUI_ALIGNMENT into separate header.
Added getArea and getVolume for bounding boxes, no real reason for them.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1124 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-22 07:49:29 +00:00
hybrid 48e009de8f Merged 1.4 branch 1075:1105.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1105 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-08 13:11:39 +00:00
engineer_apple d5a32e5dc1 -------------------------------------------
Changes in version 1.4 (... 13.11.2007)
- Fixed somed CQuake3ShaderSceneNode problems.
- Changed BurningsVideo internal Vertex Format. version changed to 0.39
- SceneManager:
   Removed the seperate rendering states for quake3 Shader Scene Nodes.
   Nodes are now solid or transparent. ( but still more states are needed )


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1049 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-11-13 14:37:24 +00:00
hybrid 57ddd994dc Partially reverted the skybox changes, such that now only a right/left texture exchange is needed. Skyboxes are still correctly oriented and other tools are still compatible.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1021 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-10-05 07:48:53 +00:00
hybrid ced5e21846 Fixed the skybox textures orientation. They are now displayed non-flipped. Existing skybox textures have to be exchanged and rotated, though.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1011 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-28 23:10:53 +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
bitplane 4b2edf78e3 scrollbar fix, updated readme
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@988 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-19 15:59:46 +00:00
hybrid df946a1ce6 Removed unnecessary irr namespace prefixing.
Added STL mesh file format reader and writer. This is a pretty simple format, but I wanted to try the mesh writer interface.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@983 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-19 14:08:28 +00:00
bitplane 240c64cd4f Added ITexture::isRenderTarget and moved OGL render texture flip to the texture matrix.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@982 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-19 12:52:35 +00:00
hybrid 08e359784b GUI constification done, other parts still missing.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@961 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-16 00:18:13 +00:00
bitplane e87832050e added IMeshManipulator::createMeshWelded to copy a mesh with welded vertices. removed IAnimatedMeshX from the vc8 project.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@944 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-11 21:47:32 +00:00