Index: code/branches/main_reto_vs05/CMakeLists.txt
===================================================================
--- code/branches/main_reto_vs05/CMakeLists.txt	(revision 156)
+++ 	(revision )
@@ -1,54 +1,0 @@
-PROJECT(Orxonox)
-
-#set some global variables, which are use throughout the project
-
-#Create some verbose output
-SET(CMAKE_VERBOSE_MAKEFILE TRUE)
-
-#force-set the compile on tardis machines, as default points to g++-3.3
-# only run this test on a lunix/unix machine
-IF (UNIX)
-  FIND_PROGRAM(UNAME_CMD "uname"
-	PATHS "/usr/bin /bin")
-  IF(NOT UNAME_CMD)
-	MESSAGE("Unable to find uname. Tardis-Check cannot be done.")
-  ENDIF(NOT UNAME_CMD)
-  EXECUTE_PROCESS(
-	COMMAND "${UNAME_CMD}" "-n"
-	RESULT_VARIABLE UNAME_RV
-	ERROR_VARIABLE UNAME_EV
-	OUTPUT_VARIABLE UNAME_OV)
-
-  IF (NOT "${UNAME_RV}" STREQUAL "0")
-	MESSAGE("ERROR: uname terminated unclean.")
-  ENDIF (NOT "${UNAME_RV}" STREQUAL "0")
-  # check wheter we are on a tardis machine
-  IF ("${UNAME_OV}" MATCHES "tardis")
-    SET (IS_TARDIS "tardis")
-  ENDIF ("${UNAME_OV}" MATCHES "tardis")
-  # if on tardis change compiler
-  IF (IS_TARDIS)
-  MESSAGE("System is a TARDIS: Setting Compiler to g++-3.4.3")
-  SET(CMAKE_CXX_COMPILER "g++-3.4.3")
-  ENDIF(IS_TARDIS)
-ENDIF (UNIX)
-
-
-#This sets where to look for "Find*.cmake" files
-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-#Performs the search and sets the variables
-FIND_PACKAGE(OGRE)
-FIND_PACKAGE(OIS)
-FIND_PACKAGE(CEGUI)
-FIND_PACKAGE(CEGUI_OGRE)
-
-#Sets the search paths for the linking
-LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR})
-#Sets the search path for include files
-#INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} -I/usr/include/enet)
-INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR})
-
-#add main source dir
-ADD_SUBDIRECTORY(src)
-
-
Index: code/branches/main_reto_vs05/INSTALL
===================================================================
--- code/branches/main_reto_vs05/INSTALL	(revision 156)
+++ 	(revision )
@@ -1,12 +1,0 @@
-Here our installing directions
-
-requirements:
-ogre-1.4.5
-ois-1.0
-cegui-0.5.0b
-enet-1.0
-
-cmake (used version 2.4.7)
-
-
-Further information about installing and running this application can be found on http://www.orxonox.net/wiki/Running
Index: code/branches/main_reto_vs05/LICENSE
===================================================================
--- code/branches/main_reto_vs05/LICENSE	(revision 156)
+++ 	(revision )
@@ -1,291 +1,0 @@
-GNU GENERAL PUBLIC LICENSE
-
-Version 3, 29 June 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-Preamble
-
-The GNU General Public License is a free, copyleft license for software and other kinds of works.
-
-The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
-
-To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
-
-For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
-
-Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
-
-Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
-
-The precise terms and conditions for copying, distribution and modification follow.
-TERMS AND CONDITIONS
-0. Definitions.
-
-“This License” refers to version 3 of the GNU General Public License.
-
-“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
-
-“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
-
-To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
-
-A “covered work” means either the unmodified Program or a work based on the Program.
-
-To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
-
-To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-
-
-1. Source Code.
-
-The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
-
-A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
-
-The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
-
-The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
-
-The Corresponding Source for a work in source code form is that same work.
-
-
-2. Basic Permissions.
-
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-
-
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
-
-When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
-
-
-4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-
-
-5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
-
-    * a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-    * b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
-    * c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-    * d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
-
-
-6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
-
-    * a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-    * b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-    * c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-    * d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-    * e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
-
-A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
-
-“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
-
-The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
-
-
-7. Additional Terms.
-
-“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
-
-    * a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-    * b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-    * c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-    * d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-    * e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-    * f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
-
-All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
-
-
-8. Termination.
-
-You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
-
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
-
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-
-
-9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-
-
-10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
-
-An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-
-
-11. Patents.
-
-A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
-
-A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
-
-In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
-
-A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-
-
-12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-
-
-13. Use with the GNU Affero General Public License.
-
-Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
-
-
-14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
-
-Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
-
-
-15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-
-16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-
-17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS
-
-Attribution-ShareAlike 2.5
-CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License.
-   2. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
-   3. "Licensor" means the individual or entity that offers the Work under the terms of this License.
-   4. "Original Author" means the individual or entity who created the Work.
-   5. "Work" means the copyrightable work of authorship offered under the terms of this License.
-   6. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-   7. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-
-2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works;
-   2. to create and reproduce Derivative Works;
-   3. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works;
-   4. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works.
-   5.
-
-      For the avoidance of doubt, where the work is a musical composition:
-         1. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
-         2. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights society or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
-   6. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(c), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(c), as requested.
-   2. You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, a later version of this License with the same License Elements as this License, or a Creative Commons iCommons license that contains the same License Elements as this License (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of, or the Uniform Resource Identifier for, this License or other license specified in the previous sentence with every copy or phonorecord of each Derivative Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Derivative Works that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder, and You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Derivative Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Derivative Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Derivative Work itself to be made subject to the terms of this License.
-   3. If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-
-Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.
-
-Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time.
-
-Creative Commons may be contacted at http://creativecommons.org/.
-
Index: code/branches/main_reto_vs05/Media/materials/scripts/Example.material
===================================================================
--- code/branches/main_reto_vs05/Media/materials/scripts/Example.material	(revision 157)
+++ code/branches/main_reto_vs05/Media/materials/scripts/Example.material	(revision 157)
@@ -0,0 +1,1044 @@
+
+material Examples/EnvMappedRustySteel
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture RustySteel.jpg
+			}
+
+			texture_unit
+			{
+				texture spheremap.png
+				colour_op_ex add src_texture src_current
+				colour_op_multipass_fallback one one
+				env_map spherical
+			}
+		}
+	}
+}
+material Examples/OgreLogo
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.8 0.8 0.8
+
+			texture_unit
+			{
+				texture ogrelogo.png
+			}
+		}
+	}
+}
+material Examples/DarkMaterial
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.1 0.1 0.1
+
+			texture_unit
+			{
+				texture BeachStones.jpg
+			}
+		}
+	}
+}
+material Examples/SpaceSkyBox
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+
+			texture_unit
+			{
+				cubic_texture stevecube.jpg separateUV
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+material Examples/SceneSkyBox1
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+
+			texture_unit
+			{
+				cubic_texture cubemap_fr.jpg cubemap_bk.jpg cubemap_lf.jpg cubemap_rt.jpg cubemap_up.jpg cubemap_dn.jpg separateUV
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+material Examples/SceneCubeMap1
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+
+			texture_unit
+			{
+				cubic_texture cubemap.jpg combinedUVW
+				tex_address_mode clamp
+				env_map cubic_reflection
+			}
+		}
+	}
+}
+material Examples/SceneSkyBox2
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+
+			texture_unit
+			{
+				cubic_texture cubescene_fr.jpg cubescene_bk.jpg cubescene_lf.jpg cubescene_rt.jpg cubescene_up.jpg cubescene_dn.jpg separateUV
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+material Examples/SceneCubeMap2
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+
+			texture_unit
+			{
+				cubic_texture cubescene.jpg combinedUVW
+				tex_address_mode clamp
+				env_map cubic_reflection
+			}
+		}
+	}
+}
+
+material Examples/CloudyNoonSkyBox
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+
+			texture_unit
+			{
+				cubic_texture cloudy_noon.jpg separateUV
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+
+material Examples/StormySkyBox
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+
+			texture_unit
+			{
+				cubic_texture stormy.jpg separateUV
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+
+
+fragment_program Examples/MorningSkyBoxHDRfp cg
+{
+	source hdr.cg
+	entry_point morningskybox_fp
+	profiles ps_2_0 arbfp1
+
+}
+material Examples/MorningSkyBox
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+
+			texture_unit
+			{
+				cubic_texture morning.jpg separateUV
+				tex_address_mode clamp
+			}
+		}
+	}
+
+	// HDR technique (fake)
+	technique
+	{
+		scheme HDR
+
+		pass
+		{
+			lighting off
+			depth_write off
+
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named ambient float4 1 1 1 1
+			}
+			fragment_program_ref Examples/MorningSkyBoxHDRfp
+			{
+			}
+
+			texture_unit
+			{
+				cubic_texture morning.jpg separateUV
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+fragment_program Examples/MorningCubeMapHDRfp cg
+{
+	source hdr.cg
+	entry_point morningcubemap_fp
+	profiles ps_2_0 arbfp1
+
+}
+material Examples/MorningCubeMap
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+
+			texture_unit
+			{
+				cubic_texture morning.jpg combinedUVW
+				tex_address_mode clamp
+				env_map cubic_reflection
+			}
+		}
+	}
+	// HDR technique (fake)
+	technique
+	{
+		scheme HDR
+
+		pass
+		{
+			lighting off
+
+			fragment_program_ref Examples/MorningCubeMapHDRfp
+			{
+			}
+			texture_unit
+			{
+				cubic_texture morning.jpg combinedUVW
+				tex_address_mode clamp
+				env_map cubic_reflection
+			}
+		}
+	}
+}
+
+
+material Examples/EveningSkyBox
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+
+			texture_unit
+			{
+				cubic_texture evening.jpg separateUV
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+
+material Examples/CloudySky
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+
+			texture_unit
+			{
+				texture clouds.jpg
+				scroll_anim 0.15 0
+			}
+		}
+	}
+}
+material Examples/RustySteel
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture RustySteel.jpg
+			}
+		}
+	}
+}
+material Examples/Chrome
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture Chrome.jpg
+				env_map spherical
+			}
+		}
+	}
+}
+material Examples/SpaceSkyPlane
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+			fog_override true none
+
+			texture_unit
+			{
+				texture spacesky.jpg
+			}
+		}
+	}
+}
+material Examples/TextureEffect1
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.75 0.75 0.75
+			cull_hardware none
+			cull_software none
+
+			texture_unit
+			{
+				texture BumpyMetal.jpg
+				rotate_anim 0.2
+				wave_xform scale_x sine 1 0.1 0 5
+				wave_xform scale_y sine 0.5 0.2 0.5 3
+			}
+		}
+	}
+}
+material Examples/TextureEffect2
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture Water02.jpg
+				scroll_anim 0.5 0
+			}
+		}
+	}
+}
+material Examples/TextureEffect3
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.7 0.7 0.7
+			cull_hardware none
+			cull_software none
+
+			texture_unit
+			{
+				texture Water01.jpg
+				scroll_anim -0.25 0.1
+			}
+
+			texture_unit
+			{
+				texture Water01.jpg
+				colour_op_ex add src_texture src_current
+				colour_op_multipass_fallback one one
+				scroll_anim -0.1 0.25
+			}
+		}
+	}
+}
+material Examples/TextureEffect4
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.3 0.3 0.3
+			scene_blend colour_blend
+			cull_hardware none
+			cull_software none
+
+			texture_unit
+			{
+				texture Water02.jpg
+				scroll_anim 0.01 0.01
+			}
+		}
+	}
+}
+material Examples/BumpyMetal
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.75 0.75 0.75
+			cull_hardware none
+			cull_software none
+
+			texture_unit
+			{
+				texture BumpyMetal.jpg
+			}
+		}
+	}
+}
+material Examples/TransparentTest
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.2 0.2 0.2
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture Water01.jpg
+				scroll_anim 0.25 0
+			}
+
+			texture_unit
+			{
+				texture Water01.jpg
+				wave_xform scroll_y sine 0 0.1 0 0.5
+			}
+		}
+	}
+}
+material Examples/Flare
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture flare.png
+			}
+		}
+	}
+}
+material Examples/Flare2
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture flaretrail.png
+			}
+		}
+	}
+}
+material Examples/FlarePointSprite
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			point_sprites on
+			point_size 2
+			point_size_attenuation on
+
+			texture_unit
+			{
+				texture flare.png
+			}
+		}
+	}
+}
+
+material Examples/Droplet
+{
+	technique
+	{
+		pass
+		{
+			scene_blend colour_blend
+			depth_write off
+
+			texture_unit
+			{
+				texture basic_droplet.png
+			}
+		}
+	}
+}
+material Examples/Hilite/Yellow
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture dkyellow.png
+			}
+		}
+	}
+}
+material Examples/Rocky
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.2 0.2 0.2
+
+			texture_unit
+			{
+				texture egyptrockyfull.jpg
+			}
+		}
+	}
+}
+material Examples/10PointBlock
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture 10points.png
+			}
+		}
+	}
+}
+material Material__25
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture texmap2.jpg
+			}
+		}
+	}
+}
+material 2 - Default
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture MtlPlat2.jpg
+			}
+		}
+	}
+}
+material Material #8
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture BODY.jpg
+			}
+		}
+	}
+}
+material Material #3
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture HEAD4.jpg
+			}
+		}
+	}
+}
+material Material #9
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture LEGS.jpg
+			}
+		}
+	}
+}
+
+material Examples/Fish
+{
+	technique
+	{
+		pass
+		{
+			texture_unit
+			{
+				texture steelhead.png
+			}
+		}
+	}
+}
+material Examples/Ninja
+{
+	technique
+	{
+		pass
+		{
+		
+			texture_unit
+			{
+				texture nskingr.jpg
+			}
+		}
+	}
+}
+
+material Examples/Robot
+{
+	// Hardware skinning techniique
+	technique
+	{
+		pass
+		{
+			vertex_program_ref Ogre/HardwareSkinningOneWeight
+			{
+				param_named_auto worldMatrix3x4Array world_matrix_array_3x4
+				param_named_auto viewProjectionMatrix viewproj_matrix
+				param_named_auto lightPos[0] light_position 0
+				param_named_auto lightPos[1] light_position 1
+				param_named_auto lightDiffuseColour[0] light_diffuse_colour 0
+				param_named_auto lightDiffuseColour[1] light_diffuse_colour 1
+				param_named_auto ambient ambient_light_colour
+			
+			}
+			// alternate shadow caster program
+			shadow_caster_vertex_program_ref Ogre/HardwareSkinningOneWeightShadowCaster
+			{
+				param_named_auto worldMatrix3x4Array world_matrix_array_3x4
+				param_named_auto viewProjectionMatrix viewproj_matrix
+				param_named_auto ambient ambient_light_colour
+			
+			}
+
+			texture_unit
+			{
+				texture r2skin.jpg
+			}
+		}
+	}
+
+	// Software blending technique
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture r2skin.jpg
+			}
+		}
+	}
+}
+
+material Examples/GrassFloor
+{
+	technique
+	{
+		pass
+		{
+			texture_unit
+			{
+				texture grass_1024.jpg
+			}
+		}
+	}
+}
+
+vertex_program Examples/GrassWaverVp cg
+{
+	source Grass.cg
+	entry_point grass_vp
+	profiles vs_1_1 arbvp1
+}
+
+material Examples/GrassBlades
+{
+	// Vertex program waving grass
+    technique
+    {
+        pass
+        {
+			vertex_program_ref Examples/GrassWaverVp
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named_auto ambient ambient_light_colour
+				param_named_auto objSpaceLight light_position_object_space 0
+				param_named_auto lightColour light_diffuse_colour 0
+				param_named_auto offset custom 999
+			}
+			alpha_rejection greater 150 
+			scene_blend alpha_blend
+		    cull_hardware none
+            cull_software none
+            texture_unit
+            {
+                texture gras_02.png 
+            }
+        }
+    }
+
+	// Non-vertex program technique (no waving)
+	technique
+    {
+        pass
+        {
+			alpha_rejection greater 150 
+			scene_blend alpha_blend
+		    cull_hardware none
+            cull_software none
+            texture_unit
+            {
+                texture gras_02.png 
+            }
+        }
+    }
+}
+
+material Examples/Rockwall
+{
+	technique
+	{
+		pass
+		{
+			texture_unit
+			{
+				texture rockwall.tga
+			}
+		}
+	}
+}
+
+material Examples/Aureola
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend alpha_blend
+			depth_write off
+			cull_hardware none
+
+			texture_unit
+			{
+				texture aureola.png PF_BYTE_LA
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+
+// Test hardware morph animation
+material Examples/HardwareMorphAnimation
+{
+	technique
+	{
+		pass
+		{
+			
+			vertex_program_ref Ogre/HardwareMorphAnimation
+			{
+				// all default
+			}
+
+			texture_unit
+			{
+				tex_coord_set 0
+				colour_op_ex source1 src_current src_current
+			}
+			// need to define these texture units otherwise GL won't use the uv sets			
+			texture_unit
+			{
+				tex_coord_set 1
+				// also need to set blending to ignore texture which is GL warning texture
+				colour_op_ex source1 src_current src_current
+			}
+			texture_unit
+			{
+				tex_coord_set 2
+				colour_op_ex source1 src_current src_current
+			}
+		
+		}
+	}
+}
+
+// Test hardware pose animation
+material Examples/HardwarePoseAnimation
+{
+	technique
+	{
+		pass
+		{
+			
+			vertex_program_ref Ogre/HardwarePoseAnimation
+			{
+				// all default
+			}
+			texture_unit
+			{
+				tex_coord_set 0
+				colour_op_ex source1 src_current src_current
+			}
+			// need to define these texture units otherwise GL won't use the uv sets			
+			texture_unit
+			{
+				tex_coord_set 1
+				// also need to set blending to ignore texture which is GL warning texture
+				colour_op_ex source1 src_current src_current
+			}
+			texture_unit
+			{
+				tex_coord_set 2
+				colour_op_ex source1 src_current src_current
+			}
+
+		
+		}
+	}
+}
+
+material RustyBarrel
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.5 0.5 0.5 1.0
+			diffuse 1.0 1.0 1.0 1.0
+			specular 0.0 0.0 0.0 1.0 12.5
+			emissive 0.0 0.0 0.0 1.0
+			texture_unit
+			{
+				texture RustyBarrel.png
+				filtering trilinear
+			}
+		}
+	}
+}
+
+material WoodPallet
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+			ambient 0.5 0.5 0.5 1.0
+			diffuse 1.0 1.0 1.0 1.0
+			specular 0.0 0.0 0.0 1.0 12.5
+
+			texture_unit
+			{
+				texture WoodPallet.png
+				filtering trilinear
+			}
+		}
+	}
+}
+
+material Examples/LightRibbonTrail
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture ribbonband.png 1d
+				tex_address_mode clamp
+				filtering none
+			}
+		}
+	}
+}
+
+material Examples/TudorHouse
+{
+	technique
+	{
+		pass
+		{
+			texture_unit
+			{
+				texture fw12b.jpg
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+
+material jaiqua
+{
+	// Hardware skinning techniique
+	technique
+	{
+		pass
+		{
+			vertex_program_ref Ogre/HardwareSkinningTwoWeights
+			{
+			
+			}
+			// alternate shadow caster program
+			shadow_caster_vertex_program_ref Ogre/HardwareSkinningTwoWeightsShadowCaster
+			{
+				param_named_auto worldMatrix3x4Array world_matrix_array_3x4
+				param_named_auto viewProjectionMatrix viewproj_matrix
+				param_named_auto ambient ambient_light_colour
+			
+			}
+
+			texture_unit
+			{
+				texture blue_jaiqua.jpg
+				tex_address_mode clamp
+			}
+		}
+	}
+
+	// Software blending technique
+	technique
+	{
+		pass
+		{
+			texture_unit
+			{
+				texture blue_jaiqua.jpg
+				tex_address_mode clamp
+			}
+		}
+	}
+	
+}
+
+
+material Examples/Plane/IntegratedShadows
+{
+	technique
+	{
+		pass
+		{
+			// Single-pass shadowing
+			texture_unit
+			{
+				texture MtlPlat2.jpg
+			}
+			texture_unit
+			{
+				// standard modulation blend
+				content_type shadow
+				tex_address_mode clamp
+			}
+		}
+	}
+	
+}
Index: code/branches/main_reto_vs05/Media/materials/scripts/Examples.compositor
===================================================================
--- code/branches/main_reto_vs05/Media/materials/scripts/Examples.compositor	(revision 157)
+++ code/branches/main_reto_vs05/Media/materials/scripts/Examples.compositor	(revision 157)
@@ -0,0 +1,592 @@
+// Manuel's bloom
+// Needs a scene-sized rtt, but does only one render of the scene
+compositor Bloom
+{
+    technique
+    {
+        // Temporary textures
+        texture rt0 128 128 PF_A8R8G8B8
+        texture rt1 128 128 PF_A8R8G8B8
+
+        target rt1
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target rt0
+        {
+            // Start with clear texture
+            input none
+            // Vertical blur pass
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/Blur0
+                input 0 rt1
+            }
+        }
+
+        target rt1
+        {
+            // Start with clear texture
+            input none
+            // Horizontal blur pass
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/Blur1
+                input 0 rt0
+            }
+        }
+
+        target_output
+        {
+            // Start with clear output
+            input previous
+            // Draw a fullscreen quad
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/BloomBlend
+                input 0 rt1
+            }
+        }
+    }
+}
+
+compositor Glass
+{
+    technique
+    {
+        texture rt0 target_width target_height PF_R8G8B8
+
+        target rt0 { input previous }
+
+        target_output
+        {
+            // Start with clear output
+            input none
+
+            pass render_quad
+            {
+                material Ogre/Compositor/GlassPass
+                input 0 rt0
+            }
+        }
+    }
+}
+
+compositor "Old TV"
+{
+    technique
+    {
+        texture rt0 target_width target_height PF_R8G8B8
+
+        // render scene to a texture
+        target rt0 { input previous }
+
+        target_output
+        {
+            // Start with clear output
+            input none
+
+            pass render_quad
+            {
+                // convert the previous render target to a black and white image, add some noise, distort it,
+                // then render to scene aligned quad
+                material Ogre/Compositor/OldTV
+                input 0 rt0
+            }
+        }
+    }
+}
+
+
+// Black and white effect
+compositor B&W
+{
+    technique
+    {
+        // Temporary textures
+        texture rt0 target_width target_height PF_A8R8G8B8
+
+        target rt0
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target_output
+        {
+            // Start with clear output
+            input none
+            // Draw a fullscreen quad with the black and white image
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/BlackAndWhite
+                input 0 rt0
+            }
+        }
+    }
+}
+
+//compositor DOF // based on Blur but final pass does depth of field
+//{
+//    technique
+//    {
+//        // Temporary textures
+//        texture rt0 target_width target_height PF_A8R8G8B8
+//        texture rt1 target_width target_height PF_A8R8G8B8
+//
+//        target rt1
+//        {
+//            // Render output from previous compositor (or original scene)
+//            input previous
+//        }
+//
+//        target rt0
+//        {
+//            // Start with clear texture
+//            input none
+//            // Vertical blur pass
+//            pass render_quad
+//            {
+//                // Renders a fullscreen quad with a material
+//                material Ogre/Compositor/DOF_Blur0
+//                input 0 rt1
+//            }
+//        }
+//
+//        target rt1
+//        {
+//            // Start with clear texture
+//            input none
+//            // Horizontal blur pass
+//            pass render_quad
+//            {
+//                // Renders a fullscreen quad with a material
+//                material Ogre/Compositor/DOF_Blur1
+//                input 0 rt0
+//            }
+//        }
+//
+//        target_output
+//        {
+//            // Start with clear output
+//            input none
+//            // Draw a fullscreen quad
+//            pass render_quad
+//            {
+//                // Renders a fullscreen quad with a material
+//                material Ogre/Compositor/DOF_Blend
+//                input 0 rt0
+//                input 1 rt1
+//            }
+//        }
+//    }
+//}
+
+// Embossed (fake bump) effect
+compositor Embossed
+{
+    technique
+    {
+        // Temporary textures
+        texture rt0 target_width target_height PF_A8R8G8B8
+
+        target rt0
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target_output
+        {
+            // Start with clear output
+            input none
+            // Draw a fullscreen quad with the black and white image
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/Embossed
+                input 0 rt0
+            }
+        }
+    }
+}
+
+// SharpenEdges
+compositor Sharpen Edges
+{
+    technique
+    {
+        // Temporary textures
+        texture rt0 target_width target_height PF_A8R8G8B8
+
+        target rt0
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target_output
+        {
+            // Start with clear output
+            input none
+            // Draw a fullscreen quad with the black and white image
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/SharpenEdges
+                input 0 rt0
+            }
+        }
+    }
+}
+
+// Invert
+compositor Invert
+{
+    technique
+    {
+        // Temporary textures
+        texture rt0 target_width target_height PF_A8R8G8B8
+
+        target rt0
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target_output
+        {
+            // Start with clear output
+            input none
+            // Draw a fullscreen quad with the black and white image
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/Invert
+                input 0 rt0
+            }
+        }
+    }
+}
+
+// Posterize
+compositor Posterize
+{
+    technique
+    {
+        // Temporary textures
+        texture rt0 target_width target_height PF_A8R8G8B8
+
+        target rt0
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target_output
+        {
+            // Start with clear output
+            input none
+            // Draw a fullscreen quad with the black and white image
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/Posterize
+                input 0 rt0
+            }
+        }
+    }
+}
+
+// Laplace
+compositor Laplace
+{
+    technique
+    {
+        // Temporary textures
+        texture rt0 target_width target_height PF_A8R8G8B8
+
+        target rt0
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target_output
+        {
+            // Start with clear output
+            input none
+            // Draw a fullscreen quad with the black and white image
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/Laplace
+                input 0 rt0
+            }
+        }
+    }
+}
+
+// Tiling
+compositor Tiling
+{
+    technique
+    {
+        // Temporary textures
+        texture rt0 target_width target_height PF_A8R8G8B8
+
+        target rt0
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target_output
+        {
+            // Start with clear output
+            input none
+            // Draw a fullscreen quad with the black and white image
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/Tiling
+                input 0 rt0
+            }
+        }
+    }
+}
+
+// Old Movie
+compositor Old Movie
+{
+    technique
+    {
+        // Temporary textures
+        texture rt0 target_width target_height PF_A8R8G8B8
+
+        target rt0
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target_output
+        {
+            // Start with clear output
+            input none
+            // Draw a fullscreen quad with the black and white image
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/OldMovie
+                input 0 rt0
+            }
+        }
+    }
+}
+
+// HDR
+compositor HDR
+{
+	// floating point only for now
+	technique
+	{
+        // Temporary textures
+		// Fullsize HDR render target, used as tone mapping source
+        texture rt_full target_width target_height PF_FLOAT16_RGB
+		// Targets used for luminance evaluation (3x3 downsample, point filtering)
+		texture rt_lum0 1 1 PF_FLOAT16_RGB
+		texture rt_lum1 4 4 PF_FLOAT16_RGB
+		texture rt_lum2 16 16 PF_FLOAT16_RGB
+		texture rt_lum3 64 64 PF_FLOAT16_RGB
+		texture rt_lum4 128 128 PF_FLOAT16_RGB
+		// Bright-pass filtered target (tone mapped)
+		texture rt_brightpass 128 128 PF_R8G8B8
+		// Bloom filter targets
+		texture rt_bloom0 128 128 PF_R8G8B8
+		texture rt_bloom1 128 128 PF_R8G8B8
+
+
+		target rt_full
+		{
+			// No input, render differently
+			input none
+
+			// Use float target HDR material scheme (unclamped shaders)
+			material_scheme HDR
+
+			pass clear
+			{
+			}
+
+			pass render_scene
+			{
+			}
+
+		}
+
+		// Downsample the original HDR scene to extract luminence value
+		target rt_lum4
+		{
+            input none
+            pass render_quad
+            {
+                // Downsample using a 2x2 filter and convert to greyscale
+                material Ogre/Compositor/HDR/Downsample2x2Luminence
+                input 0 rt_full
+                identifier 994
+            }
+		}
+		target rt_lum3
+		{
+            input none
+            pass render_quad
+            {
+				// Downsample using a 3x3 filter
+                material Ogre/Compositor/HDR/Downsample3x3
+                input 0 rt_lum4
+                identifier 993
+            }
+		}
+		target rt_lum2
+		{
+            input none
+            pass render_quad
+            {
+                // Downsample using a 3x3 filter
+                material Ogre/Compositor/HDR/Downsample3x3
+                input 0 rt_lum3
+                identifier 992
+            }
+		}
+		target rt_lum1
+		{
+            input none
+            pass render_quad
+            {
+                // Downsample using a 3x3 filter
+                material Ogre/Compositor/HDR/Downsample3x3
+                input 0 rt_lum2
+                identifier 991
+            }
+		}
+		target rt_lum0
+		{
+            input none
+            pass render_quad
+            {
+                // Downsample using a 3x3 filter
+                material Ogre/Compositor/HDR/Downsample3x3
+                input 0 rt_lum1
+                identifier 990
+            }
+		}
+
+
+		target rt_brightpass
+		{
+            input none
+            pass render_quad
+            {
+                // Downsample using a 3x3 filter, hi-pass and tone map
+                material Ogre/Compositor/HDR/Downsample3x3Brightpass
+                input 0 rt_full
+		        input 1 rt_lum0
+				identifier 800
+            }
+		}
+
+		target rt_bloom1
+		{
+			input none
+			pass render_quad
+			{
+				// Blur horizontally
+				material Ogre/Compositor/HDR/GaussianBloom
+				input 0 rt_brightpass
+				identifier 701
+			}
+		}
+		target rt_bloom0
+		{
+			input none
+			pass render_quad
+			{
+				// Blur horizontally
+				material Ogre/Compositor/HDR/GaussianBloom
+				input 0 rt_bloom1
+				identifier 700
+			}
+		}
+
+
+		// Final output combines tone mapping of the original scene, with an
+		// exposure setting passed in as a GPU parameter, and an additive bloom
+		// effect
+		target_output
+		{
+			input none
+			pass render_quad
+			{
+				material Ogre/Compositor/HDR/ToneMapping
+				input 0 rt_full
+				input 1 rt_bloom0
+				input 2 rt_lum0
+			}
+		}
+
+
+	}
+
+}
+
+
+// Gaussian blur effect
+compositor Gaussian Blur
+{
+    technique
+    {
+        // Temporary textures
+        texture rt0 target_width target_height PF_A8R8G8B8
+        texture rt1 target_width target_height PF_A8R8G8B8
+
+        target rt0
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target rt1
+        {
+            // Blur horizontally
+            input none
+			pass render_quad
+			{
+				material Ogre/Compositor/HDR/GaussianBloom
+				input 0 rt0
+				identifier 700
+			}
+        }
+
+		target_output
+        {
+            // Start with clear output
+            input none
+            // Blur vertically
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+				material Ogre/Compositor/HDR/GaussianBloom
+                input 0 rt1
+				identifier 701
+            }
+        }
+    }
+}
+
Index: code/branches/main_reto_vs05/Media/materials/scripts/Examples.program
===================================================================
--- code/branches/main_reto_vs05/Media/materials/scripts/Examples.program	(revision 157)
+++ code/branches/main_reto_vs05/Media/materials/scripts/Examples.program	(revision 157)
@@ -0,0 +1,158 @@
+//---------------------------------------------------
+// This file includes a number of basic GPU programs
+// for use in many materials. 
+//---------------------------------------------------
+
+
+// A really basic ambient pass program, support for one texture coodinate set
+vertex_program Ogre/BasicVertexPrograms/AmbientOneTexture cg
+{
+	source Example_Basic.cg
+	entry_point ambientOneTexture_vp
+	profiles vs_1_1 arbvp1
+
+	default_params
+	{
+		param_named_auto worldViewProj worldviewproj_matrix
+		param_named_auto ambient ambient_light_colour
+	}
+	
+}
+// A really basic ambient pass program, support for one texture coodinate set
+vertex_program Ogre/BasicVertexPrograms/AmbientOneTextureHLSL hlsl
+{
+	source Example_Basic.hlsl
+	entry_point ambientOneTexture_vp
+	target vs_1_1
+
+	default_params
+	{
+		param_named_auto worldViewProj worldviewproj_matrix
+		param_named_auto ambient ambient_light_colour
+	}
+}
+// A really basic ambient pass program, support for one texture coodinate set
+vertex_program Ogre/BasicVertexPrograms/AmbientOneTextureGLSL glsl
+{
+	source AmbientOneTexture.glsl
+
+	default_params
+	{
+		param_named_auto ambient ambient_light_colour
+	}
+}
+
+vertex_program Ogre/BasicVertexPrograms/AmbientOneTextureUnified unified
+{
+	delegate Ogre/BasicVertexPrograms/AmbientOneTextureGLSL
+	delegate Ogre/BasicVertexPrograms/AmbientOneTextureHLSL
+}
+
+
+// Same as below, but for use when rendering texture shadows
+vertex_program Ogre/HardwareSkinningOneWeightShadowCaster cg
+{
+	source Example_Basic.cg
+	entry_point hardwareSkinningOneWeightCaster_vp
+	profiles vs_1_1 arbvp1
+	includes_skeletal_animation true
+}
+// Basic hardware skinning using one indexed weight per vertex
+vertex_program Ogre/HardwareSkinningOneWeight cg
+{
+   source Example_Basic.cg
+   entry_point hardwareSkinningOneWeight_vp
+   profiles vs_1_1 arbvp1
+   includes_skeletal_animation true   
+}
+// Same as below, but for use when rendering texture shadows
+vertex_program Ogre/HardwareSkinningTwoWeightsShadowCasterCg cg
+{
+	source Example_Basic.cg
+	entry_point hardwareSkinningTwoWeightsCaster_vp
+	profiles vs_1_1 arbvp1
+	includes_skeletal_animation true
+}
+
+vertex_program Ogre/HardwareSkinningTwoWeightsShadowCasterGLSL glsl
+{
+	source skinningTwoWeightsShadowCasterVp.glsl
+	includes_skeletal_animation true
+}
+
+vertex_program Ogre/HardwareSkinningTwoWeightsShadowCaster unified
+{
+	delegate Ogre/HardwareSkinningTwoWeightsShadowCasterGLSL
+	delegate Ogre/HardwareSkinningTwoWeightsShadowCasterCg
+}
+
+// Basic hardware skinning using two indexed weights per vertex
+vertex_program Ogre/HardwareSkinningTwoWeightsCg cg
+{
+   source Example_Basic.cg
+   entry_point hardwareSkinningTwoWeights_vp
+   profiles vs_1_1 arbvp1
+   includes_skeletal_animation true
+}
+
+vertex_program Ogre/HardwareSkinningTwoWeightsGLSL glsl
+{
+   source skinningTwoWeightsVp.glsl
+   includes_skeletal_animation true
+}
+
+vertex_program Ogre/HardwareSkinningTwoWeights unified
+{
+	delegate Ogre/HardwareSkinningTwoWeightsGLSL
+	delegate Ogre/HardwareSkinningTwoWeightsCg
+	
+   default_params
+   {
+   		param_named_auto worldMatrix3x4Array world_matrix_array_3x4
+		param_named_auto viewProjectionMatrix viewproj_matrix
+		param_named_auto lightPos[0] light_position 0
+		param_named_auto lightPos[1] light_position 1
+		param_named_auto lightDiffuseColour[0] light_diffuse_colour 0
+		param_named_auto lightDiffuseColour[1] light_diffuse_colour 1
+   }
+}
+
+// Basic hardware skinning using four indexed weights per vertex
+vertex_program Ogre/HardwareSkinningFourWeights cg
+{
+   source Example_Basic.cg
+   entry_point hardwareSkinningFourWeights_vp
+   profiles vs_1_1 arbvp1
+   includes_skeletal_animation true
+
+}
+// Basic hardware morph animation 
+vertex_program Ogre/HardwareMorphAnimation cg
+{
+	source Example_Basic.cg
+	entry_point hardwareMorphAnimation
+	profiles vs_1_1 arbvp1
+
+	includes_morph_animation true
+	default_params
+	{
+		param_named_auto worldViewProj worldviewproj_matrix
+		param_named_auto anim_t animation_parametric
+	}
+}
+// Basic hardware pose animation supporting 2 active poses
+vertex_program Ogre/HardwarePoseAnimation cg
+{
+	source Example_Basic.cg
+	entry_point hardwarePoseAnimation
+	profiles vs_1_1 arbvp1
+
+	includes_pose_animation 2
+	default_params
+	{
+		param_named_auto worldViewProj worldviewproj_matrix
+		param_named_auto anim_t animation_parametric
+	}
+}
+
+
Index: code/branches/main_reto_vs05/Media/materials/scripts/Ogre.material
===================================================================
--- code/branches/main_reto_vs05/Media/materials/scripts/Ogre.material	(revision 157)
+++ code/branches/main_reto_vs05/Media/materials/scripts/Ogre.material	(revision 157)
@@ -0,0 +1,119 @@
+
+material Ogre/Earring
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.5 0.5 0
+			diffuse 1 1 0
+
+			texture_unit
+			{
+				texture spheremap.png
+				colour_op_ex add src_texture src_current
+				colour_op_multipass_fallback one one
+				env_map spherical
+			}
+		}
+	}
+}
+material Ogre/Skin
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.7 0.7 0.7
+			cull_hardware none
+
+			texture_unit
+			{
+				texture GreenSkin.jpg
+				tex_address_mode mirror
+			}
+		}
+	}
+}
+material Ogre/Tusks
+{
+	technique
+	{
+		pass
+		{
+			ambient 0.5 0.5 0.4
+			diffuse 1 1 0.8
+
+			texture_unit
+			{
+				texture dirt01.jpg
+				colour_op_ex add src_texture src_current
+				colour_op_multipass_fallback one one
+			}
+		}
+	}
+}
+material Ogre/Eyes
+{
+	technique
+	{
+		pass
+		{
+
+			texture_unit
+			{
+				texture WeirdEye.png
+			}
+		}
+	}
+}
+material Cursor/default
+{
+	technique
+	{
+		pass
+		{
+			scene_blend alpha_blend
+
+			texture_unit
+			{
+				texture cursor.png
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+material Core/StatsBlockBorder/Down
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend alpha_blend
+			depth_check off
+
+			texture_unit
+			{
+				texture ogreborder.png
+			}
+		}
+	}
+}
+material Core/StatsBlockBorder/Up
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend alpha_blend
+			depth_check off
+
+			texture_unit
+			{
+				texture ogreborderUp.png
+			}
+		}
+	}
+}
Index: code/branches/main_reto_vs05/README
===================================================================
--- code/branches/main_reto_vs05/README	(revision 156)
+++ 	(revision )
@@ -1,20 +1,0 @@
-Hi there,
-
-We are proud to present you Orxonox - the most ferious 3D space shooter ever to exist.
-
-This game is free, if you have paid for this, get your money back! The source code of this game is licensed under the GPL (GNU General Public License). 
-The game content is licensed under the Creative Commons Attribution-Sharealike 2.5 license. For more information read LICENSE in the same folder you found this file.
-
-For directions to install this game, please check out the file INSTALL or http://www.orxonox.net/wiki/Running
-
-This application uses the Ogre Graphics Engine (http://www.ogre3d.org), if you haven't already downloaded a precompiled version of Ogre with this package. Visit our webpage to get your Orxonox compatible version of the Ogre libraries.
-
-This is an open source game. If you want to contribute check out http://www.orxonox.net/wiki/development to find more information how you could help us making the game better. We are always looking for programmers and content designers, who like to contribute.
-
-We hope you have fun playing the game. Check out http://www.orxonox.net for news and newer versions of the game.
-
-Please contact us in our forum ( http://forum.orxonox.net ) or check out our contact page ( http://www.orxonox.net/wiki/about#Contact ). We hope to hear from you and are looking forward to your feedback.
-
-
-Cheers,
-The Orxonox Development Team
Index: code/branches/main_reto_vs05/bin/Debug/Ogre.log
===================================================================
--- code/branches/main_reto_vs05/bin/Debug/Ogre.log	(revision 157)
+++ code/branches/main_reto_vs05/bin/Debug/Ogre.log	(revision 157)
@@ -0,0 +1,321 @@
+21:51:02: Creating resource group General
+21:51:02: Creating resource group Internal
+21:51:02: Creating resource group Autodetect
+21:51:02: SceneManagerFactory for type 'DefaultSceneManager' registered.
+21:51:02: Registering ResourceManager for type Material
+21:51:02: Registering ResourceManager for type Mesh
+21:51:02: Registering ResourceManager for type Skeleton
+21:51:02: MovableObjectFactory for type 'ParticleSystem' registered.
+21:51:02: OverlayElementFactory for type Panel registered.
+21:51:02: OverlayElementFactory for type BorderPanel registered.
+21:51:02: OverlayElementFactory for type TextArea registered.
+21:51:02: Registering ResourceManager for type Font
+21:51:02: ArchiveFactory for archive type FileSystem registered.
+21:51:02: ArchiveFactory for archive type Zip registered.
+21:51:02: FreeImage version: 3.9.2
+21:51:02: This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details
+21:51:02: Supported formats: bmp,ico,jpg,jif,jpeg,jpe,jng,koa,iff,lbm,mng,pbm,pbm,pcd,pcx,pgm,pgm,png,ppm,ppm,ras,tga,targa,tif,tiff,wap,wbmp,wbm,psd,cut,xbm,xpm,gif,hdr,g3,sgi
+21:51:02: DDS codec registering
+21:51:02: Registering ResourceManager for type HighLevelGpuProgram
+21:51:02: Registering ResourceManager for type Compositor
+21:51:02: MovableObjectFactory for type 'Entity' registered.
+21:51:02: MovableObjectFactory for type 'Light' registered.
+21:51:02: MovableObjectFactory for type 'BillboardSet' registered.
+21:51:02: MovableObjectFactory for type 'ManualObject' registered.
+21:51:02: MovableObjectFactory for type 'BillboardChain' registered.
+21:51:02: MovableObjectFactory for type 'RibbonTrail' registered.
+21:51:02: Loading library .\RenderSystem_Direct3D9_d
+21:51:03: Installing plugin: D3D9 RenderSystem
+21:51:03: D3D9 : Direct3D9 Rendering Subsystem created.
+21:51:03: D3D9: Driver Detection Starts
+21:51:03: D3D9: Driver Detection Ends
+21:51:03: Plugin successfully installed
+21:51:03: Loading library .\RenderSystem_GL_d
+21:51:03: Installing plugin: GL RenderSystem
+21:51:03: OpenGL Rendering Subsystem created.
+21:51:04: Plugin successfully installed
+21:51:04: Loading library .\Plugin_ParticleFX_d
+21:51:04: Installing plugin: ParticleFX
+21:51:04: Particle Emitter Type 'Point' registered
+21:51:04: Particle Emitter Type 'Box' registered
+21:51:04: Particle Emitter Type 'Ellipsoid' registered
+21:51:04: Particle Emitter Type 'Cylinder' registered
+21:51:04: Particle Emitter Type 'Ring' registered
+21:51:04: Particle Emitter Type 'HollowEllipsoid' registered
+21:51:04: Particle Affector Type 'LinearForce' registered
+21:51:04: Particle Affector Type 'ColourFader' registered
+21:51:04: Particle Affector Type 'ColourFader2' registered
+21:51:04: Particle Affector Type 'ColourImage' registered
+21:51:04: Particle Affector Type 'ColourInterpolator' registered
+21:51:04: Particle Affector Type 'Scaler' registered
+21:51:04: Particle Affector Type 'Rotator' registered
+21:51:04: Particle Affector Type 'DirectionRandomiser' registered
+21:51:04: Particle Affector Type 'DeflectorPlane' registered
+21:51:04: Plugin successfully installed
+21:51:04: Loading library .\Plugin_BSPSceneManager_d
+21:51:04: Installing plugin: BSP Scene Manager
+21:51:04: Plugin successfully installed
+21:51:04: Loading library .\Plugin_OctreeSceneManager_d
+21:51:05: Installing plugin: Octree & Terrain Scene Manager
+21:51:05: Plugin successfully installed
+21:51:05: Loading library .\Plugin_CgProgramManager_d
+21:51:05: Installing plugin: Cg Program Manager
+21:51:05: Plugin successfully installed
+21:51:05: *-*-* OGRE Initialising
+21:51:05: *-*-* Version 1.4.5 (Eihort)
+21:51:05: Creating resource group Bootstrap
+21:51:05: Added resource location '../../media/packs/OgreCore.zip' of type 'Zip' to resource group 'Bootstrap'
+21:51:05: Added resource location '../../media' of type 'FileSystem' to resource group 'General'
+21:51:05: Added resource location '../../media/fonts' of type 'FileSystem' to resource group 'General'
+21:51:05: Added resource location '../../media/materials/programs' of type 'FileSystem' to resource group 'General'
+21:51:05: Added resource location '../../media/materials/scripts' of type 'FileSystem' to resource group 'General'
+21:51:05: Added resource location '../../media/materials/textures' of type 'FileSystem' to resource group 'General'
+21:51:05: Added resource location '../../media/models' of type 'FileSystem' to resource group 'General'
+21:51:05: Added resource location '../../media/overlays' of type 'FileSystem' to resource group 'General'
+21:51:05: Added resource location '../../media/particle' of type 'FileSystem' to resource group 'General'
+21:51:05: Added resource location '../../media/gui' of type 'FileSystem' to resource group 'General'
+21:51:05: Added resource location '../../media/DeferredShadingMedia' of type 'FileSystem' to resource group 'General'
+21:51:05: Added resource location '../../media/packs/cubemap.zip' of type 'Zip' to resource group 'General'
+21:51:05: Added resource location '../../media/packs/cubemapsJS.zip' of type 'Zip' to resource group 'General'
+21:51:05: Added resource location '../../media/packs/dragon.zip' of type 'Zip' to resource group 'General'
+21:51:05: Added resource location '../../media/packs/fresneldemo.zip' of type 'Zip' to resource group 'General'
+21:51:05: Added resource location '../../media/packs/ogretestmap.zip' of type 'Zip' to resource group 'General'
+21:51:05: Added resource location '../../media/packs/skybox.zip' of type 'Zip' to resource group 'General'
+21:51:05: D3D9 : RenderSystem Option: Allow NVPerfHUD = No
+21:51:05: D3D9 : RenderSystem Option: Anti aliasing = Level 4
+21:51:05: D3D9 : RenderSystem Option: Floating-point mode = Fastest
+21:51:05: D3D9 : RenderSystem Option: Full Screen = No
+21:51:05: D3D9 : RenderSystem Option: Rendering Device = ATI Mobility Radeon X1400
+21:51:05: D3D9 : RenderSystem Option: VSync = Yes
+21:51:05: D3D9 : RenderSystem Option: Video Mode = 1024 x 768 @ 32-bit colour
+21:51:05: CPU Identifier & Features
+21:51:05: -------------------------
+21:51:05:  *   CPU ID: GenuineIntel: Genuine Intel(R) CPU           T2500  @ 2.00GHz
+21:51:05:  *      SSE: yes
+21:51:05:  *     SSE2: yes
+21:51:05:  *     SSE3: yes
+21:51:05:  *      MMX: yes
+21:51:05:  *   MMXEXT: yes
+21:51:05:  *    3DNOW: no
+21:51:05:  * 3DNOWEXT: no
+21:51:05:  *     CMOV: yes
+21:51:05:  *      TSC: yes
+21:51:05:  *      FPU: yes
+21:51:05:  *      PRO: yes
+21:51:05:  *       HT: no
+21:51:05: -------------------------
+21:51:05: D3D9 : Subsystem Initialising
+21:51:05: D3D9RenderSystem::createRenderWindow "OGRE Render Window", 1024x768 windowed  miscParams: FSAA=4 FSAAQuality=0 colourDepth=32 useNVPerfHUD=false vsync=true 
+21:51:05: D3D9 : Created D3D9 Rendering Window 'OGRE Render Window' : 1024x768, 32bpp
+21:51:05: Registering ResourceManager for type Texture
+21:51:05: Registering ResourceManager for type GpuProgram
+21:51:06: RenderSystem capabilities
+21:51:06: -------------------------
+21:51:06:  * Hardware generation of mipmaps: yes
+21:51:06:  * Texture blending: yes
+21:51:06:  * Anisotropic texture filtering: yes
+21:51:06:  * Dot product texture operation: yes
+21:51:06:  * Cube mapping: yes
+21:51:06:  * Hardware stencil buffer: yes
+21:51:06:    - Stencil depth: 8
+21:51:06:    - Two sided stencil support: yes
+21:51:06:    - Wrap stencil values: yes
+21:51:06:  * Hardware vertex / index buffers: yes
+21:51:06:  * Vertex programs: yes
+21:51:06:    - Max vertex program version: vs_3_0
+21:51:06:  * Fragment programs: yes
+21:51:06:    - Max fragment program version: ps_3_0
+21:51:06:  * Texture Compression: yes
+21:51:06:    - DXT: yes
+21:51:06:    - VTC: no
+21:51:06:  * Scissor Rectangle: yes
+21:51:06:  * Hardware Occlusion Query: yes
+21:51:06:  * User clip planes: yes
+21:51:06:  * VET_UBYTE4 vertex element type: yes
+21:51:06:  * Infinite far plane projection: yes
+21:51:06:  * Hardware render-to-texture: yes
+21:51:06:  * Floating point textures: yes
+21:51:06:  * Non-power-of-two textures: yes (limited)
+21:51:06:  * Volume textures: yes
+21:51:06:  * Multiple Render Targets: 4
+21:51:06:  * Point Sprites: yes
+21:51:06:  * Extended point parameters: yes
+21:51:06:  * Max Point Size: 256
+21:51:06:  * Vertex texture fetch: no
+21:51:06: ***************************************
+21:51:06: *** D3D9 : Subsystem Initialised OK ***
+21:51:06: ***************************************
+21:51:06: ResourceBackgroundQueue - threading disabled
+21:51:06: Particle Renderer Type 'billboard' registered
+21:51:06: SceneManagerFactory for type 'BspSceneManager' registered.
+21:51:06: Registering ResourceManager for type BspLevel
+21:51:06: SceneManagerFactory for type 'OctreeSceneManager' registered.
+21:51:06: SceneManagerFactory for type 'TerrainSceneManager' registered.
+21:51:06: Parsing scripts for resource group Autodetect
+21:51:06: Finished parsing scripts for resource group Autodetect
+21:51:06: Parsing scripts for resource group Bootstrap
+21:51:06: Parsing script OgreCore.material
+21:51:06: Parsing script OgreProfiler.material
+21:51:06: Parsing script Ogre.fontdef
+21:51:06: Parsing script OgreDebugPanel.overlay
+21:51:06: Texture: New_Ogre_Border_Center.png: Loading 1 faces(PF_A8R8G8B8,256x128x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x128x1.
+21:51:06: Texture: New_Ogre_Border.png: Loading 1 faces(PF_A8R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x256x1.
+21:51:06: Texture: New_Ogre_Border_Break.png: Loading 1 faces(PF_A8R8G8B8,32x32x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,32x32x1.
+21:51:06: Font BlueHighwayusing texture size 512x512
+21:51:06: Info: Freetype returned null for character 127 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 128 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 129 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 130 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 131 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 132 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 133 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 134 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 135 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 136 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 137 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 138 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 139 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 140 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 141 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 142 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 143 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 144 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 145 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 146 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 147 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 148 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 149 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 150 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 151 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 152 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 153 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 154 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 155 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 156 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 157 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 158 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 159 in font BlueHighway
+21:51:06: Info: Freetype returned null for character 160 in font BlueHighway
+21:51:06: Texture: BlueHighwayTexture: Loading 1 faces(PF_BYTE_LA,512x512x1) with 0 generated mipmaps from Image. Internal format is PF_BYTE_LA,512x512x1.
+21:51:06: Texture: ogretext.png: Loading 1 faces(PF_A8R8G8B8,256x128x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x128x1.
+21:51:06: Parsing script OgreLoadingPanel.overlay
+21:51:06: Finished parsing scripts for resource group Bootstrap
+21:51:06: Parsing scripts for resource group General
+21:51:06: Parsing script Examples.program
+21:51:07: Parsing script StdQuad_vp.program
+21:51:07: Parsing script deferred.glsl.program
+21:51:07: Parsing script deferred.hlsl.program
+21:51:07: Parsing script deferred_post_debug.glsl.program
+21:51:07: Parsing script deferred_post_debug.hlsl.program
+21:51:07: Parsing script deferred_post_minilight.glsl.program
+21:51:07: Parsing script deferred_post_minilight.hlsl.program
+21:51:07: OGRE EXCEPTION(2:InvalidParametersException): Parameter called lightSpecularColor does not exist.  in GpuProgramParameters::_findNamedConstantDefinition at d:\eth\orxonox\ogre-win32-v1-4-5\ogremain\src\ogregpuprogram.cpp (line 883)
+21:51:07: Error at line 29 of deferred_post_minilight.hlsl.program: Invalid param_named_auto attribute - Parameter called lightSpecularColor does not exist. 
+21:51:07: Parsing script deferred_post_multipass.glsl.program
+21:51:07: Parsing script deferred_post_multipass.hlsl.program
+21:51:07: Parsing script deferred_post_onepass.glsl.program
+21:51:07: Parsing script deferred_post_onepass.hlsl.program
+21:51:07: Parsing script BlackAndWhite.material
+21:51:07: Parsing script Bloom.material
+21:51:07: Parsing script DepthShadowmap.material
+21:51:07: Parsing script DOF.material
+21:51:07: Parsing script Embossed.material
+21:51:07: Parsing script Example-DynTex.material
+21:51:07: Parsing script Example-Water.material
+21:51:08: Parsing script Example.material
+21:51:08: Parsing script Examples-Advanced.material
+21:51:08: Parsing script facial.material
+21:51:08: Parsing script Glass.material
+21:51:08: Parsing script hdr.material
+21:51:08: Parsing script HeatVision.material
+21:51:08: Parsing script Hurt.material
+21:51:08: Parsing script instancing.material
+21:51:09: Parsing script Invert.material
+21:51:09: Parsing script Laplace.material
+21:51:09: Parsing script MotionBlur.material
+21:51:09: Parsing script Ocean.material
+21:51:09: Parsing script OffsetMapping.material
+21:51:10: Parsing script Ogre.material
+21:51:10: Parsing script OldMovie.material
+21:51:10: Parsing script OldTV.material
+21:51:10: Parsing script Posterize.material
+21:51:10: Parsing script RZR-002.material
+21:51:10: Parsing script SharpenEdges.material
+21:51:10: Parsing script smoke.material
+21:51:10: Parsing script Tiling.material
+21:51:10: Parsing script VarianceShadowmap.material
+21:51:10: Parsing script deferred.material
+21:51:10: Parsing script deferreddemo.material
+21:51:10: Parsing script deferred_post_debug.material
+21:51:10: Parsing script deferred_post_minilight.material
+21:51:10: Parsing script deferred_post_multipass.material
+21:51:10: Parsing script deferred_post_onepass.material
+21:51:10: Parsing script RomanBath.material
+21:51:10: Parsing script Examples.compositor
+21:51:10: Parsing script sample.fontdef
+21:51:10: Parsing script emitted_emitter.particle
+21:51:10: Parsing script Example-Water.particle
+21:51:10: Parsing script Example.particle
+21:51:10: Parsing script smoke.particle
+21:51:10: Parsing script Compositor.overlay
+21:51:10: Parsing script DP3.overlay
+21:51:11: Parsing script Example-CubeMapping.overlay
+21:51:11: Parsing script Example-DynTex.overlay
+21:51:11: Parsing script Example-Water.overlay
+21:51:11: Parsing script Shadows.overlay
+21:51:11: Finished parsing scripts for resource group General
+21:51:11: Parsing scripts for resource group Internal
+21:51:11: Finished parsing scripts for resource group Internal
+21:51:11: Mesh: Loading ogrehead.mesh.
+21:51:11: Texture: WeirdEye.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+21:51:11: Texture: GreenSkin.jpg: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+21:51:11: Texture: spheremap.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+21:51:11: D3D9 : ***** Dimensions altered by the render system
+21:51:11: D3D9 : ***** Source image dimensions : 96x96
+21:51:11: D3D9 : ***** Texture dimensions : 128x128
+21:51:11: Texture: dirt01.jpg: Loading 1 faces(PF_R8G8B8,96x96x1) with 7 generated mipmaps from Image. Internal format is PF_X8R8G8B8,128x128x1.
+21:51:11: Texture: cubescene_fr.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+21:51:11: Texture: cubescene_bk.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+21:51:11: Texture: cubescene_lf.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+21:51:11: Texture: cubescene_rt.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+21:51:12: Texture: cubescene_up.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+21:51:12: Texture: cubescene_dn.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+21:51:12: Texture: flare.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+21:51:12: Mesh: Loading fish.mesh.
+21:51:12: Skeleton: Loading fish.skeleton
+21:51:12: Texture: steelhead.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+21:51:12: WARNING: the mesh 'fish.mesh' includes vertices without bone assignments. Those vertices will transform to wrong position when skeletal animation enabled. To eliminate this, assign at least one bone assignment per vertex on your mesh.
+21:51:12: Creating viewport on target 'OGRE Render Window', rendering from camera 'PlayerCam', relative dimensions L: 0.00 T: 0.00 W: 1.00 H: 1.00 ZOrder: 0
+21:51:12: *** Initializing OIS ***
+21:51:24: Unregistering ResourceManager for type BspLevel
+21:51:24: *-*-* OGRE Shutdown
+21:51:24: Unregistering ResourceManager for type Compositor
+21:51:24: Unregistering ResourceManager for type Font
+21:51:24: Unregistering ResourceManager for type Skeleton
+21:51:24: Unregistering ResourceManager for type Mesh
+21:51:24: Unregistering ResourceManager for type HighLevelGpuProgram
+21:51:24: Uninstalling plugin: Cg Program Manager
+21:51:24: Plugin successfully uninstalled
+21:51:24: Unloading library .\Plugin_CgProgramManager_d
+21:51:24: Uninstalling plugin: Octree & Terrain Scene Manager
+21:51:24: Plugin successfully uninstalled
+21:51:24: Unloading library .\Plugin_OctreeSceneManager_d
+21:51:24: Uninstalling plugin: BSP Scene Manager
+21:51:24: Plugin successfully uninstalled
+21:51:24: Unloading library .\Plugin_BSPSceneManager_d
+21:51:24: Uninstalling plugin: ParticleFX
+21:51:24: Plugin successfully uninstalled
+21:51:24: Unloading library .\Plugin_ParticleFX_d
+21:51:24: Uninstalling plugin: GL RenderSystem
+21:51:24: *** Stopping Win32GL Subsystem ***
+21:51:24: Plugin successfully uninstalled
+21:51:24: Unloading library .\RenderSystem_GL_d
+21:51:24: Uninstalling plugin: D3D9 RenderSystem
+21:51:24: Render Target 'OGRE Render Window' Average FPS: 58.8885 Best FPS: 60.2172 Worst FPS: 0.300933
+21:51:24: D3D9 : Shutting down cleanly.
+21:51:24: Unregistering ResourceManager for type Texture
+21:51:24: Unregistering ResourceManager for type GpuProgram
+21:51:24: D3D9 : Direct3D9 Rendering Subsystem destroyed.
+21:51:24: Plugin successfully uninstalled
+21:51:24: Unloading library .\RenderSystem_Direct3D9_d
+21:51:24: Unregistering ResourceManager for type Material
Index: code/branches/main_reto_vs05/bin/Debug/Plugins.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/Debug/Plugins.cfg	(revision 157)
+++ code/branches/main_reto_vs05/bin/Debug/Plugins.cfg	(revision 157)
@@ -0,0 +1,14 @@
+# Defines plugins to load
+
+# Define plugin folder
+PluginFolder=.
+
+# Define plugins
+Plugin=RenderSystem_Direct3D9_d
+Plugin=RenderSystem_GL_d
+Plugin=Plugin_ParticleFX_d
+Plugin=Plugin_BSPSceneManager_d
+Plugin=Plugin_OctreeSceneManager_d
+Plugin=Plugin_CgProgramManager_d
+
+
Index: code/branches/main_reto_vs05/bin/Debug/media.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/Debug/media.cfg	(revision 157)
+++ code/branches/main_reto_vs05/bin/Debug/media.cfg	(revision 157)
@@ -0,0 +1,16 @@
+Mesh=ogrehead.mesh
+Mesh=geosphere4500.mesh
+Mesh=razor.mesh
+Mesh=knot.mesh
+Mesh=RZR-002.mesh
+Mesh=geosphere8000.mesh
+Mesh=sphere.mesh
+
+CubeMap=cubescene.jpg
+CubeMap=early_morning.jpg
+CubeMap=cubemap.jpg
+CubeMap=morning.jpg
+CubeMap=cloudy_noon.jpg
+CubeMap=evening.jpg
+CubeMap=stormy.jpg
+CubeMap=stevecube.jpg
Index: code/branches/main_reto_vs05/bin/Debug/ogre.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/Debug/ogre.cfg	(revision 157)
+++ code/branches/main_reto_vs05/bin/Debug/ogre.cfg	(revision 157)
@@ -0,0 +1,19 @@
+Render System=Direct3D9 Rendering Subsystem
+
+[Direct3D9 Rendering Subsystem]
+Allow NVPerfHUD=No
+Anti aliasing=Level 4
+Floating-point mode=Fastest
+Full Screen=No
+Rendering Device=ATI Mobility Radeon X1400
+VSync=Yes
+Video Mode=1024 x 768 @ 32-bit colour
+
+[OpenGL Rendering Subsystem]
+Colour Depth=32
+Display Frequency=60
+FSAA=0
+Full Screen=Yes
+RTT Preferred Mode=FBO
+VSync=No
+Video Mode=1024 x 768
Index: code/branches/main_reto_vs05/bin/Debug/quake3settings.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/Debug/quake3settings.cfg	(revision 157)
+++ code/branches/main_reto_vs05/bin/Debug/quake3settings.cfg	(revision 157)
@@ -0,0 +1,2 @@
+Pak0Location: f:\quake3arena\baseq3\pak0.pk3
+Map: maps/q3dm3.bsp
Index: code/branches/main_reto_vs05/bin/Debug/resources.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/Debug/resources.cfg	(revision 157)
+++ code/branches/main_reto_vs05/bin/Debug/resources.cfg	(revision 157)
@@ -0,0 +1,23 @@
+# Resource locations to be added to the 'boostrap' path
+# This also contains the minimum you need to use the Ogre example framework
+[Bootstrap]
+Zip=../../media/packs/OgreCore.zip
+
+# Resource locations to be added to the default path
+[General]
+FileSystem=../../media
+FileSystem=../../media/fonts
+FileSystem=../../media/materials/programs
+FileSystem=../../media/materials/scripts
+FileSystem=../../media/materials/textures
+FileSystem=../../media/models
+FileSystem=../../media/overlays
+FileSystem=../../media/particle
+FileSystem=../../media/gui
+FileSystem=../../media/DeferredShadingMedia
+Zip=../../media/packs/cubemap.zip
+Zip=../../media/packs/cubemapsJS.zip
+Zip=../../media/packs/dragon.zip
+Zip=../../media/packs/fresneldemo.zip
+Zip=../../media/packs/ogretestmap.zip
+Zip=../../media/packs/skybox.zip
Index: code/branches/main_reto_vs05/bin/Release/Ogre.log
===================================================================
--- code/branches/main_reto_vs05/bin/Release/Ogre.log	(revision 157)
+++ code/branches/main_reto_vs05/bin/Release/Ogre.log	(revision 157)
@@ -0,0 +1,323 @@
+13:03:40: Creating resource group General
+13:03:40: Creating resource group Internal
+13:03:40: Creating resource group Autodetect
+13:03:40: SceneManagerFactory for type 'DefaultSceneManager' registered.
+13:03:40: Registering ResourceManager for type Material
+13:03:40: Registering ResourceManager for type Mesh
+13:03:40: Registering ResourceManager for type Skeleton
+13:03:40: MovableObjectFactory for type 'ParticleSystem' registered.
+13:03:40: OverlayElementFactory for type Panel registered.
+13:03:40: OverlayElementFactory for type BorderPanel registered.
+13:03:40: OverlayElementFactory for type TextArea registered.
+13:03:40: Registering ResourceManager for type Font
+13:03:40: ArchiveFactory for archive type FileSystem registered.
+13:03:40: ArchiveFactory for archive type Zip registered.
+13:03:40: FreeImage version: 3.9.2
+13:03:40: This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details
+13:03:40: Supported formats: bmp,ico,jpg,jif,jpeg,jpe,jng,koa,iff,lbm,mng,pbm,pbm,pcd,pcx,pgm,pgm,png,ppm,ppm,ras,tga,targa,tif,tiff,wap,wbmp,wbm,psd,cut,xbm,xpm,gif,hdr,g3,sgi
+13:03:40: DDS codec registering
+13:03:40: Registering ResourceManager for type HighLevelGpuProgram
+13:03:40: Registering ResourceManager for type Compositor
+13:03:40: MovableObjectFactory for type 'Entity' registered.
+13:03:40: MovableObjectFactory for type 'Light' registered.
+13:03:40: MovableObjectFactory for type 'BillboardSet' registered.
+13:03:40: MovableObjectFactory for type 'ManualObject' registered.
+13:03:40: MovableObjectFactory for type 'BillboardChain' registered.
+13:03:40: MovableObjectFactory for type 'RibbonTrail' registered.
+13:03:40: Loading library .\RenderSystem_Direct3D9
+13:03:40: Installing plugin: D3D9 RenderSystem
+13:03:40: D3D9 : Direct3D9 Rendering Subsystem created.
+13:03:41: D3D9: Driver Detection Starts
+13:03:41: D3D9: Driver Detection Ends
+13:03:41: Plugin successfully installed
+13:03:41: Loading library .\RenderSystem_GL
+13:03:41: Installing plugin: GL RenderSystem
+13:03:41: OpenGL Rendering Subsystem created.
+13:03:41: Plugin successfully installed
+13:03:41: Loading library .\Plugin_ParticleFX
+13:03:41: Installing plugin: ParticleFX
+13:03:41: Particle Emitter Type 'Point' registered
+13:03:41: Particle Emitter Type 'Box' registered
+13:03:41: Particle Emitter Type 'Ellipsoid' registered
+13:03:41: Particle Emitter Type 'Cylinder' registered
+13:03:41: Particle Emitter Type 'Ring' registered
+13:03:41: Particle Emitter Type 'HollowEllipsoid' registered
+13:03:41: Particle Affector Type 'LinearForce' registered
+13:03:41: Particle Affector Type 'ColourFader' registered
+13:03:41: Particle Affector Type 'ColourFader2' registered
+13:03:41: Particle Affector Type 'ColourImage' registered
+13:03:41: Particle Affector Type 'ColourInterpolator' registered
+13:03:41: Particle Affector Type 'Scaler' registered
+13:03:41: Particle Affector Type 'Rotator' registered
+13:03:41: Particle Affector Type 'DirectionRandomiser' registered
+13:03:41: Particle Affector Type 'DeflectorPlane' registered
+13:03:41: Plugin successfully installed
+13:03:41: Loading library .\Plugin_BSPSceneManager
+13:03:41: Installing plugin: BSP Scene Manager
+13:03:41: Plugin successfully installed
+13:03:41: Loading library .\Plugin_OctreeSceneManager
+13:03:41: Installing plugin: Octree & Terrain Scene Manager
+13:03:41: Plugin successfully installed
+13:03:41: Loading library .\Plugin_CgProgramManager
+13:03:41: Installing plugin: Cg Program Manager
+13:03:41: Plugin successfully installed
+13:03:41: *-*-* OGRE Initialising
+13:03:41: *-*-* Version 1.4.5 (Eihort)
+13:03:41: Creating resource group Bootstrap
+13:03:41: Added resource location '../../media/packs/OgreCore.zip' of type 'Zip' to resource group 'Bootstrap'
+13:03:41: Added resource location '../../media' of type 'FileSystem' to resource group 'General'
+13:03:41: Added resource location '../../media/fonts' of type 'FileSystem' to resource group 'General'
+13:03:41: Added resource location '../../media/materials/programs' of type 'FileSystem' to resource group 'General'
+13:03:41: Added resource location '../../media/materials/scripts' of type 'FileSystem' to resource group 'General'
+13:03:41: Added resource location '../../media/materials/textures' of type 'FileSystem' to resource group 'General'
+13:03:41: Added resource location '../../media/models' of type 'FileSystem' to resource group 'General'
+13:03:41: Added resource location '../../media/overlays' of type 'FileSystem' to resource group 'General'
+13:03:41: Added resource location '../../media/particle' of type 'FileSystem' to resource group 'General'
+13:03:41: Added resource location '../../media/gui' of type 'FileSystem' to resource group 'General'
+13:03:41: Added resource location '../../media/DeferredShadingMedia' of type 'FileSystem' to resource group 'General'
+13:03:41: Added resource location '../../media/packs/cubemap.zip' of type 'Zip' to resource group 'General'
+13:03:41: Added resource location '../../media/packs/cubemapsJS.zip' of type 'Zip' to resource group 'General'
+13:03:41: Added resource location '../../media/packs/dragon.zip' of type 'Zip' to resource group 'General'
+13:03:41: Added resource location '../../media/packs/fresneldemo.zip' of type 'Zip' to resource group 'General'
+13:03:41: Added resource location '../../media/packs/ogretestmap.zip' of type 'Zip' to resource group 'General'
+13:03:41: Added resource location '../../media/packs/skybox.zip' of type 'Zip' to resource group 'General'
+13:03:41: D3D9 : RenderSystem Option: Allow NVPerfHUD = No
+13:03:41: D3D9 : RenderSystem Option: Anti aliasing = Level 6
+13:03:41: D3D9 : RenderSystem Option: Floating-point mode = Consistent
+13:03:41: D3D9 : RenderSystem Option: Full Screen = Yes
+13:03:41: D3D9 : RenderSystem Option: Rendering Device = ATI Mobility Radeon X1400
+13:03:41: D3D9 : RenderSystem Option: VSync = Yes
+13:03:41: D3D9 : RenderSystem Option: Video Mode = 1400 x 1050 @ 32-bit colour
+13:03:41: CPU Identifier & Features
+13:03:41: -------------------------
+13:03:41:  *   CPU ID: GenuineIntel: Genuine Intel(R) CPU           T2500  @ 2.00GHz
+13:03:41:  *      SSE: yes
+13:03:41:  *     SSE2: yes
+13:03:41:  *     SSE3: yes
+13:03:41:  *      MMX: yes
+13:03:41:  *   MMXEXT: yes
+13:03:41:  *    3DNOW: no
+13:03:41:  * 3DNOWEXT: no
+13:03:41:  *     CMOV: yes
+13:03:41:  *      TSC: yes
+13:03:41:  *      FPU: yes
+13:03:41:  *      PRO: yes
+13:03:41:  *       HT: no
+13:03:41: -------------------------
+13:03:41: D3D9 : Subsystem Initialising
+13:03:41: D3D9RenderSystem::createRenderWindow "OGRE Render Window", 1400x1050 fullscreen  miscParams: FSAA=6 FSAAQuality=0 colourDepth=32 useNVPerfHUD=false vsync=true 
+13:03:41: D3D9 : Created D3D9 Rendering Window 'OGRE Render Window' : 1400x1050, 32bpp
+13:03:41: Registering ResourceManager for type Texture
+13:03:41: Registering ResourceManager for type GpuProgram
+13:03:41: RenderSystem capabilities
+13:03:41: -------------------------
+13:03:41:  * Hardware generation of mipmaps: yes
+13:03:41:  * Texture blending: yes
+13:03:41:  * Anisotropic texture filtering: yes
+13:03:41:  * Dot product texture operation: yes
+13:03:41:  * Cube mapping: yes
+13:03:41:  * Hardware stencil buffer: yes
+13:03:41:    - Stencil depth: 8
+13:03:41:    - Two sided stencil support: yes
+13:03:41:    - Wrap stencil values: yes
+13:03:41:  * Hardware vertex / index buffers: yes
+13:03:41:  * Vertex programs: yes
+13:03:41:    - Max vertex program version: vs_3_0
+13:03:41:  * Fragment programs: yes
+13:03:41:    - Max fragment program version: ps_3_0
+13:03:41:  * Texture Compression: yes
+13:03:41:    - DXT: yes
+13:03:41:    - VTC: no
+13:03:41:  * Scissor Rectangle: yes
+13:03:41:  * Hardware Occlusion Query: yes
+13:03:41:  * User clip planes: yes
+13:03:41:  * VET_UBYTE4 vertex element type: yes
+13:03:41:  * Infinite far plane projection: yes
+13:03:41:  * Hardware render-to-texture: yes
+13:03:41:  * Floating point textures: yes
+13:03:41:  * Non-power-of-two textures: yes (limited)
+13:03:41:  * Volume textures: yes
+13:03:41:  * Multiple Render Targets: 4
+13:03:41:  * Point Sprites: yes
+13:03:41:  * Extended point parameters: yes
+13:03:41:  * Max Point Size: 256
+13:03:41:  * Vertex texture fetch: no
+13:03:41: ***************************************
+13:03:41: *** D3D9 : Subsystem Initialised OK ***
+13:03:41: ***************************************
+13:03:41: ResourceBackgroundQueue - threading disabled
+13:03:41: Particle Renderer Type 'billboard' registered
+13:03:41: SceneManagerFactory for type 'BspSceneManager' registered.
+13:03:41: Registering ResourceManager for type BspLevel
+13:03:41: SceneManagerFactory for type 'OctreeSceneManager' registered.
+13:03:41: SceneManagerFactory for type 'TerrainSceneManager' registered.
+13:03:41: Parsing scripts for resource group Autodetect
+13:03:41: Finished parsing scripts for resource group Autodetect
+13:03:41: Parsing scripts for resource group Bootstrap
+13:03:41: Parsing script OgreCore.material
+13:03:41: Parsing script OgreProfiler.material
+13:03:41: Parsing script Ogre.fontdef
+13:03:41: Parsing script OgreDebugPanel.overlay
+13:03:41: Texture: New_Ogre_Border_Center.png: Loading 1 faces(PF_A8R8G8B8,256x128x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x128x1.
+13:03:41: Texture: New_Ogre_Border.png: Loading 1 faces(PF_A8R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x256x1.
+13:03:41: Texture: New_Ogre_Border_Break.png: Loading 1 faces(PF_A8R8G8B8,32x32x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,32x32x1.
+13:03:41: Font BlueHighwayusing texture size 512x512
+13:03:41: Info: Freetype returned null for character 127 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 128 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 129 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 130 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 131 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 132 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 133 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 134 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 135 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 136 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 137 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 138 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 139 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 140 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 141 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 142 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 143 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 144 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 145 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 146 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 147 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 148 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 149 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 150 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 151 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 152 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 153 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 154 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 155 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 156 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 157 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 158 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 159 in font BlueHighway
+13:03:41: Info: Freetype returned null for character 160 in font BlueHighway
+13:03:41: Texture: BlueHighwayTexture: Loading 1 faces(PF_BYTE_LA,512x512x1) with 0 generated mipmaps from Image. Internal format is PF_BYTE_LA,512x512x1.
+13:03:41: Texture: ogretext.png: Loading 1 faces(PF_A8R8G8B8,256x128x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x128x1.
+13:03:41: Parsing script OgreLoadingPanel.overlay
+13:03:41: Finished parsing scripts for resource group Bootstrap
+13:03:41: Parsing scripts for resource group General
+13:03:41: Parsing script Examples.program
+13:03:41: Parsing script StdQuad_vp.program
+13:03:42: Parsing script deferred.glsl.program
+13:03:42: Parsing script deferred.hlsl.program
+13:03:42: Parsing script deferred_post_debug.glsl.program
+13:03:42: Parsing script deferred_post_debug.hlsl.program
+13:03:42: Parsing script deferred_post_minilight.glsl.program
+13:03:42: Parsing script deferred_post_minilight.hlsl.program
+13:03:42: OGRE EXCEPTION(2:InvalidParametersException): Parameter called lightSpecularColor does not exist.  in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
+13:03:42: Error at line 29 of deferred_post_minilight.hlsl.program: Invalid param_named_auto attribute - Parameter called lightSpecularColor does not exist. 
+13:03:42: Parsing script deferred_post_multipass.glsl.program
+13:03:42: Parsing script deferred_post_multipass.hlsl.program
+13:03:42: Parsing script deferred_post_onepass.glsl.program
+13:03:42: Parsing script deferred_post_onepass.hlsl.program
+13:03:42: Parsing script BlackAndWhite.material
+13:03:42: Parsing script Bloom.material
+13:03:42: Parsing script DepthShadowmap.material
+13:03:42: Parsing script DOF.material
+13:03:42: Parsing script Embossed.material
+13:03:42: Parsing script Example-DynTex.material
+13:03:42: Parsing script Example-Water.material
+13:03:42: Parsing script Example.material
+13:03:42: Parsing script Examples-Advanced.material
+13:03:42: Parsing script facial.material
+13:03:42: Parsing script Glass.material
+13:03:42: Parsing script hdr.material
+13:03:42: Parsing script HeatVision.material
+13:03:43: Parsing script Hurt.material
+13:03:43: Parsing script instancing.material
+13:03:43: Parsing script Invert.material
+13:03:43: Parsing script Laplace.material
+13:03:43: Parsing script MotionBlur.material
+13:03:43: Parsing script Ocean.material
+13:03:43: Parsing script OffsetMapping.material
+13:03:43: Parsing script Ogre.material
+13:03:43: Parsing script OldMovie.material
+13:03:43: Parsing script OldTV.material
+13:03:43: Parsing script Posterize.material
+13:03:43: Parsing script RZR-002.material
+13:03:43: Parsing script SharpenEdges.material
+13:03:43: Parsing script smoke.material
+13:03:43: Parsing script Tiling.material
+13:03:43: Parsing script VarianceShadowmap.material
+13:03:44: Parsing script deferred.material
+13:03:44: Parsing script deferreddemo.material
+13:03:44: Parsing script deferred_post_debug.material
+13:03:44: Parsing script deferred_post_minilight.material
+13:03:44: Parsing script deferred_post_multipass.material
+13:03:44: Parsing script deferred_post_onepass.material
+13:03:44: Parsing script RomanBath.material
+13:03:44: Parsing script Examples.compositor
+13:03:44: Parsing script sample.fontdef
+13:03:44: Parsing script emitted_emitter.particle
+13:03:44: Parsing script Example-Water.particle
+13:03:44: Parsing script Example.particle
+13:03:44: Parsing script smoke.particle
+13:03:44: Parsing script Compositor.overlay
+13:03:44: Parsing script DP3.overlay
+13:03:44: Parsing script Example-CubeMapping.overlay
+13:03:44: Parsing script Example-DynTex.overlay
+13:03:44: Parsing script Example-Water.overlay
+13:03:44: Parsing script Shadows.overlay
+13:03:44: Finished parsing scripts for resource group General
+13:03:44: Parsing scripts for resource group Internal
+13:03:44: Finished parsing scripts for resource group Internal
+13:03:44: Mesh: Loading ogrehead.mesh.
+13:03:44: Texture: WeirdEye.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+13:03:44: Texture: GreenSkin.jpg: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+13:03:44: Texture: spheremap.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+13:03:44: D3D9 : ***** Dimensions altered by the render system
+13:03:44: D3D9 : ***** Source image dimensions : 96x96
+13:03:44: D3D9 : ***** Texture dimensions : 128x128
+13:03:44: Texture: dirt01.jpg: Loading 1 faces(PF_R8G8B8,96x96x1) with 7 generated mipmaps from Image. Internal format is PF_X8R8G8B8,128x128x1.
+13:03:44: Texture: cubescene_fr.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+13:03:44: Texture: cubescene_bk.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+13:03:44: Texture: cubescene_lf.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+13:03:44: Texture: cubescene_rt.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+13:03:44: Texture: cubescene_up.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+13:03:44: Texture: cubescene_dn.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+13:03:44: Texture: flare.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+13:03:44: Mesh: Loading fish.mesh.
+13:03:44: Skeleton: Loading fish.skeleton
+13:03:44: Texture: steelhead.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+13:03:44: WARNING: the mesh 'fish.mesh' includes vertices without bone assignments. Those vertices will transform to wrong position when skeletal animation enabled. To eliminate this, assign at least one bone assignment per vertex on your mesh.
+13:03:44: Creating viewport on target 'OGRE Render Window', rendering from camera 'PlayerCam', relative dimensions L: 0.00 T: 0.00 W: 1.00 H: 1.00 ZOrder: 0
+13:03:44: *** Initializing OIS ***
+13:03:45: Mesh: Loading Barrel.mesh.
+13:03:45: Texture: RustyBarrel.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+13:04:46: Unregistering ResourceManager for type BspLevel
+13:04:46: *-*-* OGRE Shutdown
+13:04:46: Unregistering ResourceManager for type Compositor
+13:04:46: Unregistering ResourceManager for type Font
+13:04:46: Unregistering ResourceManager for type Skeleton
+13:04:46: Unregistering ResourceManager for type Mesh
+13:04:46: Unregistering ResourceManager for type HighLevelGpuProgram
+13:04:46: Uninstalling plugin: Cg Program Manager
+13:04:46: Plugin successfully uninstalled
+13:04:46: Unloading library .\Plugin_CgProgramManager
+13:04:46: Uninstalling plugin: Octree & Terrain Scene Manager
+13:04:46: Plugin successfully uninstalled
+13:04:46: Unloading library .\Plugin_OctreeSceneManager
+13:04:46: Uninstalling plugin: BSP Scene Manager
+13:04:46: Plugin successfully uninstalled
+13:04:46: Unloading library .\Plugin_BSPSceneManager
+13:04:46: Uninstalling plugin: ParticleFX
+13:04:46: Plugin successfully uninstalled
+13:04:46: Unloading library .\Plugin_ParticleFX
+13:04:46: Uninstalling plugin: GL RenderSystem
+13:04:46: *** Stopping Win32GL Subsystem ***
+13:04:46: Plugin successfully uninstalled
+13:04:46: Unloading library .\RenderSystem_GL
+13:04:46: Uninstalling plugin: D3D9 RenderSystem
+13:04:47: Render Target 'OGRE Render Window' Average FPS: 31.3217 Best FPS: 36.239 Worst FPS: 0.518672
+13:04:48: D3D9 : Shutting down cleanly.
+13:04:48: Unregistering ResourceManager for type Texture
+13:04:48: Unregistering ResourceManager for type GpuProgram
+13:04:48: D3D9 : Direct3D9 Rendering Subsystem destroyed.
+13:04:48: Plugin successfully uninstalled
+13:04:48: Unloading library .\RenderSystem_Direct3D9
+13:04:48: Unregistering ResourceManager for type Material
Index: code/branches/main_reto_vs05/bin/Release/Plugins.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/Release/Plugins.cfg	(revision 157)
+++ code/branches/main_reto_vs05/bin/Release/Plugins.cfg	(revision 157)
@@ -0,0 +1,14 @@
+# Defines plugins to load
+
+# Define plugin folder
+PluginFolder=.
+
+# Define plugins
+Plugin=RenderSystem_Direct3D9
+Plugin=RenderSystem_GL
+Plugin=Plugin_ParticleFX
+Plugin=Plugin_BSPSceneManager
+Plugin=Plugin_OctreeSceneManager
+Plugin=Plugin_CgProgramManager
+
+
Index: code/branches/main_reto_vs05/bin/Release/media.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/Release/media.cfg	(revision 157)
+++ code/branches/main_reto_vs05/bin/Release/media.cfg	(revision 157)
@@ -0,0 +1,16 @@
+Mesh=ogrehead.mesh
+Mesh=geosphere4500.mesh
+Mesh=razor.mesh
+Mesh=knot.mesh
+Mesh=RZR-002.mesh
+Mesh=geosphere8000.mesh
+Mesh=sphere.mesh
+
+CubeMap=cubescene.jpg
+CubeMap=early_morning.jpg
+CubeMap=cubemap.jpg
+CubeMap=morning.jpg
+CubeMap=cloudy_noon.jpg
+CubeMap=evening.jpg
+CubeMap=stormy.jpg
+CubeMap=stevecube.jpg
Index: code/branches/main_reto_vs05/bin/Release/ogre.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/Release/ogre.cfg	(revision 157)
+++ code/branches/main_reto_vs05/bin/Release/ogre.cfg	(revision 157)
@@ -0,0 +1,19 @@
+Render System=Direct3D9 Rendering Subsystem
+
+[Direct3D9 Rendering Subsystem]
+Allow NVPerfHUD=No
+Anti aliasing=Level 6
+Floating-point mode=Consistent
+Full Screen=Yes
+Rendering Device=ATI Mobility Radeon X1400
+VSync=Yes
+Video Mode=1400 x 1050 @ 32-bit colour
+
+[OpenGL Rendering Subsystem]
+Colour Depth=32
+Display Frequency=60
+FSAA=0
+Full Screen=Yes
+RTT Preferred Mode=FBO
+VSync=No
+Video Mode=1024 x 768
Index: code/branches/main_reto_vs05/bin/Release/quake3settings.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/Release/quake3settings.cfg	(revision 157)
+++ code/branches/main_reto_vs05/bin/Release/quake3settings.cfg	(revision 157)
@@ -0,0 +1,3 @@
+Pak0Location: f:\quake3levels\chiropteraDM.pk3
+Map: maps/chiropteradm.bsp
+
Index: code/branches/main_reto_vs05/bin/Release/resources.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/Release/resources.cfg	(revision 157)
+++ code/branches/main_reto_vs05/bin/Release/resources.cfg	(revision 157)
@@ -0,0 +1,23 @@
+# Resource locations to be added to the 'boostrap' path
+# This also contains the minimum you need to use the Ogre example framework
+[Bootstrap]
+Zip=../../media/packs/OgreCore.zip
+
+# Resource locations to be added to the default path
+[General]
+FileSystem=../../media
+FileSystem=../../media/fonts
+FileSystem=../../media/materials/programs
+FileSystem=../../media/materials/scripts
+FileSystem=../../media/materials/textures
+FileSystem=../../media/models
+FileSystem=../../media/overlays
+FileSystem=../../media/particle
+FileSystem=../../media/gui
+FileSystem=../../media/DeferredShadingMedia
+Zip=../../media/packs/cubemap.zip
+Zip=../../media/packs/cubemapsJS.zip
+Zip=../../media/packs/dragon.zip
+Zip=../../media/packs/fresneldemo.zip
+Zip=../../media/packs/ogretestmap.zip
+Zip=../../media/packs/skybox.zip
Index: code/branches/main_reto_vs05/bin/media.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/media.cfg	(revision 156)
+++ 	(revision )
@@ -1,16 +1,0 @@
-Mesh=ogrehead.mesh
-Mesh=geosphere4500.mesh
-Mesh=razor.mesh
-Mesh=knot.mesh
-Mesh=RZR-002.mesh
-Mesh=geosphere8000.mesh
-Mesh=sphere.mesh
-
-CubeMap=cubescene.jpg
-CubeMap=early_morning.jpg
-CubeMap=cubemap.jpg
-CubeMap=morning.jpg
-CubeMap=cloudy_noon.jpg
-CubeMap=evening.jpg
-CubeMap=stormy.jpg
-CubeMap=stevecube.jpg
Index: code/branches/main_reto_vs05/bin/ogre.cfg-init
===================================================================
--- code/branches/main_reto_vs05/bin/ogre.cfg-init	(revision 156)
+++ 	(revision )
@@ -1,7 +1,0 @@
-Render System=OpenGL Rendering Subsystem
-
-[OpenGL Rendering Subsystem]
-FSAA=4
-Full Screen=No
-RTT Preferred Mode=PBuffer
-Video Mode=1280 x 1024
Index: code/branches/main_reto_vs05/bin/plugins.cfg-init
===================================================================
--- code/branches/main_reto_vs05/bin/plugins.cfg-init	(revision 156)
+++ 	(revision )
@@ -1,14 +1,0 @@
-# Defines plugins to load
-
-# Define plugin folder
-PluginFolder=/usr/lib/OGRE
-
-# Define plugins
-#Plugin=RenderSystem_Direct3D9
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-#Plugin=Plugin_CgProgramManager
-
-
Index: code/branches/main_reto_vs05/bin/quake3settings.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/quake3settings.cfg	(revision 156)
+++ 	(revision )
@@ -1,3 +1,0 @@
-Pak0Location: f:\quake3levels\chiropteraDM.pk3
-Map: maps/chiropteradm.bsp
-
Index: code/branches/main_reto_vs05/bin/resources.cfg
===================================================================
--- code/branches/main_reto_vs05/bin/resources.cfg	(revision 156)
+++ 	(revision )
@@ -1,23 +1,0 @@
-# Resource locations to be added to the 'boostrap' path
-# This also contains the minimum you need to use the Ogre example framework
-[Bootstrap]
-Zip=../Media/packs/OgreCore.zip
-
-# Resource locations to be added to the default path
-[General]
-FileSystem=../Media
-FileSystem=../Media/fonts
-#FileSystem=../Media/materials/programs
-#FileSystem=../Media/materials/scripts
-#FileSystem=../Media/materials/textures
-#FileSystem=../Media/models
-#FileSystem=../Media/overlays
-#FileSystem=../Media/particle
-FileSystem=../Media/gui
-#FileSystem=../Media/DeferredShadingMedia
-#Zip=../Media/packs/cubemap.zip
-#Zip=../Media/packs/cubemapsJS.zip
-#Zip=../Media/packs/dragon.zip
-#Zip=../Media/packs/fresneldemo.zip
-#Zip=../Media/packs/ogretestmap.zip
-Zip=../Media/packs/skybox.zip
Index: code/branches/main_reto_vs05/bin/run-script
===================================================================
--- code/branches/main_reto_vs05/bin/run-script	(revision 156)
+++ 	(revision )
@@ -1,24 +1,0 @@
-#!/bin/bash
-
-if [[ !  -f main ]] ; then
-	echo "main does not exist"
-	echo "did you compile it?"
-
-	exit 1
-fi
-
-if [[ ! -f orge.cfg ]] ; then
-	cp ogre.cfg-init ogre.cfg
-fi
-
-# check if plugins.cfg exists, and of not create it
-# and modify 
-if [[ ! -f plugins.cfg ]] ; then 
-	if uname -n | grep "tardis" > /dev/null ; then
-		sed -e 's:PluginFolder=/usr/lib/OGRE:PluginFolder=/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/:' \
-		-e 's:#Plugin=Plugin_CgProgramManager:Plugin=Plugin_CgProgramManager:' plugins.cfg-init > plugins.cfg
-	else
-                cp plugins.cfg-init plugins.cfg
-	fi
-fi
-exec ./main
Index: code/branches/main_reto_vs05/include/Bullet.h
===================================================================
--- code/branches/main_reto_vs05/include/Bullet.h	(revision 157)
+++ code/branches/main_reto_vs05/include/Bullet.h	(revision 157)
@@ -0,0 +1,51 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+
+#ifndef BULLET_H
+#define BULLET_H
+
+#include "Ogre.h"
+
+using namespace Ogre;
+
+class Bullet
+{
+public:
+	SceneNode *mNode;
+	Entity *mEntity;
+	Vector3 mSpeed;
+
+	Bullet(SceneNode*, Entity*, Vector3);
+	~Bullet();
+
+protected:
+
+};
+
+
+#endif /* BULLET_H */
Index: code/branches/main_reto_vs05/include/Orxonox.h
===================================================================
--- code/branches/main_reto_vs05/include/Orxonox.h	(revision 157)
+++ code/branches/main_reto_vs05/include/Orxonox.h	(revision 157)
@@ -0,0 +1,54 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+
+#ifndef ORXONOX_H
+#define ORXONOX_H
+
+#include "Ogre.h"
+#include "OgreTimer.h"
+
+#include "ogre_control.h"
+#include "run_manager.h"
+
+class Orxonox
+{
+public:
+	virtual void go(void);
+
+protected:
+	OgreControl *mOgre;
+	RunManager  *mRunMgr;
+	Timer       *mTimer;
+
+	virtual bool setup(void);
+
+	virtual void destroy(void);
+
+};
+
+#endif /* ORXONOX_H */
Index: code/branches/main_reto_vs05/include/camera_manager.h
===================================================================
--- code/branches/main_reto_vs05/include/camera_manager.h	(revision 157)
+++ code/branches/main_reto_vs05/include/camera_manager.h	(revision 157)
@@ -0,0 +1,50 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+
+#ifndef CAMERA_MANAGER_H
+#define CAMERA_MANAGER_H
+
+#include "Ogre.h"
+
+using namespace Ogre;
+
+class CameraManager
+{
+public:
+	CameraManager(SceneManager*);
+	~CameraManager();
+
+	bool setCameraPosition(int);
+
+protected:
+	SceneManager *mSceneMgr;
+	Camera *mCamera;
+};
+
+
+#endif /* CAMERA_MANAGER_H */
Index: code/branches/main_reto_vs05/include/ogre_control.h
===================================================================
--- code/branches/main_reto_vs05/include/ogre_control.h	(revision 157)
+++ code/branches/main_reto_vs05/include/ogre_control.h	(revision 157)
@@ -0,0 +1,71 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+
+#ifndef OGRE_CONTROL_H
+#define OGRE_CONTROL_H
+
+#include "Ogre.h"
+#include "OgreConfigFile.h"
+
+
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+using namespace Ogre;
+
+class OgreControl
+{
+public:
+	OgreControl();
+
+	virtual ~OgreControl();
+
+	/** Sets up the application - returns false if the user chooses to abandon configuration. */
+	virtual bool initialise(void);
+
+	virtual Root* getRoot(void);
+
+	virtual RenderWindow* getRenderWindow(void);
+
+	virtual Ogre::String getResourcePath(void);
+
+protected:
+	Root         *mRoot;
+	RenderWindow *mWindow;
+	Ogre::String  mResourcePath;
+
+	/** Configures the application - returns false if the user chooses to abandon configuration. */
+	virtual bool configure(void);
+
+	/// Method which will define the source of resources (other than current folder)
+	virtual void setupResources(void);
+
+};
+
+#endif /* OGRE_CONTROL_H */
Index: code/branches/main_reto_vs05/include/orxonox_scene.h
===================================================================
--- code/branches/main_reto_vs05/include/orxonox_scene.h	(revision 157)
+++ code/branches/main_reto_vs05/include/orxonox_scene.h	(revision 157)
@@ -0,0 +1,62 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+
+#ifndef ORXONOX_SCENE_H
+#define ORXONOX_SCENE_H
+
+#include "Ogre.h"
+
+using namespace Ogre;
+
+class OrxonoxScene
+{
+public:
+	OrxonoxScene(SceneManager*);
+
+	virtual ~OrxonoxScene();
+
+	virtual bool initialise();
+
+	virtual void tick(unsigned long, float);
+
+private:
+	SceneManager* mSceneMgr;
+
+	//specific variables for test purposes
+	Light        *mLight;
+	SceneNode    *lightNode;
+	BillboardSet *bbs;
+	float distance, radius;
+
+	/// method where you can perform resource group loading
+	virtual void loadResources(void);
+
+	// Define what is in the scene
+	virtual void createScene(void);
+};
+#endif /* ORXONOX_SCENE_H */
Index: code/branches/main_reto_vs05/include/orxonox_ship.h
===================================================================
--- code/branches/main_reto_vs05/include/orxonox_ship.h	(revision 157)
+++ code/branches/main_reto_vs05/include/orxonox_ship.h	(revision 157)
@@ -0,0 +1,76 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+
+#ifndef ORXONOX_SHIP_H
+#define ORXONOX_SHIP_H
+
+#include "Ogre.h"
+
+#include "bullet.h"
+
+using namespace Ogre;
+
+class OrxonoxShip
+{
+public:
+	OrxonoxShip(SceneManager*, SceneNode*);
+	virtual ~OrxonoxShip();
+
+	virtual bool initialise();
+
+	void setThrust(const Real);
+	void setSideThrust(const Real);
+	void turnUpAndDown(const Radian&);
+	void turnLeftAndRight(const Radian&);
+
+	Bullet* fire();
+
+	bool tick(unsigned long, Real);
+
+protected:
+
+
+public:
+
+
+protected:
+	SceneManager *SceneMgr_;
+	SceneNode *RootNode_;
+	Entity *ShipEntity_;
+
+	Vector3 currentSpeed_;
+	float CurrentThrust_;
+  float CurrentSideThrust_;
+  float baseThrust_;
+	int objectCounter_;
+	Vector3 bulletSpeed_;
+
+};
+
+
+#endif /* ORXONOX_SHIP_H */
Index: code/branches/main_reto_vs05/include/run_manager.h
===================================================================
--- code/branches/main_reto_vs05/include/run_manager.h	(revision 157)
+++ code/branches/main_reto_vs05/include/run_manager.h	(revision 157)
@@ -0,0 +1,124 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+
+#ifndef RUN_MANAGER_H
+#define RUN_MANAGER_H
+
+#include "Ogre.h"
+#include "OgreStringConverter.h"
+#include "OgreException.h"
+
+#include "ogre_control.h"
+#include "orxonox_scene.h"
+#include "orxonox_ship.h"
+
+
+//Use this define to signify OIS will be used as a DLL
+//(so that dll import/export macros are in effect)
+#define OIS_DYNAMIC_LIB
+#include <OIS/OIS.h>
+
+using namespace Ogre;
+
+
+// let the class inherit from WindowEventListener in order for the RunMgr
+// to act as the central point of all the calcuations in Orxonox
+class RunManager : WindowEventListener
+{
+public:
+	RunManager(OgreControl*, bool = false, bool = false, bool = false);
+
+	virtual ~RunManager();
+
+	virtual bool tick(unsigned long, Real);
+
+protected:
+	virtual void createCamera(void);
+
+	virtual void createViewports(void);
+
+
+	/** EVENT HANDLING **/
+
+	//Adjust mouse clipping area
+	virtual void windowResized(RenderWindow*);
+
+	//Unattach OIS before window shutdown (very important under Linux)
+	virtual void windowClosed(RenderWindow*);
+
+
+	/** INPUT PROCESSING **/
+	virtual bool processUnbufferedKeyInput();
+
+	virtual bool processUnbufferedMouseInput();
+
+
+	/** OUTPUT **/
+
+	virtual void updateStats(void);
+
+	virtual void showDebugOverlay(bool);
+
+protected:
+	OgreControl  *ogre_;
+	SceneManager *sceneMgr_;
+	RenderWindow *window_;
+	OrxonoxScene *backgroundScene_;
+	Camera       *camera_;
+	OrxonoxShip  *playerShip_;
+
+	bool statsOn_;
+	std::string debugText_;
+
+	unsigned int screenShotCounter_;
+	// just to stop toggles flipping too fast
+	Real timeUntilNextToggle_;
+	bool leftButtonDown_;
+	TextureFilterOptions filtering_;
+	int aniso_;
+
+	int sceneDetailIndex_;
+	Overlay* debugOverlay_;
+
+	//OIS Input devices
+	OIS::InputManager* inputManager_;
+	OIS::Mouse*    mouse_;
+	OIS::Keyboard* keyboard_;
+	OIS::JoyStick* joystick_;
+
+  // Bullet array
+	Bullet **bullets_;
+	int bulletsSize_;
+	int bulletsIndex_;
+
+	// previously elapsed render time
+	unsigned long totalTime_;
+
+};
+
+#endif /* RUN_MANAGER_H */
Index: code/branches/main_reto_vs05/include/weapon_manager.h
===================================================================
--- code/branches/main_reto_vs05/include/weapon_manager.h	(revision 157)
+++ code/branches/main_reto_vs05/include/weapon_manager.h	(revision 157)
@@ -0,0 +1,47 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+
+#ifndef WEAPON_MANAGER_H
+#define WEAPON_MANAGER_H
+
+#include "Ogre.h"
+
+using namespace Ogre;
+
+class WeaponManager
+{
+public:
+	WeaponManager(SceneManager*);
+	virtual ~WeaponManager();
+
+protected:
+
+};
+
+
+#endif /* WEAPON_MANAGER_H */
Index: code/branches/main_reto_vs05/scripts/weapon_framework.sln
===================================================================
--- code/branches/main_reto_vs05/scripts/weapon_framework.sln	(revision 157)
+++ code/branches/main_reto_vs05/scripts/weapon_framework.sln	(revision 157)
@@ -0,0 +1,20 @@
+﻿
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "weapon_framework", "weapon_framework.vcproj", "{C5DA441F-E90E-4FDA-8BAC-4B12EBBFD00B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C5DA441F-E90E-4FDA-8BAC-4B12EBBFD00B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C5DA441F-E90E-4FDA-8BAC-4B12EBBFD00B}.Debug|Win32.Build.0 = Debug|Win32
+		{C5DA441F-E90E-4FDA-8BAC-4B12EBBFD00B}.Release|Win32.ActiveCfg = Release|Win32
+		{C5DA441F-E90E-4FDA-8BAC-4B12EBBFD00B}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
Index: code/branches/main_reto_vs05/scripts/weapon_framework.vcproj
===================================================================
--- code/branches/main_reto_vs05/scripts/weapon_framework.vcproj	(revision 157)
+++ code/branches/main_reto_vs05/scripts/weapon_framework.vcproj	(revision 157)
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="weapon_framework"
+	ProjectGUID="{C5DA441F-E90E-4FDA-8BAC-4B12EBBFD00B}"
+	RootNamespace="weapon_framework"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\$(ConfigurationName)"
+			IntermediateDirectory="..\obj\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include;&quot;$(OGRE_HOME)\OgreMain\include&quot;;&quot;$(OGRE_HOME)\Dependencies\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="OgreMain_d.lib OIS_d.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(OGRE_HOME)\lib;$(OGRE_HOME)\Dependencies\lib\$(ConfigurationName)"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin\$(ConfigurationName)"
+			IntermediateDirectory="..\obj\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\include;&quot;$(OGRE_HOME)\OgreMain\include&quot;;&quot;$(OGRE_HOME)\Dependencies\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="OgreMain.lib OIS.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(OGRE_HOME)\lib;$(OGRE_HOME)\Dependencies\lib\$(ConfigurationName)"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\src\bullet.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\camera_manager.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\main.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ogre_control.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\orxonox.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\orxonox_scene.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\orxonox_ship.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\run_manager.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\weapon_manager.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\include\bullet.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\camera_manager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\ogre_control.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\orxonox.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\orxonox_scene.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\orxonox_ship.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\run_manager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\weapon_manager.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
Index: code/branches/main_reto_vs05/scripts/weapon_framework.vcproj.RGRIEDERT60.rgrieder.user
===================================================================
--- code/branches/main_reto_vs05/scripts/weapon_framework.vcproj.RGRIEDERT60.rgrieder.user	(revision 157)
+++ code/branches/main_reto_vs05/scripts/weapon_framework.vcproj.RGRIEDERT60.rgrieder.user	(revision 157)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioUserFile
+	ProjectType="Visual C++"
+	Version="8.00"
+	ShowAllFiles="false"
+	>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory="..\bin\$(ConfigurationName)"
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="RGRIEDERT60"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor="0"
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory="..\bin\$(ConfigurationName)"
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="RGRIEDERT60"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor="0"
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+	</Configurations>
+</VisualStudioUserFile>
Index: code/branches/main_reto_vs05/src/CMakeLists.txt
===================================================================
--- code/branches/main_reto_vs05/src/CMakeLists.txt	(revision 156)
+++ 	(revision )
@@ -1,11 +1,0 @@
-PROJECT(Orxonox)
-
-# create a few variables to simplify life
-SET(SRC_FILES orxonox.cc)
-#SET(INC_FILES ExampleApplication.h  ExampleFrameListener.h)
-
-#Creates an executable
-ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES})
-#Links the executable against OGRE and OIS
-TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
-
Index: code/branches/main_reto_vs05/src/bullet.cc
===================================================================
--- code/branches/main_reto_vs05/src/bullet.cc	(revision 157)
+++ code/branches/main_reto_vs05/src/bullet.cc	(revision 157)
@@ -0,0 +1,40 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#include "bullet.h"
+
+
+Bullet::Bullet(SceneNode *mNode, Entity *mEntity, Vector3 mSpeed)
+      : mNode(mNode), mEntity(mEntity), mSpeed(mSpeed)
+{
+	mNode->attachObject(mEntity);
+}
+
+
+Bullet::~Bullet()
+{
+}
Index: code/branches/main_reto_vs05/src/camera_manager.cc
===================================================================
--- code/branches/main_reto_vs05/src/camera_manager.cc	(revision 157)
+++ code/branches/main_reto_vs05/src/camera_manager.cc	(revision 157)
@@ -0,0 +1,44 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#include "camera_manager.h"
+
+
+CameraManager::CameraManager(SceneManager *mScene) : mSceneMgr(mSceneMgr)
+{
+}
+
+
+CameraManager::~CameraManager()
+{
+}
+
+
+bool CameraManager::setCameraPosition(int n)
+{
+	return true;
+}
Index: code/branches/main_reto_vs05/src/main.cc
===================================================================
--- code/branches/main_reto_vs05/src/main.cc	(revision 157)
+++ code/branches/main_reto_vs05/src/main.cc	(revision 157)
@@ -0,0 +1,66 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+
+
+#include "orxonox.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 
+#define WIN32_LEAN_AND_MEAN 
+#include "windows.h" 
+  INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
+#else 
+  int main(int argc, char **argv) 
+#endif 
+  {
+    try {
+      // create an orxonox aplication and run it
+      Orxonox myApp;
+
+      myApp.go();
+    }
+    catch (Ogre::Exception& e) {
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 
+      MessageBoxA(NULL, e.getFullDescription().c_str(),
+            "An exception has occured!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+#else
+      std::cerr << "Exception:\n";
+      std::cerr << e.getFullDescription().c_str() << "\n";
+#endif
+      return 1;
+    }
+
+    return 0;
+  }
+
+#ifdef __cplusplus
+}
+#endif
Index: code/branches/main_reto_vs05/src/ogre_control.cc
===================================================================
--- code/branches/main_reto_vs05/src/ogre_control.cc	(revision 157)
+++ code/branches/main_reto_vs05/src/ogre_control.cc	(revision 157)
@@ -0,0 +1,171 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#include "ogre_control.h"
+
+
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+// This function will locate the path to our application on OS X,
+// unlike windows you can not rely on the curent working directory
+// for locating your configuration files and resources.
+std::string macBundlePath()
+{
+	char path[1024];
+	CFBundleRef mainBundle = CFBundleGetMainBundle();
+	assert(mainBundle);
+
+	CFURLRef mainBundleURL = CFBundleCopyBundleURL(mainBundle);
+	assert(mainBundleURL);
+
+	CFStringRef cfStringRef =
+        CFURLCopyFileSystemPath( mainBundleURL, kCFURLPOSIXPathStyle);
+	assert(cfStringRef);
+
+	CFStringGetCString(cfStringRef, path, 1024, kCFStringEncodingASCII);
+
+	CFRelease(mainBundleURL);
+	CFRelease(cfStringRef);
+
+	return std::string(path);
+}
+#endif
+
+
+OgreControl::OgreControl()
+{
+	mRoot = 0;
+	// Provide a nice cross platform solution for locating the configuration
+	// files. On windows files are searched for in the current working
+  // directory, on OS X however you must provide the full path, the helper
+  // function macBundlePath does this for us.
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+	mResourcePath = macBundlePath() + "/Contents/Resources/";
+#else
+	mResourcePath = "";
+#endif
+}
+
+
+// standard destructor
+OgreControl::~OgreControl()
+{
+	if (mRoot)
+		delete mRoot;
+}
+
+
+/**------------- SETTING UP OGRE --------------**/
+
+bool OgreControl::initialise(void)
+{
+	String pluginsPath;
+	// only use plugins.cfg if not static
+#ifndef OGRE_STATIC_LIB
+	pluginsPath = mResourcePath + "plugins.cfg";
+#endif
+
+	mRoot = new Root(pluginsPath, 
+		mResourcePath + "ogre.cfg", mResourcePath + "Ogre.log");
+
+	setupResources();
+
+	if (!configure())
+		return false;
+
+	return true;
+}
+
+
+// Method which will define the source of resources
+// (other than current folder)
+void OgreControl::setupResources(void)
+{
+	// Load resource paths from config file
+	ConfigFile cf;
+	cf.load(mResourcePath + "resources.cfg");
+
+	// Go through all sections & settings in the file
+	ConfigFile::SectionIterator seci = cf.getSectionIterator();
+
+	String secName, typeName, archName;
+	while (seci.hasMoreElements())
+	{
+		secName = seci.peekNextKey();
+		ConfigFile::SettingsMultiMap *settings = seci.getNext();
+		ConfigFile::SettingsMultiMap::iterator i;
+		for (i = settings->begin(); i != settings->end(); ++i)
+		{
+			typeName = i->first;
+			archName = i->second;
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+			// OS X does not set the working directory relative to the app,
+			// In order to make things portable on OS X we need to provide
+			// the loading with it's own bundle path location
+			ResourceGroupManager::getSingleton().addResourceLocation(
+				String(macBundlePath() + "/" + archName), typeName, secName);
+#else
+			ResourceGroupManager::getSingleton().addResourceLocation(
+				archName, typeName, secName);
+#endif
+		}
+	}
+}
+
+
+bool OgreControl::configure(void)
+{
+	// Show the configuration dialog and initialise the system
+	// You can skip this and use root.restoreConfig() to load configuration
+	// settings if you were sure there are valid ones saved in ogre.cfg
+	if(!mRoot->restoreConfig() && !mRoot->showConfigDialog())
+		return false;
+
+	// user clicked OK so initialise
+	// Here we choose to let the system create a default
+  // rendering window by passing 'true'
+	mWindow = mRoot->initialise(true);
+	mRoot->saveConfig();
+	return true;
+}
+
+
+Root* OgreControl::getRoot(void)
+{
+	return mRoot;
+}
+
+
+RenderWindow* OgreControl::getRenderWindow(void)
+{
+	return mWindow;
+}
+
+
+Ogre::String OgreControl::getResourcePath(void)
+{
+	return mResourcePath;
+}
Index: code/branches/main_reto_vs05/src/orxonox.cc
===================================================================
--- code/branches/main_reto_vs05/src/orxonox.cc	(revision 156)
+++ code/branches/main_reto_vs05/src/orxonox.cc	(revision 157)
@@ -20,5 +20,5 @@
  *
  *   Author:
- *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
+ *      Reto Grieder
  *   Co-authors:
  *      ...
@@ -26,237 +26,54 @@
  */
 
-/**
- @file  orxonox.cc
- @brief Orxonox Main File
- */
 
-#include <Ogre.h>
-#include <OIS/OIS.h>
-#include <CEGUI/CEGUI.h>
-#include <OgreCEGUIRenderer.h>
+#include "orxonox.h"
 
-// some tests to see if enet works without includsion
-//#include <enet/enet.h>
-//#include <enet/protocol.h>
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-#include <CoreFoundation/CoreFoundation.h>
+void Orxonox::go(void)
+{
+	if (!setup())
+		return;
 
-// This function will locate the path to our application on OS X,
-// unlike windows you can not rely on the curent working directory
-// for locating your configuration files and resources.
-std::string macBundlePath()
-{
-  char path[1024];
-  CFBundleRef mainBundle = CFBundleGetMainBundle();
-  assert(mainBundle);
+	mTimer = new Timer();
 
-  CFURLRef mainBundleURL = CFBundleCopyBundleURL(mainBundle);
-  assert(mainBundleURL);
+	unsigned long lastTime = mTimer->getMilliseconds();
 
-  CFStringRef cfStringRef = CFURLCopyFileSystemPath( mainBundleURL, kCFURLPOSIXPathStyle);
-  assert(cfStringRef);
+	while (true)
+	{
+		//Pump messages in all registered RenderWindow windows
+		WindowEventUtilities::messagePump();
 
-  CFStringGetCString(cfStringRef, path, 1024, kCFStringEncodingASCII);
+		mOgre->getRoot()->renderOneFrame();
 
-  CFRelease(mainBundleURL);
-  CFRelease(cfStringRef);
+		if (!mRunMgr->tick(mTimer->getMilliseconds(),
+            (mTimer->getMilliseconds() - lastTime) / 1000.0))
+			break;
+		lastTime = mTimer->getMilliseconds();
+	}
 
-  return std::string(path);
-}
-#endif
-
-using namespace Ogre;
-
-class OrxExitListener : public FrameListener
-{
-  public:
-    OrxExitListener(OIS::Keyboard *keyboard)
-  : mKeyboard(keyboard)
-    {
-    }
-
-    bool frameStarted(const FrameEvent& evt)
-    {
-      mKeyboard->capture();
-      return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
-    }
-
-  private:
-    OIS::Keyboard *mKeyboard;
-};
-
-class OrxApplication
-{
-  public:
-    void go()
-    {
-      createRoot();
-      defineResources();
-      setupRenderSystem();
-      createRenderWindow();
-      initializeResourceGroups();
-      setupScene();
-      setupInputSystem();
-      setupCEGUI();
-      createFrameListener();
-      startRenderLoop();
-    }
-
-    ~OrxApplication()
-    {
-      mInputManager->destroyInputObject(mKeyboard);
-      OIS::InputManager::destroyInputSystem(mInputManager);
-
-//       delete mRenderer;
-//       delete mSystem;
-
-      delete mListener;
-      delete mRoot;
-    }
-
-  private:
-    Root *mRoot;
-    OIS::Keyboard *mKeyboard;
-    OIS::Mouse *mMouse;
-    OIS::InputManager *mInputManager;
-    CEGUI::OgreCEGUIRenderer *mRenderer;
-    CEGUI::System *mSystem;
-    OrxExitListener *mListener;
-
-    void createRoot()
-    {
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-      mRoot = new Root(macBundlePath() + "/Contents/Resources/plugins.cfg");
-#else
-      mRoot = new Root();
-#endif
-    }
-
-    void defineResources()
-    {
-      String secName, typeName, archName;
-      ConfigFile cf;
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-      cf.load(macBundlePath() + "/Contents/Resources/resources.cfg");
-#else
-      cf.load("resources.cfg");
-#endif
-
-      ConfigFile::SectionIterator seci = cf.getSectionIterator();
-      while (seci.hasMoreElements())
-      {
-        secName = seci.peekNextKey();
-        ConfigFile::SettingsMultiMap *settings = seci.getNext();
-        ConfigFile::SettingsMultiMap::iterator i;
-        for (i = settings->begin(); i != settings->end(); ++i)
-        {
-          typeName = i->first;
-          archName = i->second;
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-          ResourceGroupManager::getSingleton().addResourceLocation( String(macBundlePath() + "/" + archName), typeName, secName);
-#else
-          ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName);
-#endif
-        }
-      }
-    }
-
-    void setupRenderSystem()
-    {
-      if (!mRoot->restoreConfig() && !mRoot->showConfigDialog())
-        throw Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
-    }
-
-    void createRenderWindow()
-    {
-      mRoot->initialise(true, "Ogre Render Window");
-    }
-
-    void initializeResourceGroups()
-    {
-      TextureManager::getSingleton().setDefaultNumMipmaps(5);
-      ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
-    }
-
-    void setupScene()
-    {
-      SceneManager *mgr = mRoot->createSceneManager(ST_GENERIC, "Default SceneManager");
-      Camera *cam = mgr->createCamera("Camera");
-      Viewport *vp = mRoot->getAutoCreatedWindow()->addViewport(cam);
-    }
-
-    void setupInputSystem()
-    {
-      size_t windowHnd = 0;
-      std::ostringstream windowHndStr;
-      OIS::ParamList pl;
-      RenderWindow *win = mRoot->getAutoCreatedWindow();
-
-      win->getCustomAttribute("WINDOW", &windowHnd);
-      windowHndStr << windowHnd;
-      pl.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
-      mInputManager = OIS::InputManager::createInputSystem(pl);
-
-      try
-      {
-        mKeyboard = static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard, false));
-        mMouse = static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, false));
-      }
-      catch (const OIS::Exception &e)
-      {
-        throw new Exception(42, e.eText, "OrxApplication::setupInputSystem");
-      }
-    }
-
-    void setupCEGUI()
-    {
-      SceneManager *mgr = mRoot->getSceneManager("Default SceneManager");
-      RenderWindow *win = mRoot->getAutoCreatedWindow();
-
-      // CEGUI setup
-//       mRenderer = new CEGUI::OgreCEGUIRenderer(win, Ogre::RENDER_QUEUE_OVERLAY, false, 3000, mgr);
-//       mSystem = new CEGUI::System(mRenderer);
-
-      // Other CEGUI setup here.
-    }
-
-    void createFrameListener()
-    {
-      mListener = new OrxExitListener(mKeyboard);
-      mRoot->addFrameListener(mListener);
-    }
-
-    void startRenderLoop()
-    {
-      mRoot->startRendering();
-    }
-};
-
-#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-#define WIN32_LEAN_AND_MEAN
-#include "windows.h"
-
-             INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
-#else
-             int main(int argc, char **argv)
-#endif
-{
-  try
-  {
-    OrxApplication orxonox;
-    orxonox.go();
-  }
-  catch(Exception& e)
-  {
-#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-    MessageBoxA(NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
-#else
-    fprintf(stderr, "An exception has occurred: %s\n",
-            e.getFullDescription().c_str());
-#endif
-  }
-
-  return 0;
+	// clean up
+	destroy();
 }
 
+
+bool Orxonox::setup(void)
+{
+	// create new 3D ogre render engine
+	mOgre = new OgreControl();
+	mOgre->initialise();
+
+	mRunMgr = new RunManager(mOgre);
+
+	return true;
+}
+
+
+void Orxonox::destroy()
+{
+	if (mTimer)
+		delete mTimer;
+	if (mRunMgr)
+		delete mRunMgr;
+	if (mOgre)
+		delete mOgre;
+}
Index: code/branches/main_reto_vs05/src/orxonox_scene.cc
===================================================================
--- code/branches/main_reto_vs05/src/orxonox_scene.cc	(revision 157)
+++ code/branches/main_reto_vs05/src/orxonox_scene.cc	(revision 157)
@@ -0,0 +1,114 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#include "orxonox_scene.h"
+
+
+OrxonoxScene::OrxonoxScene(SceneManager *mSceneMgr) : mSceneMgr(mSceneMgr)
+{
+}
+
+
+OrxonoxScene::~OrxonoxScene()
+{
+}
+
+
+bool OrxonoxScene::initialise()
+{
+	// Load resources
+	loadResources();
+
+	distance = 0;
+	radius = 100;
+
+	createScene();
+
+	return true;
+}
+
+
+// method where you can perform resource group loading
+// Must at least do
+// ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+void OrxonoxScene::loadResources(void)
+{
+	// Initialise, parse scripts etc
+	ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+}
+
+
+// Currently just a test scene with an ogre head an a surrounding light
+void OrxonoxScene::createScene(void)
+{
+	mSceneMgr->setAmbientLight(ColourValue(0.3,0.3,0.3));
+
+	//create first entity
+	Entity *head = mSceneMgr->createEntity("head", "ogrehead.mesh");
+
+	//create a scene node to attach the head to
+	SceneNode *node = mSceneMgr->getRootSceneNode()
+        ->createChildSceneNode("OgreHeadNode", Vector3(0,0,0));
+	//attach the ogre head
+	node->attachObject(head);
+
+	// set up skybox
+	mSceneMgr->setSkyBox(true, "Examples/SceneSkyBox2");
+
+	// set up one mLight source
+	mLight = mSceneMgr->createLight("Light1");
+	mLight->setType(Light::LT_POINT);
+	mLight->setPosition(Vector3(0, 0, 0));
+	mLight->setDiffuseColour(1.0, 1.0, 1.0);
+	mLight->setSpecularColour(1.0, 1.0, 1.0);
+
+	//create billboard
+	bbs = mSceneMgr->createBillboardSet("bb", 1);
+	bbs->createBillboard(Vector3::ZERO, ColourValue(1.0, 1.0, 1.0));
+	bbs->setMaterialName("Examples/Flare");
+
+	lightNode = mSceneMgr->getRootSceneNode()
+        ->createChildSceneNode("LightNode", Vector3(0, 100, 0));
+
+	lightNode->attachObject(bbs);
+	lightNode->attachObject(mLight);
+}
+
+
+// compute something between frames if neccessary
+void OrxonoxScene::tick(unsigned long time, float deltaTime)
+{
+	float t = time/1000.0;
+
+	lightNode->setPosition(radius*sin(5*t), radius*cos(5*t), sin(1*t)*distance);
+	
+	mLight->setDiffuseColour(sin(1*t), sin(1*t + 2.09), sin(1*t + 2.09*2));
+	mLight->setSpecularColour(sin(1*t), sin(1*t + 2.09), sin(1*t + 2.09*2));
+
+	bbs->getBillboard(0)->setColour(ColourValue(sin(1*t),
+        sin(1*t + 2.09), sin(1*t + 2.09*2)));
+}
Index: code/branches/main_reto_vs05/src/orxonox_ship.cc
===================================================================
--- code/branches/main_reto_vs05/src/orxonox_ship.cc	(revision 157)
+++ code/branches/main_reto_vs05/src/orxonox_ship.cc	(revision 157)
@@ -0,0 +1,172 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+/**
+* Base class for any kind of flyable ship in Orxonox.
+* 
+* The ship offers steering methods (like left, right, etc.) and translates
+* them into movement. A ship can also hold more than one weapons (where each
+* of these can be replaced during the game). This means that a ship can have
+* many WeaponManagers but only one MunitionManager (independant object that
+* is referenced in each WeaponManager).
+* Furthermore a ship in Orxonox is responsible for its visualization, which is
+* why it receives a pointer to the SceneManager.
+*/
+
+
+#include "orxonox_ship.h"
+
+
+/**
+* Standard constructor, that only initalizes a few variables. Some of them
+* could be made static, since any new ship would be derived from the BaseShip.
+* Or even better: write config files for each ship so that manipulating
+* its properties would be even easier.
+* @param mSceneMgr The current main SceneManager
+* @param mNode The scene node which the ship will be attached to later.
+*/
+OrxonoxShip::OrxonoxShip(SceneManager *mSceneMgr, SceneNode *mNode)
+	    : mSceneMgr(mSceneMgr), mRootNode(mNode), speed(Vector3(0, 0, 0)),
+      baseThrust(1000), thrust(0), sideThrust(0), n(0),
+	bulletSpeed(400)
+{
+}
+
+
+/**
+* Standard destructor.
+* Doesn't have any work to do yet.
+*/
+OrxonoxShip::~OrxonoxShip()
+{
+}
+
+
+/**
+* Initialises everything.
+* Once that ResourceGroups are organised, this method loads them.
+* It might be an idea to make this function static in order for the
+* SceneManger to call the initialise method of every needed class (macros..)
+*/
+bool OrxonoxShip::initialise()
+{
+	// load all the resources needed (no resource groups yet,
+  // so the allInit is not executed!)
+	// ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+
+	// create the "space ship" (currently a fish..)
+	// TODO: names must be unique! use static variables..
+	mShip = mSceneMgr->createEntity("Ship", "fish.mesh");
+	SceneNode *fishNode = mRootNode->createChildSceneNode("fishNode");
+	fishNode->yaw(Degree(-90));
+	fishNode->attachObject(mShip);
+	fishNode->setScale(Vector3(10, 10, 10));
+
+	return true;
+}
+
+
+/**
+* Gets the ship to accelerate in the current direction.
+* The value should be between 0 and 1, with one beeing full thrust and 0 none.
+* @param value Acceleration between 0 and 1
+*/
+void OrxonoxShip::setThrust(const Real value)
+{
+	thrust = value * baseThrust;
+}
+
+
+/**
+* Gets the ship to accelerate sideways regarding the current direction.
+* The value should be between 0 and 1, with one beeing full thrust and 0 none.
+* @param value Acceleration between 0 and 1
+*/
+void OrxonoxShip::setSideThrust(const Real value)
+{
+	sideThrust = value * baseThrust;
+}
+
+
+/**
+* Rotate the ship along with the camera up and down.
+* @param angle Pitch value.
+*/
+void OrxonoxShip::turnUpAndDown(const Radian &angle)
+{
+  RootNode_->pitch(angle, Ogre::Node::TransformSpace::TS_LOCAL);
+}
+
+
+/**
+* Rotate the ship along with the camera left and right.
+* @param angle Yaw value.
+*/
+void OrxonoxShip::turnLeftAndRight(const Radian &angle)
+{
+  RootNode_->yaw(angle, Ogre::Node::TransformSpace::TS_PARENT);
+}
+
+
+/**
+* Fire a bullet (Entity with SceneNode).
+* This method creates a new Entity plus a SceneNode. But be sure not make
+* the new Node a child of RootNode_!
+*/
+Bullet* OrxonoxShip::fire()
+{
+	// TODO: Names must be unique!
+	SceneNode *temp = RootNode_->getParentSceneNode()->createChildSceneNode(
+        "BulletNode" + StringConverter::toString(objectCounter_));
+	temp->setOrientation(RootNode_->getOrientation());
+	temp->setPosition(RootNode_->getPosition());
+	temp->setScale(Vector3(1, 1, 1) * 10);
+	temp->yaw(Degree(-90));
+	return new Bullet(temp, mSceneMgr->createEntity("bullet"
+        + StringConverter::toString(objectCounter_++), "Barrel.mesh"), speed
+        + (RootNode_->getOrientation() * Vector3(0, 0, -1)).normalisedCopy()
+        * bulletSpeed_);
+}
+
+
+/**
+* Standard tick() function.
+* Currently, only the speed is applied according to the thrust values.
+* @param time Absolute time.
+* @param deltaTime Relative time.
+*/
+bool OrxonoxShip::tick(unsigned long time, Real deltaTime)
+{
+  Quaternion quad = mRootNode->getOrientation();
+  quad.normalise();
+  speed += quad * Vector3(0, 0, -1) * currentThrust_ * deltaTime;
+	speed += quad * Vector3(-1, 0,  0) * current_SideThrust_ * deltaTime;
+
+	RootNode_->translate(currentSpeed_ * deltaTime);
+
+	return true;
+}
Index: code/branches/main_reto_vs05/src/run_manager.cc
===================================================================
--- code/branches/main_reto_vs05/src/run_manager.cc	(revision 157)
+++ code/branches/main_reto_vs05/src/run_manager.cc	(revision 157)
@@ -0,0 +1,540 @@
+/*
+*   ORXONOX - the hottest 3D action shooter ever to exist
+*
+*
+*   License notice:
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*
+*   Author:
+*      Reto Grieder
+*   Co-authors:
+*      ...
+*/
+
+/**
+* RunManager is the basic control object during the game.
+* 
+* The RunManger class is designed to actually "run" the main part of the
+* game. The Idea is, that you could derive from the RunManager in order
+* to distinguish between a first person shooter or a space craft shooter.
+* RunManager loads and initialises everything in the scene (like the ship,
+* the enemies in the scene, any scripts, the physics, window events,
+* environment, HUD, etc.).
+* It also captures any input from keyboard, mous, joystick (optional) or
+* Ogre (window events).
+*/
+
+#include "run_manager.h"
+
+
+/**
+* Contructor only needs the render window and the Root object which are both
+* the OgreControl object.
+* Right now the constructor does all the initialisation work. This could also
+* be done in a new method "initialize()", for whatever purpose.
+* 
+* 
+* @param ogre_ The OgreControl object holding the render window and the Root
+*/
+RunManager::RunManager(OgreControl * ogre)
+      : ogre_(ogre), window_(ogre->getRenderWindow()), leftButtonDown_(false),
+      statsOn_(true), screenShotCounter_(0), timeUntilNextToggle_(0),
+      filtering_(TFO_BILINEAR), aniso_(1), sceneDetailIndex_(0),
+      debugOverlay_(0), inputManager_(0), mouse_(0), keyboard_(0), joystick_(0)
+{
+
+  // SETTING UP THE SCENE
+
+  // create one new SceneManger
+  sceneMgr_ = ogre_->getRoot()->createSceneManager(ST_GENERIC, "backgroundScene_");
+
+  // background scene (world objects, skybox, lights, etc.)
+  backgroundScene_ = new OrxonoxScene(sceneMgr_);
+
+  // PLAYER SPACESHIP
+
+  // Create a space ship object and its SceneNode.
+  // Some ideas about the steering: The ship should only receive events like
+  // up, down, left, right, roll left, roll right, move down, move up, etc).
+  // Multiple interpretations of these commands would make the game more
+  // but it also makes AI steering more difficult, since for every type of
+  // steering, new methods have to be written.
+  // --> clearly define how a space ship can fly (rolling?, conservation of
+  // impuls?, direct mouse sight steeering?, etc.)
+  // It should also be considered, that the ship should provide another Node
+  // for a camera to be attached (otherwise the spaceship in front of the
+  // would be very static, never moving at all).
+
+  // Construct a new spaceship and give it the node
+  playerShip_ = new OrxonoxShip(sceneMgr_, getRootSceneNode()
+    ->createChildSceneNode("ShipNode", Vector3(20, 20, 20)));
+
+
+  // RESOURCE LOADING (using ResourceGroups if implemented)
+
+  // load all resources and create the entities by calling the initialise()
+  // methods for each object (don't initialise in the constructor!).
+  backgroundScene_->initialise();
+  playerShip_->initialise();
+
+
+  // CAMERA AND VIEWPORT
+  // TODO: create a camera manager. It should be able to change its position
+  // around the space ship (predefined states would be nice too). And it should
+  // also be able to switch between different locations (like ship, spactator,
+  // certain fixed positions (e.g. finish line, etc.)). These are just ideas.
+
+  // create camera and viewport
+  createCamera();
+  createViewports();
+
+
+  // Set default mipmap level (NB some APIs ignore this)
+  TextureManager::getSingleton().setDefaultNumMipmaps(5);
+
+  
+  // BULLET LIST FOR THE TEST APPLICATION
+
+  // TODO: Use STL to make life easier. But it works this way too..
+  bullets_ = new Bullet*[10];
+  bulletsIndex_ = 0;
+  bulletsSize_ = 10;
+
+
+  // HUMAN INTERFACE
+
+  using namespace OIS;
+
+  debugOverlay_ = OverlayManager::getSingleton()
+    .getByName("Core/DebugOverlay");
+
+  LogManager::getSingletonPtr()->logMessage("*** Initializing OIS ***");
+  ParamList pl;
+  size_t windowHnd = 0;
+  std::ostringstream windowHndStr;
+
+  window_->getCustomAttribute("WINDOW", &windowHnd);
+  windowHndStr << windowHnd;
+  pl.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
+
+  inputManager_ = InputManager::createInputSystem( pl );
+
+  // Create all devices (We only catch joystick exceptions here,
+  // as, most people have Key/Mouse)
+  keyboard_ = static_cast<Keyboard*>(inputManager_
+    ->createInputObject( OISKeyboard, false ));
+  mouse_ = static_cast<Mouse*>(inputManager_
+    ->createInputObject( OISMouse, false ));
+  try {
+    joystick_ = static_cast<JoyStick*>(inputManager_
+      ->createInputObject( OISJoyStick, false ));
+  }
+  catch(...) {
+    joystick_ = 0;
+  }
+
+  //Set initial mouse clipping size
+  windowResized(window_);
+
+  showDebugOverlay(true);
+
+  // REGISTER THIS OBJECT AS A WINDOW EVENT LISTENER IN OGRE
+  // It will then receive events liek windowClosed, windowResized, etc.
+  WindowEventUtilities::addWindowEventListener(window_, this);
+}
+
+/**
+* Standard destructor.
+* Removes this object as a window event listener and deletes all created
+* variables.
+*/
+RunManager::~RunManager()
+{
+  //Remove ourself as a Window listener
+  WindowEventUtilities::removeWindowEventListener(window_, this);
+  windowClosed(window_);
+
+  if (backgroundScene_)
+    delete backgroundScene_;
+  if (playerShip_)
+    delete playerShip_;
+
+  // clean up the bullet list
+  for (int i = 0; i < bulletsIndex_; i++)
+    delete bullets_[i];
+  delete bullets_;
+}
+
+
+/**
+* Method to compute anyting between 2 frames.
+* 
+* Everything that needs to be computed during the games happens right here.
+* The only exception are the listeners (which should only set variables,
+* not actually do something).
+* 
+* @param time Absolute play time
+* @param deltaTime Time passed since last frame
+* @return Return false to end rendering
+*/
+bool RunManager::tick(unsigned long time, float deltaTime)
+{
+  // synchronize with internal class timer
+  totalTime_ = time;
+
+  // Call tick() for every object
+  // This could be done by registering (needs a factory..)
+  backgroundScene_->tick(time, deltaTime);
+  playerShip_->tick(time, deltaTime);
+
+
+  // Update the 'HUD'
+  updateStats();
+
+  // update the bullet positions
+  for (int i = 0; i < bulletsIndex_; i++)
+  {
+    bullets_[i]->mNode->translate(bullets_[i]->mSpeed*deltaTime);
+    bullets_[i]->mNode->yaw(Degree(deltaTime*100));
+    bullets_[i]->mNode->roll(Degree(deltaTime*300));
+  }
+
+  // HUMAN INTERFACE
+
+  using namespace OIS;
+
+  if(window_->isClosed())	return false;
+
+  //Need to capture/update each device
+  keyboard_->capture();
+  mouse_->capture();
+  if( joystick_ ) joystick_->capture();
+
+  bool buffJ = (joystick_) ? joystick_->buffered() : true;
+
+  //Check if one of the devices is not buffered
+  if( !mouse_->buffered() || !keyboard_->buffered() || !buffJ )
+  {
+    // one of the input modes is immediate, so setup what
+    // is needed for immediate movement
+    if (timeUntilNextToggle_ >= 0)
+      timeUntilNextToggle_ -= deltaTime;
+  }
+
+  // handle HID devices
+  if( processUnbufferedKeyInput() == false )
+      return false;
+  if( processUnbufferedMouseInput() == false )
+      return false;
+
+  // keep rendering
+  return true;
+}
+
+
+/**
+* Adjust mouse clipping area.
+* This method is called by Ogre without regards of tick()!
+* Avoid doing too much in this call.
+* @param rw render window
+*/
+void RunManager::windowResized(RenderWindow* rw)
+{
+  unsigned int width, height, depth;
+  int left, top;
+  rw->getMetrics(width, height, depth, left, top);
+
+  const OIS::MouseState &ms = mouse_->getMouseState();
+  ms.width = width;
+  ms.height = height;
+}
+
+
+/**
+* Unattach OIS before window shutdown (very important under Linux).
+* Again, avoid computing a lot in this function.
+* @param rw Render Window
+*/
+void RunManager::windowClosed(RenderWindow* rw)
+{
+  //Only close for window that created OIS (the main window in these demos)
+  if( rw == window_ )
+  {
+    if( inputManager_ )
+    {
+      inputManager_->destroyInputObject( mouse_ );
+      inputManager_->destroyInputObject( keyboard_ );
+      inputManager_->destroyInputObject( joystick_ );
+
+      OIS::InputManager::destroyInputSystem(inputManager_);
+      inputManager_ = 0;
+    }
+  }
+}
+
+/**
+* Processes the Keyboard input.
+* TODO: Use listeners to improve performance.
+* A lookup table should be implemented to bind any key to a specific action.
+* @return Return true to keep rendering
+*/
+bool RunManager::processUnbufferedKeyInput()
+{
+  using namespace OIS;
+
+  if(keyboard_->isKeyDown(KC_A) || keyboard_->isKeyDown(KC_LEFT))
+    playerShip_->setSideThrust(1);
+  else if(keyboard_->isKeyDown(KC_D) || keyboard_->isKeyDown(KC_RIGHT))
+    playerShip_->setSideThrust(-1);
+  else
+    playerShip_->setSideThrust(0);
+
+  if(keyboard_->isKeyDown(KC_UP) || keyboard_->isKeyDown(KC_W) )
+    playerShip_->setThrust(1);
+  else if(keyboard_->isKeyDown(KC_DOWN) || keyboard_->isKeyDown(KC_S) )
+    playerShip_->setThrust(-1);
+  else
+    playerShip_->setThrust(0);
+
+  if( keyboard_->isKeyDown(KC_ESCAPE) || keyboard_->isKeyDown(KC_Q) )
+    return false;
+
+  if( keyboard_->isKeyDown(KC_F) && timeUntilNextToggle_ <= 0 )
+  {
+    statsOn_ = !statsOn_;
+    showDebugOverlay(statsOn_);
+    timeUntilNextToggle_ = 1;
+  }
+
+  if( keyboard_->isKeyDown(KC_T) && timeUntilNextToggle_ <= 0 )
+  {
+    switch(filtering_)
+    {
+    case TFO_BILINEAR:
+      filtering_ = TFO_TRILINEAR;
+      aniso_ = 1;
+      break;
+    case TFO_TRILINEAR:
+      filtering_ = TFO_ANISOTROPIC;
+      aniso_ = 8;
+      break;
+    case TFO_ANISOTROPIC:
+      filtering_ = TFO_BILINEAR;
+      aniso_ = 1;
+      break;
+    default: break;
+    }
+    MaterialManager::getSingleton().setDefaultTextureFiltering(filtering_);
+    MaterialManager::getSingleton().setDefaultAnisotropy(aniso_);
+
+    showDebugOverlay(statsOn_);
+    timeUntilNextToggle_ = 1;
+  }
+
+  if(keyboard_->isKeyDown(KC_SYSRQ) && timeUntilNextToggle_ <= 0)
+  {
+    std::ostringstream ss;
+    ss << "screenshot_" << ++screenShotCounter_ << ".png";
+    window_->writeContentsToFile(ss.str());
+    timeUntilNextToggle_ = 0.5;
+    mDebugText = "Saved: " + ss.str();
+  }
+
+  if(keyboard_->isKeyDown(KC_R) && timeUntilNextToggle_ <=0)
+  {
+    sceneDetailIndex_ = (sceneDetailIndex_+1)%3 ;
+    switch(sceneDetailIndex_) {
+        case 0 : camera_->setPolygonMode(PM_SOLID); break;
+        case 1 : camera_->setPolygonMode(PM_WIREFRAME); break;
+        case 2 : camera_->setPolygonMode(PM_POINTS); break;
+    }
+    timeUntilNextToggle_ = 0.5;
+  }
+
+  static bool displayCameraDetails = false;
+  if(keyboard_->isKeyDown(KC_P) && timeUntilNextToggle_ <= 0)
+  {
+    displayCameraDetails = !displayCameraDetails;
+    timeUntilNextToggle_ = 0.5;
+    if (!displayCameraDetails)
+      mDebugText = "";
+  }
+
+  // Print camera details
+  if(displayCameraDetails)
+    mDebugText = StringConverter::toString(playerShip_->getThrust())
+    + " | Speed = " + StringConverter::toString(playerShip_->speed);
+  // mDebugText = "P: " + StringConverter::toString(camera_
+  //      ->getDerivedPosition()) + " " + "O: "
+  //      + StringConverter::toString(camera_->getDerivedOrientation());
+
+  // Return true to continue rendering
+  return true;
+}
+
+
+/**
+* Processes the Mouse input.
+* TODO: Use listeners to improve performance.
+* A lookup table should be implemented to bind ANY button or movement
+* to a specific action.
+* @return Return true to keep rendering
+*/
+bool RunManager::processUnbufferedMouseInput()
+{
+  using namespace OIS;
+
+  const MouseState &ms = mouse_->getMouseState();
+
+  // This is a 'hack' to show some flying barrels..
+  // Usually, the Bullet created by the ship should be managed
+  // by the physics engine..
+  if (ms.buttonDown(MB_Left) && !leftButtonDown_)
+  {
+    // Prevent continuous fire for the moment.
+    leftButtonDown_ = true;
+    
+    // let ship fire one shot with its only weapon (Barrels..)
+    Bullet *tempBullet = playerShip_->fire();
+
+    // resize array if neccessary (double the size then)
+    if (bulletsIndex_ >= bulletsSize_)
+    {
+      // redimension the array
+      Bullet **tempArray = new Bullet*[2*bulletsSize_];
+      for (int i = 0; i < bulletsSize_; i++)
+        tempArray[i] = bullets_[i];
+      bulletsSize_ *= 2;
+      delete bullets_;
+      bullets_ = tempArray;
+    }
+
+    // add the bullet to the list
+    bullets_[bulletsIndex_++] = tempBullet;
+
+  }
+  else if (!ms.buttons)
+    leftButtonDown_ = false;
+
+  // space ship steering. This should definitely be done in the steering object
+  // Simply give it the mouse movements.
+  playerShip_->turnUpAndDown(Radian(ms.Y.rel * mouseSensitivity_));
+  playerShip_->turnLeftAndRight(Radian(ms.X.rel * mousSensitivity_));
+  //playerShip_->mRootNode->pitch(Degree(-ms.Y.rel * 0.13), Ogre::Node::TransformSpace::TS_LOCAL);
+  //playerShip_->mRootNode->yaw(Degree(-ms.X.rel * 0.13), Ogre::Node::TransformSpace::TS_PARENT);
+
+  // keep rendering
+  return true;
+}
+
+/**
+* Show the debug overlay of desired.
+* @param show Whether or not to show the debug overlay
+*/
+void RunManager::showDebugOverlay(bool show)
+{
+  if (debugOverlay_)
+  {
+    if (show)
+      debugOverlay_->show();
+    else
+      debugOverlay_->hide();
+  }
+}
+
+
+/**
+* Show stats (e.g. FPS) in the left lower corner of the screen.
+* Copied from the ExampleFrameListener.h in the Ogre SDK
+*/
+void RunManager::updateStats(void)
+{
+  static String currFps = "Current FPS: ";
+  static String avgFps = "Average FPS: ";
+  static String bestFps = "Best FPS: ";
+  static String worstFps = "Worst FPS: ";
+  static String tris = "Triangle Count: ";
+  static String batches = "Batch Count: ";
+
+  // update stats when necessary
+  try {
+    OverlayElement* guiAvg = OverlayManager::getSingleton()
+      .getOverlayElement("Core/AverageFps");
+    OverlayElement* guiCurr = OverlayManager::getSingleton()
+      .getOverlayElement("Core/CurrFps");
+    OverlayElement* guiBest = OverlayManager::getSingleton()
+      .getOverlayElement("Core/BestFps");
+    OverlayElement* guiWorst = OverlayManager::getSingleton()
+      .getOverlayElement("Core/WorstFps");
+
+    const RenderTarget::FrameStats& stats = window_->getStatistics();
+    guiAvg->setCaption(avgFps + StringConverter::toString(stats.avgFPS));
+    guiCurr->setCaption(currFps + StringConverter::toString(stats.lastFPS));
+    guiBest->setCaption(bestFps + StringConverter::toString(stats.bestFPS)
+      +" "+StringConverter::toString(stats.bestFrameTime)+" ms");
+    guiWorst->setCaption(worstFps + StringConverter::toString(stats.worstFPS)
+      +" "+StringConverter::toString(stats.worstFrameTime)+" ms");
+
+    OverlayElement* guiTris = OverlayManager::getSingleton()
+      .getOverlayElement("Core/NumTris");
+    guiTris->setCaption(tris + StringConverter::toString(stats.triangleCount));
+
+    OverlayElement* guiBatches = OverlayManager::getSingleton()
+      .getOverlayElement("Core/NumBatches");
+    guiBatches->setCaption(batches
+      + StringConverter::toString(stats.batchCount));
+
+    OverlayElement* guiDbg = OverlayManager::getSingleton()
+      .getOverlayElement("Core/DebugText");
+    guiDbg->setCaption(mDebugText);
+  }
+  catch(...) { /* ignore */ }
+}
+
+
+
+/**
+* Simple camera creator.
+* playerShip_Node->attachObject(camera_) should no be here! This is what the camera
+* manager is for. Right now, this method should do just fine, setting the
+* cam behind the ship.
+*/
+void RunManager::createCamera(void)
+{
+  camera_ = sceneMgr_->createCamera("PlayerCam");
+  playerShip_Node->attachObject(camera_);
+  camera_->setNearClipDistance(5);
+  camera_->setPosition(Vector3(0,10,500));
+  camera_->lookAtVector3(0,0,0));
+}
+
+/**
+* Simple viewport creator.
+* TODO: fully understand the concept of viewports concerning orxnox.
+* E.g. do we need splitscreen mode?
+* For now the viewport uses the entire render window and is based on the one
+* camera created so far.
+*/
+void RunManager::createViewports(void)
+{
+  // Create one viewport, entire window
+  Viewport* vp = window_->addViewport(camera_);
+  vp->setBackgroundColour(ColourValue(0,0,0));
+
+  // Alter the camera aspect ratio to match the viewport
+  camera_->setAspectRatio(
+    Real(vp->getActualWidth()) / Real(vp->getActualHeight()));
+}
Index: code/branches/main_reto_vs05/src/weapon_manager.cc
===================================================================
--- code/branches/main_reto_vs05/src/weapon_manager.cc	(revision 157)
+++ code/branches/main_reto_vs05/src/weapon_manager.cc	(revision 157)
@@ -0,0 +1,38 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#include "weapon_manager.h"
+
+WeaponManager::WeaponManager(SceneManager *mSceneMgr)
+{
+	
+}
+
+
+WeaponManager::~WeaponManager()
+{
+}
