7f80317b90
Fix CBillboardTextSceneNode::OnAnimate to call base-class OnAnimate again (thanks at Erelas for bugreport+testcase).
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3945 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-17 16:12:44 +00:00
95d92363ab
Merge from 1-7 branch, releases 3927-3942. Just documentation fixes.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3943 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-16 10:26:05 +00:00
86c043ea52
All gui-elements now use "SColor" instead of "const SColor&" to unify interfaces somewhat (it doesn't really matter which way it's done - the only bad solution is doing it different in every second function). I don't dare changing the one occurrence of "const SColor&" in IGUISkin as skins are so often overloaded and so changing that would break too much user-code, will do that once IGUISkin is more seriously reworked. Sorry for anyone already overloading gui-elements IGUIEditBox, IGUIListBox, IGUIStaticText - you will have to change that as well. But I think in the long run it's better having this at least a little less inconsistent.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3941 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-11 17:35:47 +00:00
cbdbf04487
Messed up last check-in somewhat. Now all getColor functions in statictext avoid const& (which is OK as SColor is just a long).
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3940 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-11 16:58:15 +00:00
e03bb4929f
Add getBackgroundColor, isDrawBackgroundEnabled and isDrawBorderEnabled to IGUIStaticText (thx 4 patch from Nalin).
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3939 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-11 08:41:26 +00:00
e6a6ff0838
Remove checks and default constructed dummies due to erroneous temporary usage.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3938 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-08 12:34:10 +00:00
5a663375b4
Remove calls to getVideoDriver by direct member access. Found by REDDemon.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3936 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-08 11:40:27 +00:00
f0bc01581f
Add missing cases for override material, found by REDDemon
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3935 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-08 11:34:15 +00:00
9a6c5fc747
Add flag to avoid duplicated skinning in one frame for the same mesh and animation frame. Needs to be checked if all cases where a setting has changed and skinning needs to be applied, has been properly marked and resets the flag.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3934 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-06 14:43:47 +00:00
fb9d9e0b42
Switch debug messages to ELL_DEBUG. Rename a helper function
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3933 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-04 23:17:34 +00:00
29162bc2d4
Constification of statements. Add some bbox recalculations
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3932 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-04 23:05:05 +00:00
c6a8682ce6
Update trunk with missing files from libpng, and copy pnglibconf.h from scripts directory.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3931 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-28 23:37:30 +00:00
6ee5963381
Merge trunk with new versions of jpeglib and libpng
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3929 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-28 23:03:44 +00:00
582cb75095
Merge from 1.7 branch. Fixes for SSharedMeshBuffer and matrix4
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3925 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-27 22:54:27 +00:00
39e76d36d2
Fix mem leak found by gbox.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3921 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-18 21:20:25 +00:00
f9b538f9ee
- Added ISceneNodeAnimatorCameraFPS::getKeyMap and a new ISceneNodeAnimatorCameraFPS::setKeyMap.
...
- CSceneNodeAnimatorCameraFPS uses now SKeyMap instead of SCamKeyMap (structs were identical which was confusing and there wasn't any explanation in comments, so I decided to simplify it).
- Add some workaround to MeshViewer to show how we can currently fix the FPS-cam when users to alt-tab while moving. We can improve that some day when we have focus-events, but this works for now.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3920 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-14 14:07:54 +00:00
c40df30f9d
Update to latest headers and extensions from OpenGL
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3919 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-14 00:00:43 +00:00
5de816e573
- Avoid one call to OutputDebugStringA in logging (OutputDebugStringA got very slow when debugging since VS2010)
...
- Demote a few logging outputs in COBJMeshFileLoader from ELL_INFORMATION to ELL_DEBUG.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3918 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-13 10:57:06 +00:00
9f9ccaa409
Add comment for proper directory mounting.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3916 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-10 10:21:02 +00:00
f6662bffdd
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3915 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-10 10:16:23 +00:00
5c67d339b4
Fix LZMA uncompression. Added test case to ensure proper decoding.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3914 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-09 23:38:59 +00:00
480c284703
Add ARB_framebuffer_object extensions support
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3913 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-09 14:43:00 +00:00
556f367df9
Fix constness for proper overloading
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3912 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-09 13:50:39 +00:00
fa754dd47b
Add normals recalculation in case it is missing in the ply file
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3911 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-09 13:33:35 +00:00
afa978f2a5
Merge from 1.7 branch, revisions 3877-3908. Fix for getSphericalCoordinateAngles, some warnign fixes, md2 normal fix, several GUI fixes, isPointInside fix, zip endianess fix.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3909 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-08 21:50:10 +00:00
5d7b7931e6
Fix rendering with only index buffers. Basically, this is now removed, because d3d seems not to support this. Hence we can only render with hw buffers, if both vertex and index buffers are enabled.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3908 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-07 17:04:10 +00:00
65383f9fb9
Enable VBOs for water node.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3907 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-07 15:52:05 +00:00
4486cee370
Thanks to Auria, this fix makes octree work with mixed lightmap meshes (i.e. meshes which mix meshbuffer types). Most b3d files do this, and now work properly with octree support. The fix is right now not perfect, because of incomplete tangent vertex creation in case this vertex type is also used. But fixing also this issue would mean a huge rework of the octree, which has to wait for now.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3906 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-07 07:31:53 +00:00
5ba7ae5afd
Fix rotationFromTo as suggested by AgentD, using the from vector instead of the current values from the quaternion. After all, this quaternion has nothing to do with from or to so far, so the values contained there are rather arbitrary. Moreover, I'm normalizing the quaternion before returning it, as it is a rotation quaternion, which should be a unit quat. Test cases are also extended. For now only in trunk, may be backported after further testing.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3905 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-08-30 14:13:45 +00:00
059af8caa6
Add ConstIterator, as suggested and implemented by oblomov
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3904 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-08-30 14:07:32 +00:00
62057f1ea2
CGUISpinBox range does now also use decimal places to avoid getting endless loops in setValue/verifyValueRange.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3902 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-08-09 14:34:25 +00:00
7b5f390920
Fix comment about makefile changes
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3900 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-08-05 12:32:10 +00:00
5d5bbe11b7
Apply changes to fix issues with dynamic libs handling as suggested by mgiuca
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3899 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-08-04 22:50:44 +00:00
ac15f6e1ee
Change editbox colors once more.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3897 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-08-01 10:16:55 +00:00
b08dbc49bc
Update camera documentation.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3896 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-30 09:31:58 +00:00
8a7245c103
Update Makefile documentation.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3895 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-29 14:57:59 +00:00
9120aebe73
Add early-out in collision for empty selectors.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3893 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-28 11:22:06 +00:00
875abd25f3
Collada writer sets now set and input_set for TEXCOORD input and bind as some Collada tools want that (doesn't care yet about second UV-set, but also does not make it worse).
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3892 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-27 10:03:11 +00:00
471df3f0ab
CSceneCollisionManager::getScreenCoordinatesFrom3DPosition uses now getCurrentRenderTargetSize instead of getScreenSize.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3891 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-26 14:29:56 +00:00
8fb7ee723c
One more svn:ignore (for tests in tests).
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3890 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-25 17:31:06 +00:00
69b0f8de6b
Fix some more svn:ignore.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3889 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-25 17:25:44 +00:00
97cd9ad421
svn:ignore for code::block .depend, .layout, objs and binary files.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3888 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-25 17:15:48 +00:00
11a1c66959
Fix some c::b project files which did not link on Linux.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3887 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-25 16:40:49 +00:00
b47d6b1f16
svn::ignore for newer examples in bin/Linux
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3886 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-25 16:07:50 +00:00
8a6371c6ca
Add serialization for CGUIComboBox::MaxSelectionRows
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3884 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-20 09:28:19 +00:00
0d5d30acaf
Add IGUIComboBox::setMaxSelectionRows and IGUIComboBox::getMaxSelectionRows
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3883 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-20 09:16:34 +00:00
029b18658b
Change editbox-colors to make them look similar to what we had in 1.7 (before background drawing had been fixed editboxes had used a mix of 5 different colors).
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3882 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-13 21:35:55 +00:00
d6025d6362
Fixed a memory leak in CIrrDeviceStub, reported by Reiko
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3878 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-11 13:36:31 +00:00
1e90e2d9b3
Merge revision 3848-3875 from 1.7 branch:
...
- EMIE_MOUSE_WHEEL messages now handled correctly in several gui-element when wheel isn't just 1.0 or -1.0
- Fix serialization for CBillboardSceneNode, it had missed 2 color
- Fix 'k' in bigfont.png
- Recalculate FrameRect and ScrollPos in CGUIEditBox when AbsoluteRect gets changed
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3876 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-07 21:56:31 +00:00
e373bc4cf4
Merged revision 3847 from 1.7 branch. Fix problems in textwrapping in CGUIStaticText. Did use wrong size and did ignore last word of the text. NOTE: this will need some more work now in trunk as trunk supports by now right-to-left text which probably needs similar fixes.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3874 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-07-07 21:34:10 +00:00
cutealien
hybrid
bitplane