lp:testogre
- Get this branch:
- bzr branch lp:testogre
Branch merges
Recent revisions
- 6189. By sinbad
-
Merged revisions 9692-9696,9698-9705 via svnmerge from
https://svn.ogre3d. org/svnroot/ ogre/branches/ v1-7 ........
r9692 | assaframan | 2010-02-05 18:29:39 +0000 (Fri, 05 Feb 2010) | 1 linestatic link: Added link check for the following plug-ins - BSP, Octree, PCZ, ParticleFX, CG.
........
r9693 | masterfalcon | 2010-02-05 19:06:09 +0000 (Fri, 05 Feb 2010) | 1 lineRemoved unnecessary undef's/defines for iPhone.
........
r9694 | masterfalcon | 2010-02-06 01:25:47 +0000 (Sat, 06 Feb 2010) | 5 linesApplying a couple Mac patches from ejtttje
2946668 - use framework-relative paths in #includes
2946664 - PluginFolder setting always relative to bundle
........
r9695 | masterfalcon | 2010-02-06 01:48:27 +0000 (Sat, 06 Feb 2010) | 1 lineMissed this file with the Mac include patch
........
r9696 | masterfalcon | 2010-02-06 01:50:55 +0000 (Sat, 06 Feb 2010) | 1 lineThrow an exception in the lighting sample under GLES because 1D textures are not supported
........
r9698 | sinbad | 2010-02-06 16:19:55 +0000 (Sat, 06 Feb 2010) | 1 linePatch 2940178: avoid rare divide-by-zero case
........
r9699 | sinbad | 2010-02-06 17:26:38 +0000 (Sat, 06 Feb 2010) | 1 linePatch 2943656: Prevent crash on 0 sized submeshes in edge list builder
........
r9700 | sinbad | 2010-02-06 17:37:13 +0000 (Sat, 06 Feb 2010) | 1 linePatch 2946925: HW Gamma correction not working w/ DDS textures (Dx9)
........
r9701 | sinbad | 2010-02-07 15:30:25 +0000 (Sun, 07 Feb 2010) | 1 lineINSTALL was out of date on license and wasn't fulfilling any useful purpose anyway
........
r9702 | assaframan | 2010-02-07 16:25:06 +0000 (Sun, 07 Feb 2010) | 5 linescmake build system: Added an option to link CRT statically (MS msvcrt dll and such).
The option name is: OGRE_CONFIG_STATIC_ LINK_CRT (default is FALSE for the common case)
The cmake code snippet is from here: http://stackoverflow. com/questions/ 1618927/ cmake-microsoft -visual- studio- and-monolithic- runtimes The need for static CRT link is for the cases that a copy paste installation in needed.
........
r9703 | sinbad | 2010-02-07 19:25:37 +0000 (Sun, 07 Feb 2010) | 3 linesSDK samples CMake config now producing buildable results on win32
Remove Paging sample, was basic proof anyway
........
r9704 | noamgat | 2010-02-08 13:04:41 +0000 (Mon, 08 Feb 2010) | 1 lineMinor changes in the deferred shading demo.
........
r9705 | sinbad | 2010-02-08 16:11:37 +0000 (Mon, 08 Feb 2010) | 1 lineFix a problem in Dx9 where dropping from fullscreen to windnowed mode would not keep the correct size
........ - 6188. By sinbad
-
Patch 2890584: Automate compositor update based on camera change
Applied to trunk since changes some externally visible listener behaviour - 6187. By sinbad
-
Merged revisions 9680,9682-
9683,9685- 9690 via svnmerge from
https://svn.ogre3d. org/svnroot/ ogre/branches/ v1-7 ........
r9680 | assaframan | 2010-02-02 14:25:55 +0000 (Tue, 02 Feb 2010) | 5 linesStatic link: An option to control if a render system is statically linked or not linked at all when OGRE is linked statically was added.
The default for D3D9 and GL is true.
The default for GLES, D3D10 and D3D11 is false.
The option is available only if OGRE links statically.
........
r9682 | sinbad | 2010-02-02 16:23:21 +0000 (Tue, 02 Feb 2010) | 1 lineAdd missing initialisation of mLocalNode
........
r9683 | cabalistic | 2010-02-02 16:45:30 +0000 (Tue, 02 Feb 2010) | 1 lineFix FindOGRE's handling of OgreBuildSettin
gs.h.
........
r9685 | nirhasson | 2010-02-02 19:39:48 +0000 (Tue, 02 Feb 2010) | 2 linesRTSS: applied patch by mattan_f -
Fixes RTShader Lighting when using camera relative rendering - ID: 2944607
........
r9686 | sinbad | 2010-02-03 16:50:44 +0000 (Wed, 03 Feb 2010) | 1 lineMovablePlane should return 0 for bounding radius and not infinity, since it is mathematical only and not visible. Could cause problems with shadow ranges.
........
r9687 | sinbad | 2010-02-03 18:02:58 +0000 (Wed, 03 Feb 2010) | 1 lineAdd ability to manually dirty Terrain lightmap
........
r9688 | nirhasson | 2010-02-03 19:53:56 +0000 (Wed, 03 Feb 2010) | 1 lineSample hardware skinning with four bones per vertex program fixed (didn't define default parameters).
........
r9689 | assaframan | 2010-02-05 13:19:49 +0000 (Fri, 05 Feb 2010) | 1 linestatic link: Removed OGRE_STATIC_
LINK_RENDERSYST EM_* setting. Now if OGRE_STATIC is turned on and OGRE_BUILD_ RENDERSYSTEM_ * is set for a render system - it will be also linked statically.
........
r9690 | assaframan | 2010-02-05 14:24:09 +0000 (Fri, 05 Feb 2010) | 1 lineD3D10/11 render systems: Fixed compile and link issues with static link.
........ - 6185. By sinbad
-
Merged revisions 9671-9674,9678-9679 via svnmerge from
https://svn.ogre3d. org/svnroot/ ogre/branches/ v1-7 ........
r9671 | noamgat | 2010-02-01 13:52:43 +0000 (Mon, 01 Feb 2010) | 1 lineFixed some sample crashes and a typo in an exception.
........
r9672 | sinbad | 2010-02-01 16:33:48 +0000 (Mon, 01 Feb 2010) | 1 lineOGRE_SAMPLES_LIST should have been updated in ogre_config_
sample_ lib, not ogre_config_ sample_ exe
........
r9673 | sinbad | 2010-02-01 16:34:59 +0000 (Mon, 01 Feb 2010) | 1 lineOnly include the zip tests if we're building with zip support
........
r9674 | sinbad | 2010-02-02 12:16:54 +0000 (Tue, 02 Feb 2010) | 2 linesmime-type was set incorrectly for a lot of text files in XCode templates area
Causes inconsistencies and errors when modified from a Windows machine.
........
r9678 | sinbad | 2010-02-02 12:48:15 +0000 (Tue, 02 Feb 2010) | 1 lineBad svn:eol-style property
........
r9679 | assaframan | 2010-02-02 12:54:50 +0000 (Tue, 02 Feb 2010) | 2 linesFixed static compile for d3d10 and d3d11 render systems, Added STATIC_
LINK_RENDERSYST EM_D3D10 and STATIC_ LINK_RENDERSYST EM_D3D11 options to the cmake - so the render systems will only compile when the developer is sure he needs it - d3d10 and d3d11 are not supported on Win XP.
The new options are only available when static linking is enabled.
........ - 6184. By sinbad
-
Merged revisions 9663,9665,9669 via svnmerge from
https://svn.ogre3d. org/svnroot/ ogre/branches/ v1-7 ........
r9663 | sinbad | 2010-01-30 18:20:29 +0000 (Sat, 30 Jan 2010) | 1 lineTurning PlayPen into a sample plugin (infrastructure done, only a couple of tests converted so far)
........
r9665 | masterfalcon | 2010-01-31 06:46:16 +0000 (Sun, 31 Jan 2010) | 1 lineFix a little typo
........
r9669 | nirhasson | 2010-01-31 17:40:20 +0000 (Sun, 31 Jan 2010) | 1 lineRTSS: Fixed compilation errors came from pre-processor definitions that moved to OgreBuildSettings.h
........ - 6182. By masterfalcon
-
Enable per pixel lighting in GL ES 2 by default. Also apply fix from Sinbad for colour attributes.
- 6180. By sinbad
-
Merged revisions 9649-9653,9655-9662 via svnmerge from
https://svn.ogre3d. org/svnroot/ ogre/branches/ v1-7 ........
r9649 | sinbad | 2010-01-26 10:17:10 +0000 (Tue, 26 Jan 2010) | 1 lineAs per patch 2933038, missing 'Terrain' suffix on include path
........
r9650 | sinbad | 2010-01-26 10:52:11 +0000 (Tue, 26 Jan 2010) | 1 linePatch 2939720: Fix compilation of OgreMain for OGRE_NO_ZIP_ARCHIVE defined
........
r9651 | sinbad | 2010-01-26 11:14:21 +0000 (Tue, 26 Jan 2010) | 1 linePatch 2939993: Pass SWP_FRAMECHANGED to SetWindowPos to avoid some problems switching fullscreen modes in D3D9 on some machines
........
r9652 | sinbad | 2010-01-26 11:36:06 +0000 (Tue, 26 Jan 2010) | 1 linePatch 2931272: fix Pass::_dirtyHash called during background loading process
........
r9653 | nirhasson | 2010-01-26 11:49:10 +0000 (Tue, 26 Jan 2010) | 1 lineSTLAllocator - fixed using const types compilation errors. (Based on default std::allocator class).
........
r9655 | cabalistic | 2010-01-26 20:42:10 +0000 (Tue, 26 Jan 2010) | 1 lineMinGW: Search for the RC compiler instead of assuming static name.
........
r9656 | sinbad | 2010-01-27 18:44:08 +0000 (Wed, 27 Jan 2010) | 6 linesStatic build now works (on Win32 anyway), including all sample browser plugins
- Sample plugins no longer need to be entirely header-based
- All samples automatically get added to a property which is then linked to by SampleBrowser
- Fixed the duplication of dllStartPlugin / dllStopPlugin
- Removed separate OGRE_COMP_STATIC, it was more trouble than it was worth
- New samples still need to be added to the SampleBrowser code to be instantiated in static mode but this is the only manual step
........
r9657 | nirhasson | 2010-01-27 19:09:22 +0000 (Wed, 27 Jan 2010) | 1 lineFixed crash in InstancedGeometry when using mesh without any texture coordinates.
........
r9658 | masterfalcon | 2010-01-28 02:05:57 +0000 (Thu, 28 Jan 2010) | 1 lineSet the default context size based upon the application's frame. Prep for new devices.
........
r9659 | nirhasson | 2010-01-28 10:48:40 +0000 (Thu, 28 Jan 2010) | 1 lineFixed instance geometry crash when destroying and re-building.
........
r9660 | sinbad | 2010-01-29 13:17:58 +0000 (Fri, 29 Jan 2010) | 4 linesTrying to fix the usage of RGBA colours in custom GLSL attributes. This doesn't do it, but it's more correct so committed as a staging point.
- Count should be 4 for packed RGBA since in GL the type is counted in bytes
- We should ask for the attribute to be normalised to [0,1] from fixed point
........
r9661 | sinbad | 2010-01-29 15:03:17 +0000 (Fri, 29 Jan 2010) | 2 linesFixed bug 263: trouble using 'colour' GLSL custom attribute
Actually the remaining problem was that finding an attribute near the start of the file could accidentally wrap around because of a negative value for the start point, so glBindAttribLocationARB was never called to set the attribute to the fixed value (in this case 3). The GLSL compiler would then assign it a value (in this case 1) which didn't match. We don't let the GLSL compiler assign attribute numbers because some drivers are broken and accidentally alias attributes, leading to massive performance drops.
........
r9662 | nirhasson | 2010-01-29 18:09:04 +0000 (Fri, 29 Jan 2010) | 1 lineRTSS: Core and Extra libs defined now in OgreBuildSettings.h for easier user usage.
........
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)