diff --git a/.vs/ProbeControlRoom/v15/sqlite3/storage.ide b/.vs/ProbeControlRoom/v15/sqlite3/storage.ide index 070936e..1b1fa9d 100644 Binary files a/.vs/ProbeControlRoom/v15/sqlite3/storage.ide and b/.vs/ProbeControlRoom/v15/sqlite3/storage.ide differ diff --git a/ChangeLog.txt b/ChangeLog.txt index 0f2ead2..deb9983 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -13,4 +13,9 @@ ChangeLog 1.2.3 Added InstallChecker Updated AssemblyVersion.tt - Updated for KSP 1.8 \ No newline at end of file + Updated for KSP 1.8 + +1.2.4 + Fixed button icon when enabling & disabling mod + Added AssemblyFileVersion + Updated version file for 1.12 diff --git a/GameData/ProbeControlRoom/MiniAVC-LICENSE.txt b/GameData/ProbeControlRoom/MiniAVC-LICENSE.txt deleted file mode 100644 index 94a9ed0..0000000 --- a/GameData/ProbeControlRoom/MiniAVC-LICENSE.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - 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 - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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 . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/GameData/ProbeControlRoom/ProbeControlRoom.version b/GameData/ProbeControlRoom/ProbeControlRoom.version index 87c5dc0..00534d3 100644 --- a/GameData/ProbeControlRoom/ProbeControlRoom.version +++ b/GameData/ProbeControlRoom/ProbeControlRoom.version @@ -11,16 +11,16 @@ "MAJOR": 1, "MINOR": 2, "PATCH": 3, - "BUILD": 0 + "BUILD": 1 }, "KSP_VERSION": { "MAJOR": 1, - "MINOR": 5, - "PATCH": 1 + "MINOR": 12, + "PATCH": 2 }, "KSP_VERSION_MIN": { "MAJOR": 1, - "MINOR": 8, + "MINOR": 12, "PATCH": 0 } } diff --git a/ProbeControlRoom.version b/ProbeControlRoom.version index 87c5dc0..1fb8e56 100644 --- a/ProbeControlRoom.version +++ b/ProbeControlRoom.version @@ -10,17 +10,17 @@ "VERSION": { "MAJOR": 1, "MINOR": 2, - "PATCH": 3, + "PATCH": 4, "BUILD": 0 }, "KSP_VERSION": { "MAJOR": 1, - "MINOR": 5, - "PATCH": 1 + "MINOR": 12, + "PATCH": 2 }, "KSP_VERSION_MIN": { "MAJOR": 1, - "MINOR": 8, + "MINOR": 12, "PATCH": 0 } } diff --git a/ProbeControlRoom.version.orig b/ProbeControlRoom.version.orig deleted file mode 100644 index 2add5c5..0000000 --- a/ProbeControlRoom.version.orig +++ /dev/null @@ -1,26 +0,0 @@ -{ - "NAME": "ProbeControlRoom", - "URL": "http://ksp.spacetux.net/avc/ProbeControlRoom", - "DOWNLOAD": "https://github.com/linuxgurugamer/KSP-ProbeControlRoom/releases", - "GITHUB": { - "USERNAME": "Linuxgurugamer", - "REPOSITORY": "KSP-ProbeControlRoom", - "ALLOW_PRE_RELEASE": false - }, - "VERSION": { - "MAJOR": 1, - "MINOR": 2, - "PATCH": 2, - "BUILD": 12 - }, - "KSP_VERSION": { - "MAJOR": 1, - "MINOR": 5, - "PATCH": 1 - }, - "KSP_VERSION_MIN": { - "MAJOR": 1, - "MINOR": 5, - "PATCH": 1 - } -} diff --git a/ProbeControlRoom/AssemblyVersion.cs b/ProbeControlRoom/AssemblyVersion.cs index c79a6e4..e254d37 100644 --- a/ProbeControlRoom/AssemblyVersion.cs +++ b/ProbeControlRoom/AssemblyVersion.cs @@ -5,4 +5,5 @@ using System.Reflection; - [assembly: AssemblyVersion("1.2.3.0")] \ No newline at end of file + [assembly: AssemblyVersion("1.2.3.1")] + [assembly: AssemblyFileVersion("1.2.3.1")] \ No newline at end of file diff --git a/ProbeControlRoom/AssemblyVersion.tt b/ProbeControlRoom/AssemblyVersion.tt index 0b6942b..0573068 100644 --- a/ProbeControlRoom/AssemblyVersion.tt +++ b/ProbeControlRoom/AssemblyVersion.tt @@ -97,4 +97,5 @@ using System.Reflection; - [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] \ No newline at end of file + [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] + [assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] \ No newline at end of file diff --git a/ProbeControlRoom/ProbeControlRoom.cs b/ProbeControlRoom/ProbeControlRoom.cs index a8db060..d0895e2 100644 --- a/ProbeControlRoom/ProbeControlRoom.cs +++ b/ProbeControlRoom/ProbeControlRoom.cs @@ -18,38 +18,38 @@ public class ProbeControlRoom : MonoBehaviour //Is IVA currently active and visible public static bool isActive = false; - private bool needCamReset = false; - - //Sun - IVASun CachedSun = null; - bool SunIsEnabled = true; - - //Stuff to mess with - static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldGet field_get_internalcamera_currentPitch; - static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldGet field_get_internalcamera_currentRot; - static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldGet field_get_internalcamera_currentZoom; - static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldSet field_set_internalcamera_currentPitch; - static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldSet field_set_internalcamera_currentRot; - static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldSet field_set_internalcamera_currentZoom; - bool hassavedlookangles = false; - float savedpitch = 0f; - float savedrot = 0f; - float savedzoom = 0f; - + private bool needCamReset = false; + + //Sun + IVASun CachedSun = null; + bool SunIsEnabled = true; + + //Stuff to mess with + static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldGet field_get_internalcamera_currentPitch; + static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldGet field_get_internalcamera_currentRot; + static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldGet field_get_internalcamera_currentZoom; + static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldSet field_set_internalcamera_currentPitch; + static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldSet field_set_internalcamera_currentRot; + static VirindiHelpers.DynamicEmitFields.delCreateDynamicInstanceFieldSet field_set_internalcamera_currentZoom; + bool hassavedlookangles = false; + float savedpitch = 0f; + float savedrot = 0f; + float savedzoom = 0f; + //Vessel has IVA with crew onboard private bool canStockIVA; - private bool maybecanstockiva; - + private bool maybecanstockiva; + //Vessel has a probe control room available private bool canPCRIVA; - + //Current PCR module private ProbeControlRoomPart aModule; //Current PCR part with internal module private Part aPart; - private MeshRenderer[] cachedrenderers = null; - + private MeshRenderer[] cachedrenderers = null; + //Storage for original game settings float shipVolumeBackup = GameSettings.SHIP_VOLUME; float ambianceVolumeBackup = GameSettings.AMBIENCE_VOLUME; @@ -57,18 +57,18 @@ public class ProbeControlRoom : MonoBehaviour float cameraFXInternalBackup = GameSettings.CAMERA_FX_INTERNAL; float cameraFXExternalBackup = GameSettings.CAMERA_FX_EXTERNAL; - //Vessel labels settings - bool HasCachedVesselLabelsSetting = false; - bool CachedVesselLabelsSetting = false; - bool VesselLabelKeyDisabled = false; - KeyCodeExtended CachedLabelPrimaryKey = GameSettings.TOGGLE_LABELS.primary; + //Vessel labels settings + bool HasCachedVesselLabelsSetting = false; + bool CachedVesselLabelsSetting = false; + bool VesselLabelKeyDisabled = false; + KeyCodeExtended CachedLabelPrimaryKey = GameSettings.TOGGLE_LABELS.primary; KeyCodeExtended CachedLabelSecondaryKey = GameSettings.TOGGLE_LABELS.secondary; - private static System.Reflection.MethodInfo method_vessellabels_enablealllabels = null; - private static System.Reflection.MethodInfo method_vessellabels_disablealllabels = null; + private static System.Reflection.MethodInfo method_vessellabels_enablealllabels = null; + private static System.Reflection.MethodInfo method_vessellabels_disablealllabels = null; - //Highlight in flight? - bool HasCachedHighlightInFlightSetting = false; - bool CachedHighlightInFlightSetting = true; + //Highlight in flight? + bool HasCachedHighlightInFlightSetting = false; + bool CachedHighlightInFlightSetting = true; //Application //private static ApplicationLauncherButton appLauncherButton = null; @@ -77,33 +77,33 @@ public class ProbeControlRoom : MonoBehaviour private bool AppLauncher = false; //App launcher icons - string IconActivate = "ProbeControlRoom/Icons/ProbeControlRoomToolbarDisabled"; + string IconActivate = "ProbeControlRoom/Icons/ProbeControlRoomToolbarDisabled"; string IconDeactivate = "ProbeControlRoom/Icons/ProbeControlRoomToolbarEnabled"; string enabledTexture = "ProbeControlRoom/Icons/ProbeControlRoomToolbarEnabled"; string disabledTexture = "ProbeControlRoom/Icons/ProbeControlRoomToolbarDisabled"; - static void GetFields() - { - if (field_get_internalcamera_currentPitch == null) - field_get_internalcamera_currentPitch = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldGet ("currentPitch"); - if (field_get_internalcamera_currentRot == null) - field_get_internalcamera_currentRot = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldGet ("currentRot"); - if (field_get_internalcamera_currentZoom == null) - field_get_internalcamera_currentZoom = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldGet ("currentZoom"); - - if (field_set_internalcamera_currentPitch == null) - field_set_internalcamera_currentPitch = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldSet ("currentPitch"); - if (field_set_internalcamera_currentRot == null) - field_set_internalcamera_currentRot = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldSet ("currentRot"); - if (field_set_internalcamera_currentZoom == null) - field_set_internalcamera_currentZoom = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldSet ("currentZoom"); - - if (method_vessellabels_enablealllabels == null) - method_vessellabels_enablealllabels = typeof(VesselLabels).GetMethod ("EnableAllLabels", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Instance); - if (method_vessellabels_disablealllabels == null) - method_vessellabels_disablealllabels = typeof(VesselLabels).GetMethod ("DisableAllLabels", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Instance); - } + static void GetFields() + { + if (field_get_internalcamera_currentPitch == null) + field_get_internalcamera_currentPitch = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldGet("currentPitch"); + if (field_get_internalcamera_currentRot == null) + field_get_internalcamera_currentRot = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldGet("currentRot"); + if (field_get_internalcamera_currentZoom == null) + field_get_internalcamera_currentZoom = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldGet("currentZoom"); + + if (field_set_internalcamera_currentPitch == null) + field_set_internalcamera_currentPitch = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldSet("currentPitch"); + if (field_set_internalcamera_currentRot == null) + field_set_internalcamera_currentRot = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldSet("currentRot"); + if (field_set_internalcamera_currentZoom == null) + field_set_internalcamera_currentZoom = VirindiHelpers.DynamicEmitFields.CreateDynamicInstanceFieldSet("currentZoom"); + + if (method_vessellabels_enablealllabels == null) + method_vessellabels_enablealllabels = typeof(VesselLabels).GetMethod("EnableAllLabels", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Instance); + if (method_vessellabels_disablealllabels == null) + method_vessellabels_disablealllabels = typeof(VesselLabels).GetMethod("DisableAllLabels", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Instance); + } /// /// Startup and initialization @@ -114,12 +114,14 @@ public void Start() Instance = this; - try{ - GetFields(); - } - catch (Exception ex) { - ProbeControlRoomUtils.Logger.debug("Exception finding fields: " + ex.ToString()); - } + try + { + GetFields(); + } + catch (Exception ex) + { + ProbeControlRoomUtils.Logger.debug("Exception finding fields: " + ex.ToString()); + } refreshVesselRooms(); @@ -132,8 +134,8 @@ public void Start() GameEvents.onGUIApplicationLauncherReady.Add(onGUIApplicationLauncherReady); GameEvents.onGUIApplicationLauncherDestroyed.Add(OnGUIAppLauncherDestroyed); GameEvents.OnMapExited.Add(onMapExited); - GameEvents.OnCameraChange.Add(onCameraChange); - GameEvents.onGameSceneSwitchRequested.Add(OnGameSceneSwitchRequested); + GameEvents.OnCameraChange.Add(onCameraChange); + GameEvents.onGameSceneSwitchRequested.Add(OnGameSceneSwitchRequested); //If Manely mode is set true, force straight into IVA if (ProbeControlRoomSettings.Instance.ForcePCROnly) @@ -143,12 +145,12 @@ public void Start() } } - void OnGameSceneSwitchRequested(GameEvents.FromToAction scn) - { - if (isActive) - stopIVA (); - - } + void OnGameSceneSwitchRequested(GameEvents.FromToAction scn) + { + if (isActive) + stopIVA(); + + } void OnGUIAppLauncherDestroyed() { @@ -168,22 +170,24 @@ private void onGUIApplicationLauncherReady() { InitializeApplicationButton(); AppLauncher = true; - if(!canPCRIVA) + if (!canPCRIVA) { toolbarControl.Enabled = false; } } - + } - private void onMapExited() { - needCamReset = true; - } + private void onMapExited() + { + needCamReset = true; + } - private void onCameraChange(CameraManager.CameraMode c){ - //ProbeControlRoomUtils.Logger.message("OnCameraChange: " + c.ToString()); - //needCamReset = true; - } + private void onCameraChange(CameraManager.CameraMode c) + { + //ProbeControlRoomUtils.Logger.message("OnCameraChange: " + c.ToString()); + //needCamReset = true; + } internal const string MODID = "PCR_NS"; internal const string MODNAME = "Probe Control Room"; @@ -193,26 +197,7 @@ private void onCameraChange(CameraManager.CameraMode c){ /// Reference to created button void InitializeApplicationButton() { -#if false - ApplicationLauncherButton Button = null; - - IconActivate = GameDatabase.Instance.GetTexture("ProbeControlRoom/Icons/ProbeControlRoomToolbarDisabled", false); - IconDeactivate = GameDatabase.Instance.GetTexture("ProbeControlRoom/Icons/ProbeControlRoomToolbarEnabled", false); - - - Button = ApplicationLauncher.Instance.AddModApplication( - OnAppLauncherTrue, - OnAppLauncherFalse, - null, - null, - null, - null, - ApplicationLauncher.AppScenes.FLIGHT, - IconActivate); -#endif - - - toolbarControl = gameObject.AddComponent(); + toolbarControl = gameObject.AddComponent(); toolbarControl.AddToAllToolbars(OnAppLauncherTrue, OnAppLauncherFalse, ApplicationLauncher.AppScenes.FLIGHT, @@ -228,8 +213,8 @@ void InitializeApplicationButton() ProbeControlRoomUtils.Logger.debug("InitializeApplicationButton(): Was unable to initialize button"); } - if (isActive) - toolbarControl.SetTexture (IconDeactivate, disabledTexture); + if (isActive) + toolbarControl.SetTexture(IconDeactivate, disabledTexture); } @@ -238,7 +223,8 @@ void InitializeApplicationButton() /// public static bool vesselCanIVA { - get { + get + { return Instance.canPCRIVA; } } @@ -279,8 +265,8 @@ private void toggleIVA() /// public void OnDestroy() { - SetSun (true); - CachedSun = null; + SetSun(true); + CachedSun = null; //in case of revert to launch while in IVA, Update() won't detect it //and startIVA(p) will be called without prior stopIVA @@ -304,37 +290,37 @@ public void OnDestroy() GameSettings.CAMERA_FX_EXTERNAL = cameraFXExternalBackup; } - ProbeControlRoomUtils.Logger.message("OnDestroy() - VesselLabels - " + HasCachedVesselLabelsSetting.ToString() + ", " + VesselLabelKeyDisabled.ToString()); - //Restore vessel labels capability. - if (HasCachedVesselLabelsSetting) - { - HasCachedVesselLabelsSetting = false; - SetVesselLabelsValue (CachedVesselLabelsSetting); - } - if (VesselLabelKeyDisabled) - { - VesselLabelKeyDisabled = false; - GameSettings.TOGGLE_LABELS.primary = CachedLabelPrimaryKey; - GameSettings.TOGGLE_LABELS.secondary = CachedLabelSecondaryKey; - } - - //Restore part highlighter - if (HasCachedHighlightInFlightSetting) - { - HasCachedHighlightInFlightSetting = false; - GameSettings.INFLIGHT_HIGHLIGHT = CachedHighlightInFlightSetting; - } + ProbeControlRoomUtils.Logger.message("OnDestroy() - VesselLabels - " + HasCachedVesselLabelsSetting.ToString() + ", " + VesselLabelKeyDisabled.ToString()); + //Restore vessel labels capability. + if (HasCachedVesselLabelsSetting) + { + HasCachedVesselLabelsSetting = false; + SetVesselLabelsValue(CachedVesselLabelsSetting); + } + if (VesselLabelKeyDisabled) + { + VesselLabelKeyDisabled = false; + GameSettings.TOGGLE_LABELS.primary = CachedLabelPrimaryKey; + GameSettings.TOGGLE_LABELS.secondary = CachedLabelSecondaryKey; + } + + //Restore part highlighter + if (HasCachedHighlightInFlightSetting) + { + HasCachedHighlightInFlightSetting = false; + GameSettings.INFLIGHT_HIGHLIGHT = CachedHighlightInFlightSetting; + } ProbeControlRoomUtils.Logger.debug("OnDestroy()"); - GameEvents.onVesselChange.Remove(OnVesselChange); - GameEvents.onVesselWasModified.Remove(OnVesselModified); + GameEvents.onVesselChange.Remove(OnVesselChange); + GameEvents.onVesselWasModified.Remove(OnVesselModified); //GameEvents.onGUIApplicationLauncherReady.Remove(onGUIApplicationLauncherReady); onGUIApplicationLauncherReady(); GameEvents.onGUIApplicationLauncherDestroyed.Remove(OnGUIAppLauncherDestroyed); GameEvents.OnMapExited.Remove(onMapExited); - GameEvents.OnCameraChange.Remove(onCameraChange); - GameEvents.onGameSceneSwitchRequested.Remove(OnGameSceneSwitchRequested); + GameEvents.OnCameraChange.Remove(onCameraChange); + GameEvents.onGameSceneSwitchRequested.Remove(OnGameSceneSwitchRequested); if (toolbarControl != null) { @@ -348,54 +334,54 @@ public void OnDestroy() Instance = null; } - void SetSun(bool on) - { - ProbeControlRoomUtils.Logger.message("SetSun() - " + on.ToString()); + void SetSun(bool on) + { + ProbeControlRoomUtils.Logger.message("SetSun() - " + on.ToString()); - if (CachedSun == null) - CachedSun = (IVASun)FindObjectOfType(typeof(IVASun)); - if (CachedSun == null) - return; + if (CachedSun == null) + CachedSun = (IVASun)FindObjectOfType(typeof(IVASun)); + if (CachedSun == null) + return; - ProbeControlRoomUtils.Logger.message("SetSun() - SETTING"); - CachedSun.gameObject.SetActive (on); - SunIsEnabled = on; - } + ProbeControlRoomUtils.Logger.message("SetSun() - SETTING"); + CachedSun.gameObject.SetActive(on); + SunIsEnabled = on; + } - void SetVesselLabelsValue(bool on) - { - //ProbeControlRoomUtils.Logger.message("SetVesselLabelsValue() - ENTER"); + void SetVesselLabelsValue(bool on) + { + //ProbeControlRoomUtils.Logger.message("SetVesselLabelsValue() - ENTER"); - if (GameSettings.FLT_VESSEL_LABELS == on) - return; + if (GameSettings.FLT_VESSEL_LABELS == on) + return; - VesselLabels lbls = (VesselLabels)FindObjectOfType (typeof(VesselLabels)); + VesselLabels lbls = (VesselLabels)FindObjectOfType(typeof(VesselLabels)); - ProbeControlRoomUtils.Logger.message("SetVesselLabelsValue() - lbls - " + (lbls != null).ToString()); + ProbeControlRoomUtils.Logger.message("SetVesselLabelsValue() - lbls - " + (lbls != null).ToString()); - if (on && lbls != null && method_vessellabels_enablealllabels != null) - { - ProbeControlRoomUtils.Logger.message ("SetVesselLabelsValue() - INVOKE ENABLE"); + if (on && lbls != null && method_vessellabels_enablealllabels != null) + { + ProbeControlRoomUtils.Logger.message("SetVesselLabelsValue() - INVOKE ENABLE"); - method_vessellabels_enablealllabels.Invoke (lbls, null); - GameSettings.FLT_VESSEL_LABELS = true; - } - else if (!on && lbls != null && method_vessellabels_disablealllabels != null) - { - ProbeControlRoomUtils.Logger.message ("SetVesselLabelsValue() - INVOKE DISABLE"); + method_vessellabels_enablealllabels.Invoke(lbls, null); + GameSettings.FLT_VESSEL_LABELS = true; + } + else if (!on && lbls != null && method_vessellabels_disablealllabels != null) + { + ProbeControlRoomUtils.Logger.message("SetVesselLabelsValue() - INVOKE DISABLE"); - method_vessellabels_disablealllabels.Invoke (lbls, null); - GameSettings.FLT_VESSEL_LABELS = false; - } - else if (!lbls) - { - ProbeControlRoomUtils.Logger.message ("SetVesselLabelsValue() - NO LBLS SET"); + method_vessellabels_disablealllabels.Invoke(lbls, null); + GameSettings.FLT_VESSEL_LABELS = false; + } + else if (!lbls) + { + ProbeControlRoomUtils.Logger.message("SetVesselLabelsValue() - NO LBLS SET"); - //We are probably leaving flight, so VesselLabels has been eliminated. - //Set this for later. - GameSettings.FLT_VESSEL_LABELS = on; - } - } + //We are probably leaving flight, so VesselLabels has been eliminated. + //Set this for later. + GameSettings.FLT_VESSEL_LABELS = on; + } + } /// /// Sets up IVA and activates it @@ -403,23 +389,25 @@ void SetVesselLabelsValue(bool on) /// True if successful, False on error public bool startIVA() { - if (FlightGlobals.ActiveVessel == null) - { - ProbeControlRoomUtils.Logger.debug("startIVA() - return ACTIVE VESSEL NULL"); - return false; - } + if (FlightGlobals.ActiveVessel == null) + { + ProbeControlRoomUtils.Logger.debug("startIVA() - return ACTIVE VESSEL NULL"); + return false; + } ProbeControlRoomUtils.Logger.debug("startIVA()"); Transform actualTransform; - if (FlightGlobals.ActiveVessel.packed) { - ProbeControlRoomUtils.Logger.debug("startIVA() - return vessel still packed!"); - return false; - } + if (FlightGlobals.ActiveVessel.packed) + { + ProbeControlRoomUtils.Logger.debug("startIVA() - return vessel still packed!"); + return false; + } - if (canStockIVA || FlightGlobals.ActiveVessel.evaController != null) { - ProbeControlRoomUtils.Logger.debug("startIVA() - return EVA or IVA"); - return false; - } + if (canStockIVA || FlightGlobals.ActiveVessel.evaController != null) + { + ProbeControlRoomUtils.Logger.debug("startIVA() - return EVA or IVA"); + return false; + } //Verify active room available if (!canPCRIVA) @@ -434,10 +422,11 @@ public bool startIVA() ProbeControlRoomUtils.Logger.message("startIVA() Lost our part, refreshing"); refreshVesselRooms(); } - if (aPart == null) { - ProbeControlRoomUtils.Logger.message("startIVA() Can't find a part. DIE."); - return false; - } + if (aPart == null) + { + ProbeControlRoomUtils.Logger.message("startIVA() Can't find a part. DIE."); + return false; + } //Setup module for transforms if (aPart.FindModulesImplementing().Count == 0) @@ -492,30 +481,30 @@ public bool startIVA() } // TODO: create cfg file with cached vars, on crash to be restored - //Prevent user from turning on vessel labels - if (!HasCachedVesselLabelsSetting) - { - HasCachedVesselLabelsSetting = true; - CachedVesselLabelsSetting = GameSettings.FLT_VESSEL_LABELS; - } - if (!VesselLabelKeyDisabled) - { - VesselLabelKeyDisabled = true; - CachedLabelPrimaryKey = GameSettings.TOGGLE_LABELS.primary; - CachedLabelSecondaryKey = GameSettings.TOGGLE_LABELS.secondary; - GameSettings.TOGGLE_LABELS.primary = new KeyCodeExtended(KeyCode.None); - GameSettings.TOGGLE_LABELS.secondary = new KeyCodeExtended(KeyCode.None); - } - SetVesselLabelsValue (false); - - - //Highlighters - if (!HasCachedHighlightInFlightSetting) - { - HasCachedHighlightInFlightSetting = true; - CachedHighlightInFlightSetting = GameSettings.INFLIGHT_HIGHLIGHT; - } - GameSettings.INFLIGHT_HIGHLIGHT = false; + //Prevent user from turning on vessel labels + if (!HasCachedVesselLabelsSetting) + { + HasCachedVesselLabelsSetting = true; + CachedVesselLabelsSetting = GameSettings.FLT_VESSEL_LABELS; + } + if (!VesselLabelKeyDisabled) + { + VesselLabelKeyDisabled = true; + CachedLabelPrimaryKey = GameSettings.TOGGLE_LABELS.primary; + CachedLabelSecondaryKey = GameSettings.TOGGLE_LABELS.secondary; + GameSettings.TOGGLE_LABELS.primary = new KeyCodeExtended(KeyCode.None); + GameSettings.TOGGLE_LABELS.secondary = new KeyCodeExtended(KeyCode.None); + } + SetVesselLabelsValue(false); + + + //Highlighters + if (!HasCachedHighlightInFlightSetting) + { + HasCachedHighlightInFlightSetting = true; + CachedHighlightInFlightSetting = GameSettings.INFLIGHT_HIGHLIGHT; + } + GameSettings.INFLIGHT_HIGHLIGHT = false; //Unsure of this purpose at the moment @@ -535,25 +524,27 @@ public bool startIVA() ProbeControlRoomUtils.Logger.debug("startIVA() - DONE"); - //GUI may not be started yet. - if (toolbarControl != null) { + //GUI may not be started yet. + if (toolbarControl != null) + { //Change app launcher button icon - toolbarControl.SetTexture (IconDeactivate, disabledTexture); - } + toolbarControl.SetTexture(IconActivate, enabledTexture); + } - if (hassavedlookangles && field_set_internalcamera_currentPitch != null && field_set_internalcamera_currentRot != null && field_set_internalcamera_currentZoom != null) { - ProbeControlRoomUtils.Logger.debug(string.Format("startIVA() - Restoring pitch and rot. {0}, {1}", savedpitch, savedrot)); + if (hassavedlookangles && field_set_internalcamera_currentPitch != null && field_set_internalcamera_currentRot != null && field_set_internalcamera_currentZoom != null) + { + ProbeControlRoomUtils.Logger.debug(string.Format("startIVA() - Restoring pitch and rot. {0}, {1}", savedpitch, savedrot)); - field_set_internalcamera_currentPitch(InternalCamera.Instance, savedpitch); - field_set_internalcamera_currentRot(InternalCamera.Instance, savedrot); - field_set_internalcamera_currentZoom(InternalCamera.Instance, savedzoom); - InternalCamera.Instance.Update (); - } + field_set_internalcamera_currentPitch(InternalCamera.Instance, savedpitch); + field_set_internalcamera_currentRot(InternalCamera.Instance, savedrot); + field_set_internalcamera_currentZoom(InternalCamera.Instance, savedzoom); + InternalCamera.Instance.Update(); + } - //Disable sun effects inside of IVA - SetSun(false); + //Disable sun effects inside of IVA + SetSun(false); - ProbeControlRoomUtils.Logger.debug("startIVA() - REALLY DONE"); + ProbeControlRoomUtils.Logger.debug("startIVA() - REALLY DONE"); isActive = true; @@ -561,37 +552,38 @@ public bool startIVA() } - void ResetCameraToIVA() - { - aModule = aPart.FindModulesImplementing()[0]; - Transform actualTransform = aPart.internalModel.FindModelTransform(aModule.seatTransformName); - if (Transform.Equals(actualTransform, null)) - { - ProbeControlRoomUtils.Logger.error("ResetCameraToIVA(Part) - NULL on actualTransform-seatTransformName, using fallback..."); - actualTransform = aPart.internalModel.FindModelTransform("Seat"); - } - else - { - ProbeControlRoomUtils.Logger.message("ResetCameraToIVA(Part) - Seat: " + aModule.seatTransformName.ToString()); - } - - - CameraManager.Instance.SetCameraInternal(aPart.internalModel, actualTransform); - - - //Restore PCRIVA camera - if (hassavedlookangles && field_set_internalcamera_currentPitch != null && field_set_internalcamera_currentRot != null && field_set_internalcamera_currentZoom != null) { - field_set_internalcamera_currentPitch(InternalCamera.Instance, savedpitch); - field_set_internalcamera_currentRot(InternalCamera.Instance, savedrot); - field_set_internalcamera_currentZoom(InternalCamera.Instance, savedzoom); - InternalCamera.Instance.Update (); - } - - //Disable sun effects inside of IVA - SetSun(false); - - ProbeControlRoomUtils.Logger.debug("ResetCameraToIVA - DONE"); - } + void ResetCameraToIVA() + { + aModule = aPart.FindModulesImplementing()[0]; + Transform actualTransform = aPart.internalModel.FindModelTransform(aModule.seatTransformName); + if (Transform.Equals(actualTransform, null)) + { + ProbeControlRoomUtils.Logger.error("ResetCameraToIVA(Part) - NULL on actualTransform-seatTransformName, using fallback..."); + actualTransform = aPart.internalModel.FindModelTransform("Seat"); + } + else + { + ProbeControlRoomUtils.Logger.message("ResetCameraToIVA(Part) - Seat: " + aModule.seatTransformName.ToString()); + } + + + CameraManager.Instance.SetCameraInternal(aPart.internalModel, actualTransform); + + + //Restore PCRIVA camera + if (hassavedlookangles && field_set_internalcamera_currentPitch != null && field_set_internalcamera_currentRot != null && field_set_internalcamera_currentZoom != null) + { + field_set_internalcamera_currentPitch(InternalCamera.Instance, savedpitch); + field_set_internalcamera_currentRot(InternalCamera.Instance, savedrot); + field_set_internalcamera_currentZoom(InternalCamera.Instance, savedzoom); + InternalCamera.Instance.Update(); + } + + //Disable sun effects inside of IVA + SetSun(false); + + ProbeControlRoomUtils.Logger.debug("ResetCameraToIVA - DONE"); + } /// /// Shuts down current PCR IVA @@ -601,12 +593,12 @@ public void stopIVA() ProbeControlRoomUtils.Logger.debug("stopIVA()"); - //Enable sun effects inside of IVA - SetSun(true); + //Enable sun effects inside of IVA + SetSun(true); isActive = false; - needCamReset = false; - + needCamReset = false; + //Restore settings to levels prior to entering IVA if (ProbeControlRoomSettings.Instance.DisableSounds) { @@ -625,25 +617,25 @@ public void stopIVA() GameSettings.CAMERA_FX_EXTERNAL = cameraFXExternalBackup; } - //Restore vessel labels capability. - if (HasCachedVesselLabelsSetting) - { - HasCachedVesselLabelsSetting = false; - SetVesselLabelsValue (CachedVesselLabelsSetting); - } - if (VesselLabelKeyDisabled) - { - VesselLabelKeyDisabled = false; - GameSettings.TOGGLE_LABELS.primary = CachedLabelPrimaryKey; - GameSettings.TOGGLE_LABELS.secondary = CachedLabelSecondaryKey; - } - - //Restore part highlighter - if (HasCachedHighlightInFlightSetting) - { - HasCachedHighlightInFlightSetting = false; - GameSettings.INFLIGHT_HIGHLIGHT = CachedHighlightInFlightSetting; - } + //Restore vessel labels capability. + if (HasCachedVesselLabelsSetting) + { + HasCachedVesselLabelsSetting = false; + SetVesselLabelsValue(CachedVesselLabelsSetting); + } + if (VesselLabelKeyDisabled) + { + VesselLabelKeyDisabled = false; + GameSettings.TOGGLE_LABELS.primary = CachedLabelPrimaryKey; + GameSettings.TOGGLE_LABELS.secondary = CachedLabelSecondaryKey; + } + + //Restore part highlighter + if (HasCachedHighlightInFlightSetting) + { + HasCachedHighlightInFlightSetting = false; + GameSettings.INFLIGHT_HIGHLIGHT = CachedHighlightInFlightSetting; + } //Switch back to normal cameras CameraManager.ICameras_DeactivateAll(); @@ -655,42 +647,43 @@ public void stopIVA() ProbeControlRoomUtils.Logger.debug("stopIVA() - CHECKMARK"); //Change app launcher button - toolbarControl.SetTexture(IconActivate, enabledTexture); + toolbarControl.SetTexture(IconDeactivate, disabledTexture); } - public void Update() - { - if (HighLogic.LoadedScene == GameScenes.FLIGHT - && isActive - && !canStockIVA - && CameraManager.Instance.currentCameraMode != CameraManager.CameraMode.IVA) - { - //Stuff to do early while running - - //Kill vessel labels - SetVesselLabelsValue (false); - - //Save where the camera was looking. - //We have to do this here because if the part is shut down, - //we don't have time to get it before it is lost. - if (field_get_internalcamera_currentPitch != null && field_get_internalcamera_currentRot != null && field_get_internalcamera_currentZoom != null) { - float newpitch = field_get_internalcamera_currentPitch(InternalCamera.Instance); - float newrot = field_get_internalcamera_currentRot(InternalCamera.Instance); - float newzoom = field_get_internalcamera_currentZoom(InternalCamera.Instance); - - //Note that if the PCRIVA got broken, these are zero. - if (newpitch != 0f || newrot != 0f) - { - hassavedlookangles = true; - savedpitch = newpitch; - savedrot = newrot; - savedzoom = newzoom; - } - } - - - } - } + public void Update() + { + if (HighLogic.LoadedScene == GameScenes.FLIGHT + && isActive + && !canStockIVA + && CameraManager.Instance.currentCameraMode != CameraManager.CameraMode.IVA) + { + //Stuff to do early while running + + //Kill vessel labels + SetVesselLabelsValue(false); + + //Save where the camera was looking. + //We have to do this here because if the part is shut down, + //we don't have time to get it before it is lost. + if (field_get_internalcamera_currentPitch != null && field_get_internalcamera_currentRot != null && field_get_internalcamera_currentZoom != null) + { + float newpitch = field_get_internalcamera_currentPitch(InternalCamera.Instance); + float newrot = field_get_internalcamera_currentRot(InternalCamera.Instance); + float newzoom = field_get_internalcamera_currentZoom(InternalCamera.Instance); + + //Note that if the PCRIVA got broken, these are zero. + if (newpitch != 0f || newrot != 0f) + { + hassavedlookangles = true; + savedpitch = newpitch; + savedrot = newrot; + savedzoom = newzoom; + } + } + + + } + } /// /// Check for invalid PCR states and controls inputs for acivation/deactivation @@ -701,74 +694,86 @@ public void LateUpdate() var scene = HighLogic.LoadedScene; if (scene == GameScenes.FLIGHT) { - if (maybecanstockiva && HighLogic.CurrentGame.Parameters.Flight.CanIVA) { - ProbeControlRoomUtils.Logger.message("OnUpdate() - Maybe we can IVA, rescan"); - refreshVesselRooms (); - } + if (maybecanstockiva && HighLogic.CurrentGame.Parameters.Flight.CanIVA) + { + ProbeControlRoomUtils.Logger.message("OnUpdate() - Maybe we can IVA, rescan"); + refreshVesselRooms(); + } if (isActive) { - //***Start in flight and active*** - + //***Start in flight and active*** + //If IVA Camera is active, there is a valid and operational stock IVA and PCR needs to be shutdown - if (CameraManager.Instance.currentCameraMode == CameraManager.CameraMode.IVA - || canStockIVA) { - - ProbeControlRoomUtils.Logger.message ("OnUpdate() - real IVA detected, ending..."); - stopIVA (); - /* + if (CameraManager.Instance.currentCameraMode == CameraManager.CameraMode.IVA + || canStockIVA) + { + + ProbeControlRoomUtils.Logger.message("OnUpdate() - real IVA detected, ending..."); + stopIVA(); + /* if (ProbeControlRoomSettings.Instance.ForcePCROnly) { ProbeControlRoomUtils.Logger.message ("OnUpdate() - real IVA detected, ending... KILLED - ForcePCROnly Enabled."); startIVA (); } */ - } else { + } + else + { - //***Start in flight, active, and should be active*** + //***Start in flight, active, and should be active*** - if (aPart == null || aPart.internalModel == null) - needCamReset = true; - else { - if (cachedrenderers == null) - cachedrenderers = aPart.internalModel.GetComponentsInChildren (); - if (cachedrenderers.Length > 0 && !cachedrenderers [0].enabled) { - ProbeControlRoomUtils.Logger.message ("Need cam reset because renderer off."); - needCamReset = true; - } - } + if (aPart == null || aPart.internalModel == null) + needCamReset = true; + else + { + if (cachedrenderers == null) + cachedrenderers = aPart.internalModel.GetComponentsInChildren(); + if (cachedrenderers.Length > 0 && !cachedrenderers[0].enabled) + { + ProbeControlRoomUtils.Logger.message("Need cam reset because renderer off."); + needCamReset = true; + } + } - if ((needCamReset || FlightCamera.fetch.updateActive) - && (!MapView.MapIsEnabled && FlightGlobals.ActiveVessel != null && !FlightGlobals.ActiveVessel.packed)) { - ResetCameraToIVA (); - needCamReset = false; - ProbeControlRoomUtils.Logger.message ("Done with needCamReset."); - } + if ((needCamReset || FlightCamera.fetch.updateActive) + && (!MapView.MapIsEnabled && FlightGlobals.ActiveVessel != null && !FlightGlobals.ActiveVessel.packed)) + { + ResetCameraToIVA(); + needCamReset = false; + ProbeControlRoomUtils.Logger.message("Done with needCamReset."); + } - //Check for imput to stop IVA - if (!MapView.MapIsEnabled && GameSettings.CAMERA_MODE.GetKeyDown(false)) { - ProbeControlRoomUtils.Logger.message ("OnUpdate() - CAMERA_MODE.key seen, stopIVA()"); - if (ProbeControlRoomSettings.Instance.ForcePCROnly) { - ProbeControlRoomUtils.Logger.message ("OnUpdate() - CAMERA_MODE.key seen, stopIVA() KILLED - ForcePCROnly Enabled."); - } else { - stopIVA (); - } - } + //Check for imput to stop IVA + if (!MapView.MapIsEnabled && GameSettings.CAMERA_MODE.GetKeyDown(false)) + { + ProbeControlRoomUtils.Logger.message("OnUpdate() - CAMERA_MODE.key seen, stopIVA()"); + if (ProbeControlRoomSettings.Instance.ForcePCROnly) + { + ProbeControlRoomUtils.Logger.message("OnUpdate() - CAMERA_MODE.key seen, stopIVA() KILLED - ForcePCROnly Enabled."); + } + else + { + stopIVA(); + } + } - //***End in flight, active, and should be active*** - } + //***End in flight, active, and should be active*** + } - //***End in flight and active*** + //***End in flight and active*** } else { // Listen for keyboard input to start PCR unless a valid IVA exists. PCR can still be started via AppLauncher or toolbar - if (!maybecanstockiva && !canStockIVA && canPCRIVA && !MapView.MapIsEnabled && - (ProbeControlRoomSettings.Instance.ForcePCROnly || GameSettings.CAMERA_MODE.GetKeyDown(false) ) - ) { - ProbeControlRoomUtils.Logger.message ("OnUpdate() - CAMERA_MODE.key seen, startIVA()"); - startIVA (); - } + if (!maybecanstockiva && !canStockIVA && canPCRIVA && !MapView.MapIsEnabled && + (ProbeControlRoomSettings.Instance.ForcePCROnly || GameSettings.CAMERA_MODE.GetKeyDown(false)) + ) + { + ProbeControlRoomUtils.Logger.message("OnUpdate() - CAMERA_MODE.key seen, startIVA()"); + startIVA(); + } } } else @@ -789,7 +794,7 @@ public void LateUpdate() private void OnVesselChange(Vessel v) { ProbeControlRoomUtils.Logger.message("OnVesselChange(Vessel)"); - aPart = null; + aPart = null; vesselModified(); } @@ -809,30 +814,36 @@ private void OnVesselModified(Vessel v) private void vesselModified() { ProbeControlRoomUtils.Logger.message("vesselModified()"); - if (FlightGlobals.ActiveVessel == null) { - ProbeControlRoomUtils.Logger.message("vesselModified() - no active vessel, returning"); - stopIVA (); - return; - } + if (FlightGlobals.ActiveVessel == null) + { + ProbeControlRoomUtils.Logger.message("vesselModified() - no active vessel, returning"); + stopIVA(); + return; + } Part oldPart = aPart; refreshVesselRooms(); //Only stop the IVA if the part is missing, restart it otherwise - if (isActive) { - if (!canPCRIVA) { - ProbeControlRoomUtils.Logger.message ("vesselModified() - Can no longer use PCR on this vessel"); - stopIVA (); - } - - if (aPart != oldPart) { - ProbeControlRoomUtils.Logger.message ("vesselModified() - Have to change part."); - //Can still PCR IVA but the part has changed, restart - - stopIVA (); - startIVA (); - } - } else if (canPCRIVA && !canStockIVA && !MapView.MapIsEnabled && ProbeControlRoomSettings.Instance.ForcePCROnly) { - startIVA (); - } + if (isActive) + { + if (!canPCRIVA) + { + ProbeControlRoomUtils.Logger.message("vesselModified() - Can no longer use PCR on this vessel"); + stopIVA(); + } + + if (aPart != oldPart) + { + ProbeControlRoomUtils.Logger.message("vesselModified() - Have to change part."); + //Can still PCR IVA but the part has changed, restart + + stopIVA(); + startIVA(); + } + } + else if (canPCRIVA && !canStockIVA && !MapView.MapIsEnabled && ProbeControlRoomSettings.Instance.ForcePCROnly) + { + startIVA(); + } } /// @@ -848,68 +859,84 @@ private void refreshVesselRooms() if (vessel == null) { canStockIVA = false; - maybecanstockiva = false; + maybecanstockiva = false; aPart = null; - cachedrenderers = null; + cachedrenderers = null; aModule = null; ProbeControlRoomUtils.Logger.error("refreshVesselRooms() - ERROR: FlightGlobals.activeVessel is NULL"); return; } - canStockIVA = false; - maybecanstockiva = false; - for (int i = 0; i < vessel.parts.Count; i++) { - Part p = vessel.parts [i]; - ProbeControlRoomPart room = p.GetComponent (); - - //Are we not loaded yet? - if ((!HighLogic.CurrentGame.Parameters.Flight.CanIVA || vessel.packed) && p.protoModuleCrew.Count > 0) { - ProbeControlRoomUtils.Logger.message ("refreshVesselRooms() - Maybe we can IVA!"); - maybecanstockiva = true; - canStockIVA = true; - } else if (HighLogic.CurrentGame.Parameters.Flight.CanIVA && p.protoModuleCrew.Count > 0 && p.internalModel != null) { - ProbeControlRoomUtils.Logger.message ("refreshVesselRooms() - Stock IVA possible. Part: " + p.ToString ()); - canStockIVA = true; - } - } + canStockIVA = false; + maybecanstockiva = false; + for (int i = 0; i < vessel.parts.Count; i++) + { + Part p = vessel.parts[i]; + ProbeControlRoomPart room = p.GetComponent(); + + //Are we not loaded yet? + if ((!HighLogic.CurrentGame.Parameters.Flight.CanIVA || vessel.packed) && p.protoModuleCrew.Count > 0) + { + ProbeControlRoomUtils.Logger.message("refreshVesselRooms() - Maybe we can IVA!"); + maybecanstockiva = true; + canStockIVA = true; + } + else if (HighLogic.CurrentGame.Parameters.Flight.CanIVA && p.protoModuleCrew.Count > 0 && p.internalModel != null) + { + ProbeControlRoomUtils.Logger.message("refreshVesselRooms() - Stock IVA possible. Part: " + p.ToString()); + canStockIVA = true; + } + } // If our current vessel still has the old PCR part, keep it active - if (aPart != null && vessel.parts.Contains (aPart)) { - - // If stock IVA is available then we can't have our model around, it might - // interfere with stock IVA clicks. - if (canStockIVA) { - ProbeControlRoomUtils.Logger.debug ("refreshVesselRooms() - Destroying existing PCR part due to stock IVA."); - canPCRIVA = false; - if (aPart.internalModel != null) { - aPart.internalModel.gameObject.DestroyGameObject (); - aPart.internalModel = null; - } - aPart = null; - } else { - canPCRIVA = true; - ProbeControlRoomUtils.Logger.debug ("refreshVesselRooms() - Old part still there, cleaning up extra rooms and returning"); - //Our old part is still there and active. Clean up extras as needed and return - for (int i = 0; i < vessel.parts.Count; i++) { - Part p = vessel.parts [i]; - if (p.GetComponent () != null && aPart != p && p.protoModuleCrew.Count == 0 && p.internalModel != null) { - ProbeControlRoomUtils.Logger.debug ("refreshRooms() Found and destroying old PCR in " + p.ToString ()); - p.internalModel.gameObject.DestroyGameObject (); - p.internalModel = null; - } - } - } - return; - } else { - aPart = null; - ProbeControlRoomUtils.Logger.debug ("refreshVesselRooms() - Old part no longer in vessel."); - } - - //Do not create PCR when stock IVA available. - if (canStockIVA) { - canPCRIVA = false; - return; - } + if (aPart != null && vessel.parts.Contains(aPart)) + { + + // If stock IVA is available then we can't have our model around, it might + // interfere with stock IVA clicks. + if (canStockIVA) + { + ProbeControlRoomUtils.Logger.debug("refreshVesselRooms() - Destroying existing PCR part due to stock IVA."); + canPCRIVA = false; + if (aPart.internalModel != null) + { + aPart.internalModel.gameObject.DestroyGameObject(); + aPart.internalModel = null; + } + aPart = null; + } + else + { + canPCRIVA = true; + ProbeControlRoomUtils.Logger.debug("refreshVesselRooms() - Old part still there, cleaning up extra rooms and returning"); + //Our old part is still there and active. Clean up extras as needed and return + for (int i = 0; i < vessel.parts.Count; i++) + { + Part p = vessel.parts[i]; + if (p.GetComponent() != null && aPart != p && p.protoModuleCrew.Count == 0 && p.internalModel != null) + { + ProbeControlRoomUtils.Logger.debug("refreshRooms() Found and destroying old PCR in " + p.ToString()); + p.internalModel.gameObject.DestroyGameObject(); + p.internalModel = null; + } + } + } + return; + } + else + { + aPart = null; + ProbeControlRoomUtils.Logger.debug("refreshVesselRooms() - Old part no longer in vessel."); + } + + //Do not create PCR when stock IVA available. + if (canStockIVA) + { + ProbeControlRoomUtils.Logger.debug("refreshVesselRooms() - stock IVA available in vessel."); + + canPCRIVA = false; + return; + } //No current active PCR found, time to create a new one canPCRIVA = false; @@ -962,13 +989,13 @@ private void refreshVesselRooms() //Select primary part for use and verify it's initialized - ProbeControlRoomUtils.Logger.message("refreshVesselRooms() - Initializing room in " + rooms[0].ToString()); + ProbeControlRoomUtils.Logger.message("refreshVesselRooms() - Initializing room in " + rooms[0].ToString()); aPart = rooms[0]; - cachedrenderers = null; + cachedrenderers = null; aPart.internalModel.Initialize(aPart); aPart.internalModel.SetVisible(false); - ProbeControlRoomUtils.Logger.message ("refreshVesselRooms() - C"); + ProbeControlRoomUtils.Logger.message("refreshVesselRooms() - C"); //Remove Excess internal models if (rooms.Count > 1) @@ -984,11 +1011,11 @@ private void refreshVesselRooms() rooms.Clear(); rooms = null; } - else if(pcrNoModel.Count > 0) + else if (pcrNoModel.Count > 0) { // No parts with an available internal model were found, attempting to create one aPart = pcrNoModel[0]; - cachedrenderers = null; + cachedrenderers = null; aPart.CreateInternalModel(); ProbeControlRoomUtils.Logger.debug("refreshVesselRooms() - No active room with a model found, creating now in " + aPart.ToString()); if (aPart.internalModel == null) @@ -1002,12 +1029,12 @@ private void refreshVesselRooms() canPCRIVA = true; } - if (pcrNoModel != null) - pcrNoModel.Clear (); + if (pcrNoModel != null) + pcrNoModel.Clear(); pcrNoModel = null; // Set app launcher availability based on current layout. - if(AppLauncher) + if (AppLauncher) { if (canPCRIVA) { diff --git a/ProbeControlRoom/ProbeControlRoom.csproj b/ProbeControlRoom/ProbeControlRoom.csproj index e755c71..3c239b9 100644 --- a/ProbeControlRoom/ProbeControlRoom.csproj +++ b/ProbeControlRoom/ProbeControlRoom.csproj @@ -77,18 +77,31 @@ - -start /D D:\Users\jbb\github\KSP-ProbeControlRoom/WAIT deploy.bat $(TargetDir) $(TargetFileName) + set KSPDIR=$(KSPDIR) + +IF "%25KSPDIR%25"=="" ( + + ECHO Configuration error - KSPDIR not specified in project. + + ECHO Either set KSPDIR environment variable or edit BetterLoadSaveGame.Common.props + + PAUSE + + GOTO DONE + +) + +start /D $(SolutionDir) /WAIT deploy.bat $(TargetDir) $(TargetFileName) $(TargetName) + +if $(ConfigurationName) == Release ( + + start /D $(SolutionDir) /WAIT buildRelease.bat $(TargetDir) $(TargetFileName) $(TargetName) -if $(ConfigurationName) == Release ( -start /D D:\Users\jbb\github\KSP-ProbeControlRoom/WAIT buildRelease.bat $(TargetDir) $(TargetFileName) ) - -set textTemplatingPath="%25ProgramFiles(x86)%25\Microsoft Visual Studio\2017\Community\Common7\IDE \texttransform.exe" - -%25textTemplatingPath%25 "$(ProjectDir)AssemblyVersion.tt" + "$(DevEnvDir)\texttransform.exe" "$(ProjectDir)AssemblyVersion.tt" + \ No newline at end of file diff --git a/ProbeControlRoomToolbar.sln b/ProbeControlRoomToolbar.sln index 9ca562f..b641370 100644 --- a/ProbeControlRoomToolbar.sln +++ b/ProbeControlRoomToolbar.sln @@ -1,7 +1,9 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProbeControlRoomToolbar", "ProbeControlRoomToolbar\ProbeControlRoomToolbar.csproj", "{6BB6BF04-C58F-47EE-A4BB-3CADA7850606}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31129.286 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProbeControlRoomToolbar", "ProbeControlRoomToolbar\ProbeControlRoomToolbar.csproj", "{F85B9451-74D5-4C48-8647-76A779ADD3FF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -9,10 +11,16 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6BB6BF04-C58F-47EE-A4BB-3CADA7850606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BB6BF04-C58F-47EE-A4BB-3CADA7850606}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BB6BF04-C58F-47EE-A4BB-3CADA7850606}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BB6BF04-C58F-47EE-A4BB-3CADA7850606}.Release|Any CPU.Build.0 = Release|Any CPU + {F85B9451-74D5-4C48-8647-76A779ADD3FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F85B9451-74D5-4C48-8647-76A779ADD3FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F85B9451-74D5-4C48-8647-76A779ADD3FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F85B9451-74D5-4C48-8647-76A779ADD3FF}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {33059E02-801F-40F8-AFBB-7EA04A0FF030} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = ProbeControlRoomToolbar\ProbeControlRoomToolbar.csproj diff --git a/buildRelease.bat b/buildRelease.bat index 00f33bb..ccbaf5f 100644 --- a/buildRelease.bat +++ b/buildRelease.bat @@ -38,7 +38,6 @@ rem Copy files to GameData locations copy /Y "%1%2" "%GAMEDATA%\%GAMEDIR%\Plugins" copy /Y %VERSIONFILE% %GAMEDATA%\%GAMEDIR% -copy /Y ..\MiniAVC.dll %GAMEDATA%\%GAMEDIR% if "%LICENSE%" NEQ "" copy /y %LICENSE% %GAMEDATA%\%GAMEDIR% if "%README%" NEQ "" copy /Y %README% %GAMEDATA%\%GAMEDIR% diff --git a/deploy.bat b/deploy.bat index e1c6b1a..a20297b 100644 --- a/deploy.bat +++ b/deploy.bat @@ -3,11 +3,15 @@ set H=%KSPDIR% set GAMEDIR=ProbeControlRoom +set GAMEDATA="GameData" +set VERSIONFILE=%GAMEDIR%.version -echo %H% +set DP0=r:\dp0\kspdev -copy /Y "%1%2" "GameData\%GAMEDIR%\Plugins" -rem copy /Y %GAMEDIR%.version GameData\%GAMEDIR% +copy /Y "%1%2" "%GAMEDATA%\%GAMEDIR%\Plugins" +copy /Y "%1%3".pdb "%GAMEDATA%\%GAMEDIR%\Plugins" -mkdir "%H%\GameData\%GAMEDIR%" -xcopy /E /y GameData\%GAMEDIR% "%H%\GameData\%GAMEDIR%" +copy /Y %VERSIONFILE% %GAMEDATA%\%GAMEDIR% + +xcopy /y /s /I %GAMEDATA%\%GAMEDIR% "%H%\GameData\%GAMEDIR%" +xcopy /y /s /I %GAMEDATA%\%GAMEDIR% "%DP0%\GameData\%GAMEDIR%"