mickey/ISXMr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Spiked on pulling data from the controller, and pushing data into the controller

Browse Source
This commit is contained in:
Malcolm Roberts 2023-12-22 15:53:05 -06:00
parent 2ba27dd921
commit d9d1b5d3c8
29 changed files with 1288 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@ cmake-*/
# Ignore generated headers
scripts/*.h
lgui2/*.h
# Ignore common C++ and CMake build artifacts
*.o

82
CMakeLists.txt
View File

@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.27)
project(ISXMr VERSION 1.0.0)
cmake_minimum_required(VERSION 3.5)
project(ISXMr VERSION 1.0.0 LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 14)
#set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Set the project source directory
set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
@ -10,36 +10,55 @@ set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
# Set the project include directory
include_directories(${SOURCE_DIR})
file(GLOB_RECURSE SCRIPT_FILES "scripts/*")
file(GLOB_RECURSE SCRIPT_FILES "scripts/*.iss")
file(GLOB_RECURSE LGUI2_FILES "lgui2/*.json")
foreach(FILE ${SCRIPT_FILES})
get_filename_component(FILE_NAME ${FILE} NAME)
string(REGEX REPLACE "[^a-zA-Z0-9]" "_" FILE_IDENTIFIER ${FILE_NAME})
set(HEADER_FILE "${CMAKE_CURRENT_SOURCE_DIR}/scripts/${FILE_NAME}.h")
add_custom_command(
OUTPUT ${HEADER_FILE}
COMMENT "Generating ${HEADER_FILE} from ${FILE}"
COMMAND xxd -i -n ${FILE_IDENTIFIER} ${FILE} ${HEADER_FILE}
COMMENT "Generating ${HEADER_FILE} from ${FILE_PATH}"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${FILE}
)
list(APPEND GENERATED_HEADERS ${HEADER_FILE})
endforeach()
foreach(FILE ${LGUI2_FILES})
get_filename_component(FILE_NAME ${FILE} NAME)
string(REGEX REPLACE "[^a-zA-Z0-9]" "_" FILE_IDENTIFIER ${FILE_NAME})
set(HEADER_FILE "${CMAKE_CURRENT_SOURCE_DIR}/lgui2/${FILE_NAME}.h")
file(TIMESTAMP "${FILE}" MODIFICATION_TIME "%Y-%m-%d %H:%M:%S")
add_custom_command(
OUTPUT ${HEADER_FILE}
COMMENT "Generating ${HEADER_FILE} from ${FILE}"
COMMAND ${CMAKE_COMMAND} -E remove ${HEADER_FILE}
COMMAND xxd -i -n ${FILE_IDENTIFIER} ${FILE} ${HEADER_FILE}
COMMAND ${CMAKE_COMMAND} -D IDENTIFIER:string="${FILE_IDENTIFIER}" -D HEADER_FILE:string="${HEADER_FILE}" -D MODIFICATION_TIME:string="${MODIFICATION_TIME}" -P ${CMAKE_CURRENT_SOURCE_DIR}/append_timestamp.cmake
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${FILE}
)
list(APPEND GENERATED_HEADERS ${HEADER_FILE})
endforeach()
add_custom_target(GenerateHeaders ALL DEPENDS ${GENERATED_HEADERS})
add_library(ISXMr SHARED ${SOURCE_DIR}/ISXMr.cpp
${SOURCE_DIR}/Commands.cpp
${SOURCE_DIR}/DataTypes.cpp
${SOURCE_DIR}/LGUIMrFrame.cpp
${SOURCE_DIR}/Services.cpp
${SOURCE_DIR}/TopLevelObjects.cpp
${SOURCE_DIR}/Commands.h
${SOURCE_DIR}/DataTypeList.h
${SOURCE_DIR}/DataTypes.h
${SOURCE_DIR}/ISXMr.h
${SOURCE_DIR}/ISXMrServices.h
${SOURCE_DIR}/LGUIMrFrame.h
${SOURCE_DIR}/Services.h
${SOURCE_DIR}/TopLevelObjects.h
src/isxeq2/Character.cpp
@ -47,7 +66,27 @@ add_library(ISXMr SHARED ${SOURCE_DIR}/ISXMr.cpp
src/isxeq2/Actor.cpp
src/isxeq2/Actor.h
src/isxeq2/LSObject.cpp
src/isxeq2/LSObject.h)
src/isxeq2/LSObject.h
src/WriteUIFileToDisk.cpp)
IF(WIN32)
cmake_host_system_information(
RESULT InnerspacePath
QUERY WINDOWS_REGISTRY
"HKLM/SOFTWARE/WOW6432Node/Microsoft/Windows/CurrentVersion/App Paths/InnerSpace.exe"
VALUE
"PATH"
)
if (InnerspacePath)
# Normalize the path (optional, but recommended)
file(TO_CMAKE_PATH "${InnerspacePath}" NormalizedInnerspacePath)
add_custom_command(TARGET ISXMr POST_BUILD
COMMENT "Copying isxmr.dll to ${NormalizedInnerspacePath}"
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:ISXMr> "${NormalizedInnerspacePath}/ISXMr.dll"
)
endif()
endif()
# Set the path to additional libraries
set(LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/)
@ -65,6 +104,7 @@ endif()
# Set include directories for isxdk
include_directories(${LIBS_DIR}/isxdk/include)
include_directories(${LIBS_DIR}/argh)
# Link ISXMr with isxdk library
target_link_libraries(ISXMr PRIVATE ${ISUI_LIBRARY} ${ISXDK_LIBRARY})
@ -75,3 +115,23 @@ set_target_properties(ISXMr PROPERTIES
)
set_property(TARGET ISXMr PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
IF(WIN32)
cmake_host_system_information(
RESULT InnerspacePath
QUERY WINDOWS_REGISTRY
"HKLM/SOFTWARE/WOW6432Node/Microsoft/Windows/CurrentVersion/App Paths/InnerSpace.exe"
VALUE
"PATH"
)
if (InnerspacePath)
message(STATUS "Copying isxmr.dll to ${InnerspacePath}")
# Normalize the path (optional, but recommended)
file(TO_CMAKE_PATH "${InnerspacePath}/x64/Extensions/ISXDK35" NormalizedInnerspacePath)
add_custom_command(TARGET ISXMr POST_BUILD
COMMENT "Copying isxmr.dll to ${NormalizedInnerspacePath}"
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:ISXMr> "${NormalizedInnerspacePath}/ISXMr.dll"
)
endif()
endif()

304
LICENSE Normal file
View File

@ -0,0 +1,304 @@
GNU LESSER 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.
This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU General Public License.
"The Library" refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the "Linked Version".
The "Minimal Corresponding Source" for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:
a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:
a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions of the GNU Lesser 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 Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright © 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
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.
ISXMr
Copyright (C) 2023 mickey
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/>.
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:
ISXMr Copyright (C) 2023 mickey
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/philosophy/why-not-lgpl.html>.

3
README.md Normal file
View File

@ -0,0 +1,3 @@
# ISXMr
Playing with ISXEq2 from c++

10
append_timestamp.cmake Normal file
View File

@ -0,0 +1,10 @@
# append_timestamp.cmake
cmake_minimum_required(VERSION 3.5)
# Check for the presence of the two expected arguments
if(NOT HEADER_FILE OR NOT MODIFICATION_TIME OR NOT IDENTIFIER)
message(FATAL_ERROR "Usage: cmake -D HEADER_FILE:string=\"filename.h\" -D IDENTIFIER:string=\"variable_prefix\" -D MODIFICATION_TIME:string=\"2021-01-01 01:01:01\" -P append_timestamp.cmake <header_file> <modification_time>")
endif()
# Append the timestamp to the header file
file(APPEND ${HEADER_FILE} "const char* ${IDENTIFIER}_last_modified=\"${MODIFICATION_TIME}\";\n")

84
lgui2/test.json Normal file
View File

@ -0,0 +1,84 @@
{
"$schema": "http://www.lavishsoft.com/schema/lgui2Package.json",
"skin": {
"name": "MRSkin",
"brushes": {
"window.titleBar.backgroundBrush": {
"color": "#211C18"
}
},
"templates": {
"window.title": {
"verticalAlignment": "center",
"margin": [2, 0, 0, 0]
},
"button": {
"jsonTemplate": "default:button",
"margin": [2, 2, 2, 2],
"color": "#f4f3ee"
},
"checkbox": {
"jsonTemplate": "default:checkbox",
"margin": [2, 2, 2, 2]
},
"window": {
"jsonTemplate": "default:window",
"backgroundBrush": {
"color": "#463f3a"
},
"color": "#f4f3ee",
"font": {
"face": "Segoe UI",
"height": 16
}
},
"listbox.contentContainerFitWidth": {
"jsonTemplate": "listbox.contentContainer",
"horizontalScroll": "fit"
}
}
},
"elements": [
{
"type": "window",
"skin": "MRSkin",
"title": "MR Bot",
"name": "mr.bot.miniwindow",
"borderThickness": 2,
"hideOnClose": false,
"minSize": {
"width": 100,
"height": 50
},
"maxSize": {
"width": 150,
"height": 125
},
"eventHandlers": {
"onCloseButtonClick": ["method", "MRBotController", "OnClose"]
},
"content": {
"type": "stackpanel",
"uniform": true,
"heightFactor": 1,
"children": [
{
"type": "button",
"content": "Get Target",
"horizontalAlignment": "stretch",
"eventHandlers": {
"onRelease": ["method", "MRBotController", "GetTarget"]
}
},
{
"type": "textblock",
"horizontalAlignment": "stretch",
"textBinding": {
"pullFormat": "${MRBotController.target}"
}
}
]
}
}
]
}

439
libs/argh/argh.h Normal file
View File

@ -0,0 +1,439 @@
#pragma once
#include <algorithm>
#include <sstream>
#include <limits>
#include <string>
#include <vector>
#include <set>
#include <map>
#include <cassert>
namespace argh
{
// Terminology:
// A command line is composed of 2 types of args:
// 1. Positional args, i.e. free standing values
// 2. Options: args beginning with '-'. We identify two kinds:
// 2.1: Flags: boolean options => (exist ? true : false)
// 2.2: Parameters: a name followed by a non-option value
#if !defined(__GNUC__) || (__GNUC__ >= 5)
using string_stream = std::istringstream;
#else
// Until GCC 5, istringstream did not have a move constructor.
// stringstream_proxy is used instead, as a workaround.
class stringstream_proxy
{
public:
stringstream_proxy() = default;
// Construct with a value.
stringstream_proxy(std::string const& value) :
stream_(value)
{}
// Copy constructor.
stringstream_proxy(const stringstream_proxy& other) :
stream_(other.stream_.str())
{
stream_.setstate(other.stream_.rdstate());
}
void setstate(std::ios_base::iostate state) { stream_.setstate(state); }
// Stream out the value of the parameter.
// If the conversion was not possible, the stream will enter the fail state,
// and operator bool will return false.
template<typename T>
stringstream_proxy& operator >> (T& thing)
{
stream_ >> thing;
return *this;
}
// Get the string value.
std::string str() const { return stream_.str(); }
std::stringbuf* rdbuf() const { return stream_.rdbuf(); }
// Check the state of the stream.
// False when the most recent stream operation failed
explicit operator bool() const { return !!stream_; }
~stringstream_proxy() = default;
private:
std::istringstream stream_;
};
using string_stream = stringstream_proxy;
#endif
class parser
{
public:
enum Mode { PREFER_FLAG_FOR_UNREG_OPTION = 1 << 0,
PREFER_PARAM_FOR_UNREG_OPTION = 1 << 1,
NO_SPLIT_ON_EQUALSIGN = 1 << 2,
SINGLE_DASH_IS_MULTIFLAG = 1 << 3,
};
parser() = default;
parser(std::initializer_list<char const* const> pre_reg_names)
{ add_params(pre_reg_names); }
parser(const char* const argv[], int mode = PREFER_FLAG_FOR_UNREG_OPTION)
{ parse(argv, mode); }
parser(int argc, const char* const argv[], int mode = PREFER_FLAG_FOR_UNREG_OPTION)
{ parse(argc, argv, mode); }
void add_param(std::string const& name);
void add_params(std::initializer_list<char const* const> init_list);
void parse(const char* const argv[], int mode = PREFER_FLAG_FOR_UNREG_OPTION);
void parse(int argc, const char* const argv[], int mode = PREFER_FLAG_FOR_UNREG_OPTION);
std::multiset<std::string> const& flags() const { return flags_; }
std::map<std::string, std::string> const& params() const { return params_; }
std::vector<std::string> const& pos_args() const { return pos_args_; }
// begin() and end() for using range-for over positional args.
std::vector<std::string>::const_iterator begin() const { return pos_args_.cbegin(); }
std::vector<std::string>::const_iterator end() const { return pos_args_.cend(); }
size_t size() const { return pos_args_.size(); }
//////////////////////////////////////////////////////////////////////////
// Accessors
// flag (boolean) accessors: return true if the flag appeared, otherwise false.
bool operator[](std::string const& name) const;
// multiple flag (boolean) accessors: return true if at least one of the flag appeared, otherwise false.
bool operator[](std::initializer_list<char const* const> init_list) const;
// returns positional arg string by order. Like argv[] but without the options
std::string const& operator[](size_t ind) const;
// returns a std::istream that can be used to convert a positional arg to a typed value.
string_stream operator()(size_t ind) const;
// same as above, but with a default value in case the arg is missing (index out of range).
template<typename T>
string_stream operator()(size_t ind, T&& def_val) const;
// parameter accessors, give a name get an std::istream that can be used to convert to a typed value.
// call .str() on result to get as string
string_stream operator()(std::string const& name) const;
// accessor for a parameter with multiple names, give a list of names, get an std::istream that can be used to convert to a typed value.
// call .str() on result to get as string
// returns the first value in the list to be found.
string_stream operator()(std::initializer_list<char const* const> init_list) const;
// same as above, but with a default value in case the param was missing.
// Non-string def_val types must have an operator<<() (output stream operator)
// If T only has an input stream operator, pass the string version of the type as in "3" instead of 3.
template<typename T>
string_stream operator()(std::string const& name, T&& def_val) const;
// same as above but for a list of names. returns the first value to be found.
template<typename T>
string_stream operator()(std::initializer_list<char const* const> init_list, T&& def_val) const;
private:
string_stream bad_stream() const;
std::string trim_leading_dashes(std::string const& name) const;
bool is_number(std::string const& arg) const;
bool is_option(std::string const& arg) const;
bool got_flag(std::string const& name) const;
bool is_param(std::string const& name) const;
private:
std::vector<std::string> args_;
std::map<std::string, std::string> params_;
std::vector<std::string> pos_args_;
std::multiset<std::string> flags_;
std::set<std::string> registeredParams_;
std::string empty_;
};
//////////////////////////////////////////////////////////////////////////
inline void parser::parse(const char * const argv[], int mode)
{
int argc = 0;
for (auto argvp = argv; *argvp; ++argc, ++argvp);
parse(argc, argv, mode);
}
//////////////////////////////////////////////////////////////////////////
inline void parser::parse(int argc, const char* const argv[], int mode /*= PREFER_FLAG_FOR_UNREG_OPTION*/)
{
// clear out possible previous parsing remnants
flags_.clear();
params_.clear();
pos_args_.clear();
// convert to strings
args_.resize(static_cast<decltype(args_)::size_type>(argc));
std::transform(argv, argv + argc, args_.begin(), [](const char* const arg) { return arg; });
// parse line
for (auto i = 0u; i < args_.size(); ++i)
{
if (!is_option(args_[i]))
{
pos_args_.emplace_back(args_[i]);
continue;
}
auto name = trim_leading_dashes(args_[i]);
if (!(mode & NO_SPLIT_ON_EQUALSIGN))
{
auto equalPos = name.find('=');
if (equalPos != std::string::npos)
{
params_.insert({ name.substr(0, equalPos), name.substr(equalPos + 1) });
continue;
}
}
// if the option is unregistered and should be a multi-flag
if (1 == (args_[i].size() - name.size()) && // single dash
argh::parser::SINGLE_DASH_IS_MULTIFLAG & mode && // multi-flag mode
!is_param(name)) // unregistered
{
std::string keep_param;
if (!name.empty() && is_param(std::string(1ul, name.back()))) // last char is param
{
keep_param += name.back();
name.resize(name.size() - 1);
}
for (auto const& c : name)
{
flags_.emplace(std::string{ c });
}
if (!keep_param.empty())
{
name = keep_param;
}
else
{
continue; // do not consider other options for this arg
}
}
// any potential option will get as its value the next arg, unless that arg is an option too
// in that case it will be determined a flag.
if (i == args_.size() - 1 || is_option(args_[i + 1]))
{
flags_.emplace(name);
continue;
}
// if 'name' is a pre-registered option, then the next arg cannot be a free parameter to it is skipped
// otherwise we have 2 modes:
// PREFER_FLAG_FOR_UNREG_OPTION: a non-registered 'name' is determined a flag.
// The following value (the next arg) will be a free parameter.
//
// PREFER_PARAM_FOR_UNREG_OPTION: a non-registered 'name' is determined a parameter, the next arg
// will be the value of that option.
assert(!(mode & argh::parser::PREFER_FLAG_FOR_UNREG_OPTION)
|| !(mode & argh::parser::PREFER_PARAM_FOR_UNREG_OPTION));
bool preferParam = mode & argh::parser::PREFER_PARAM_FOR_UNREG_OPTION;
if (is_param(name) || preferParam)
{
params_.insert({ name, args_[i + 1] });
++i; // skip next value, it is not a free parameter
continue;
}
else
{
flags_.emplace(name);
}
}
}
//////////////////////////////////////////////////////////////////////////
inline string_stream parser::bad_stream() const
{
string_stream bad;
bad.setstate(std::ios_base::failbit);
return bad;
}
//////////////////////////////////////////////////////////////////////////
inline bool parser::is_number(std::string const& arg) const
{
// inefficient but simple way to determine if a string is a number (which can start with a '-')
std::istringstream istr(arg);
double number;
istr >> number;
return !(istr.fail() || istr.bad());
}
//////////////////////////////////////////////////////////////////////////
inline bool parser::is_option(std::string const& arg) const
{
assert(0 != arg.size());
if (is_number(arg))
return false;
return '-' == arg[0];
}
//////////////////////////////////////////////////////////////////////////
inline std::string parser::trim_leading_dashes(std::string const& name) const
{
auto pos = name.find_first_not_of('-');
return std::string::npos != pos ? name.substr(pos) : name;
}
//////////////////////////////////////////////////////////////////////////
inline bool argh::parser::got_flag(std::string const& name) const
{
return flags_.end() != flags_.find(trim_leading_dashes(name));
}
//////////////////////////////////////////////////////////////////////////
inline bool argh::parser::is_param(std::string const& name) const
{
return registeredParams_.count(name);
}
//////////////////////////////////////////////////////////////////////////
inline bool parser::operator[](std::string const& name) const
{
return got_flag(name);
}
//////////////////////////////////////////////////////////////////////////
inline bool parser::operator[](std::initializer_list<char const* const> init_list) const
{
return std::any_of(init_list.begin(), init_list.end(), [&](char const* const name) { return got_flag(name); });
}
//////////////////////////////////////////////////////////////////////////
inline std::string const& parser::operator[](size_t ind) const
{
if (ind < pos_args_.size())
return pos_args_[ind];
return empty_;
}
//////////////////////////////////////////////////////////////////////////
inline string_stream parser::operator()(std::string const& name) const
{
auto optIt = params_.find(trim_leading_dashes(name));
if (params_.end() != optIt)
return string_stream(optIt->second);
return bad_stream();
}
//////////////////////////////////////////////////////////////////////////
inline string_stream parser::operator()(std::initializer_list<char const* const> init_list) const
{
for (auto& name : init_list)
{
auto optIt = params_.find(trim_leading_dashes(name));
if (params_.end() != optIt)
return string_stream(optIt->second);
}
return bad_stream();
}
//////////////////////////////////////////////////////////////////////////
template<typename T>
string_stream parser::operator()(std::string const& name, T&& def_val) const
{
auto optIt = params_.find(trim_leading_dashes(name));
if (params_.end() != optIt)
return string_stream(optIt->second);
std::ostringstream ostr;
ostr.precision(std::numeric_limits<long double>::max_digits10);
ostr << def_val;
return string_stream(ostr.str()); // use default
}
//////////////////////////////////////////////////////////////////////////
// same as above but for a list of names. returns the first value to be found.
template<typename T>
string_stream parser::operator()(std::initializer_list<char const* const> init_list, T&& def_val) const
{
for (auto& name : init_list)
{
auto optIt = params_.find(trim_leading_dashes(name));
if (params_.end() != optIt)
return string_stream(optIt->second);
}
std::ostringstream ostr;
ostr.precision(std::numeric_limits<long double>::max_digits10);
ostr << def_val;
return string_stream(ostr.str()); // use default
}
//////////////////////////////////////////////////////////////////////////
inline string_stream parser::operator()(size_t ind) const
{
if (pos_args_.size() <= ind)
return bad_stream();
return string_stream(pos_args_[ind]);
}
//////////////////////////////////////////////////////////////////////////
template<typename T>
string_stream parser::operator()(size_t ind, T&& def_val) const
{
if (pos_args_.size() <= ind)
{
std::ostringstream ostr;
ostr.precision(std::numeric_limits<long double>::max_digits10);
ostr << def_val;
return string_stream(ostr.str());
}
return string_stream(pos_args_[ind]);
}
//////////////////////////////////////////////////////////////////////////
inline void parser::add_param(std::string const& name)
{
registeredParams_.insert(trim_leading_dashes(name));
}
//////////////////////////////////////////////////////////////////////////
inline void parser::add_params(std::initializer_list<char const* const> init_list)
{
for (auto& name : init_list)
registeredParams_.insert(trim_leading_dashes(name));
}
}

18
libs/isxdk/include/ISInterface.h
View File

@ -25,15 +25,15 @@ public:
virtual bool RemoveTopLevelObject(const char *Name)=0;
virtual bool AddLSTypeDefinition(class LSTypeDefinition &Type)=0;
virtual bool RemoveLSTypeDefinition(class LSTypeDefinition &Type)=0;
virtual LSTypeDefinition *FindLSTypeDefinition(const char *Name, char *subtypebuf=0, size_t subtypebuflen=0)=0;
virtual LSTypeDefinition *FindLSTypeDefinition(const char *Name, char *subtypebuf=nullptr, size_t subtypebuflen=0)=0;
virtual fLSCommand IsCommand(const char *Name)=0;
virtual bool IsAlias(const char *Name)=0;
virtual fLSTopLevelObject IsTopLevelObject(const char *Name)=0;
virtual bool IsLSTypeDefinition(const char *Name)=0;
virtual bool ResolveCommand(const char *Text, char *buf,size_t buflen)=0;
virtual void *GetTempBuffer(unsigned int Size, void *CopyFrom=0)=0;
virtual void *GetTempBuffer(unsigned int Size, void *CopyFrom=nullptr)=0;
virtual void AddTempObject(CTempObject *pObject)=0;
virtual bool RunScriptFromBuffer(const char *Name, const char *Buffer, size_t buflen, int argc=0, char *argv[]=0, const char *CWD=0)=0;
virtual bool RunScriptFromBuffer(const char *Name, const char *Buffer, size_t buflen, int argc=0, char *argv[]=nullptr, const char *CWD=nullptr)=0;
// pre-compiled scripts
@ -75,9 +75,9 @@ public:
virtual unsigned int AddGlobalAtom(const char *Buffer, size_t buflen)=0;
virtual bool RemoveAtom(unsigned int AtomID)=0;
virtual int ExecuteAtom(unsigned int AtomID,int argc=0, char *argv[]=0, PLSOBJECT pThisLSObject=0, PLSOBJECT pContext=0, char *ReturnBuffer=0, size_t buflen=0)=0;
virtual int ExecuteAtom(const char *Name,int argc=0, char *argv[]=0, PLSOBJECT pContext=0, char *ReturnBuffer=0, size_t buflen=0)=0;
virtual int ExecuteAtom(const char *ScriptName, const char *Name,int argc=0, char *argv[]=0, PLSOBJECT pContext=0, char *ReturnBuffer=0, size_t buflen=0)=0;
virtual int ExecuteAtom(unsigned int AtomID,int argc=0, char *argv[]=nullptr, PLSOBJECT pThisLSObject=nullptr, PLSOBJECT pContext=nullptr, char *ReturnBuffer=nullptr, size_t buflen=0)=0;
virtual int ExecuteAtom(const char *Name,int argc=0, char *argv[]=nullptr, PLSOBJECT pContext=nullptr, char *ReturnBuffer=nullptr, size_t buflen=0)=0;
virtual int ExecuteAtom(const char *ScriptName, const char *Name,int argc=0, char *argv[]=nullptr, PLSOBJECT pContext=nullptr, char *ReturnBuffer=nullptr, size_t buflen=0)=0;
virtual unsigned int ResolveAtom(const char *Name)=0;
// enumerations
@ -101,7 +101,7 @@ public:
// events
virtual unsigned int RegisterEvent(const char *Name)=0;
virtual void UnregisterEvent(unsigned int EventID)=0;
virtual bool ExecuteEvent(unsigned int EventID,int BeginInclusive=0, int EndExclusive=0, char *argv[]=0, PLSOBJECT pThisLSObject=0)=0;
virtual bool ExecuteEvent(unsigned int EventID,int BeginInclusive=0, int EndExclusive=0, char *argv[]=nullptr, PLSOBJECT pThisLSObject=nullptr)=0;
virtual bool AttachEventTarget(unsigned int EventID,unsigned int AtomID)=0;
virtual bool AttachEventTarget(unsigned int EventID,fLSEventTarget fCallback)=0;
virtual bool DetachEventTarget(unsigned int EventID,unsigned int AtomID)=0;
@ -130,7 +130,7 @@ class ISServiceMasterInterface
{
public:
// service master
virtual HISXSERVICE RegisterService(ISXInterface *pMaster, const char *Name, fISServiceRequest RequestCallback=0)=0;
virtual HISXSERVICE RegisterService(ISXInterface *pMaster, const char *Name, fISServiceRequest RequestCallback=nullptr)=0;
virtual bool ServiceBroadcast(ISXInterface *pMaster, HISXSERVICE hService, unsigned int MSG, void *lpData)=0;
virtual bool ServiceNotify(ISXInterface *pMaster, HISXSERVICE hService, ISXInterface *pTarget, unsigned int MSG, void *lpData)=0;
virtual bool ShutdownService(ISXInterface *pMaster, HISXSERVICE hService)=0;
@ -361,7 +361,7 @@ public:
virtual bool TryInitialize()=0;
virtual bool RegisterLibrary(const char *Name,fGetAPI)=0;
virtual bool UnregisterLibrary(const char *Name)=0;
virtual bool Execute(const char *Domain, const char *AssemblyName, int argc=0, const char *argv[]=0)=0;
virtual bool Execute(const char *Domain, const char *AssemblyName, int argc=0, const char *argv[]=nullptr)=0;
virtual bool UnloadDomain(const char *Name)=0;
virtual unsigned int EnumDomains(fDomainEnumCallback, void *pData)=0;

2
libs/isxdk/include/ISUI/LGUIListBox.h
View File

@ -30,7 +30,7 @@ public:
~ListBoxItem()
{
free(Text);
Text="Error";
Text=const_cast<char*>("Error");
}
unsigned int ID;

4
libs/isxdk/include/ISXDK.h
View File

@ -196,11 +196,11 @@ public:
{
nPoints--;
delete Points[nPoints];
Points[nPoints]=0;
Points[nPoints]=nullptr;
}
}
void AddPoint(POINT3F &pt, char *Name=0)
void AddPoint(POINT3F &pt, char *Name=nullptr)
{
NamedPoint *pPoint=new NamedPoint;
pPoint->pt=pt;

28
libs/isxdk/include/LavishScript/LSSTLTypes.h
View File

@ -21,7 +21,7 @@ public:
virtual ~LSIterator();
virtual void RegisterSym(LSSym*) {};
virtual void UnregisterSym(LSSym*) {pIteratable=0;};
virtual void UnregisterSym(LSSym*) {pIteratable=nullptr;};
virtual bool IsValid()=0;
@ -128,8 +128,8 @@ public:
LSQueue(LSTypeDefinition *p_pType, const char *p_SubType) : LSContainer("queue")
{
Count=0;
pHead=0;
pTail=0;
pHead=nullptr;
pTail=nullptr;
pType=p_pType;
SubType=strdup(p_SubType);
@ -148,7 +148,7 @@ public:
for (set<LSIterator*>::iterator i = Iterators.begin() ; i!=Iterators.end() ; i++)
{
LSQueueIterator *pIterator=(LSQueueIterator *)(*i);
pIterator->pNode=0;
pIterator->pNode=nullptr;
}
while(pHead)
@ -158,7 +158,7 @@ public:
delete pHead;
pHead=pNext;
}
pTail=0;
pTail=nullptr;
return true;
}
@ -174,7 +174,7 @@ public:
return false;
}
LSQueueNode *pNode=new LSQueueNode;
pNode->pNext=0;
pNode->pNext=nullptr;
pNode->Object.SetObjectData(Val);
pNode->Object.Type=pType;
if (pTail)
@ -200,7 +200,7 @@ public:
{
LSQueueIterator *pIterator=(LSQueueIterator *)(*i);
if (pIterator->pNode==pHead)
pIterator->pNode=0;
pIterator->pNode=nullptr;
}
LSQueueNode *pNext=pHead->pNext;
@ -208,7 +208,7 @@ public:
delete pHead;
pHead=pNext;
if (!pHead)
pTail=0;
pTail=nullptr;
Count--;
return true;
}
@ -279,7 +279,7 @@ public:
LSStack(LSTypeDefinition *p_pType, const char *p_SubType) : LSContainer("stack")
{
Count=0;
pTop=0;
pTop=nullptr;
pType=p_pType;
SubType=strdup(p_SubType);
@ -297,7 +297,7 @@ public:
for (set<LSIterator*>::iterator i = Iterators.begin() ; i!=Iterators.end() ; i++)
{
LSStackIterator *pIterator=(LSStackIterator *)(*i);
pIterator->pNode=0;
pIterator->pNode=nullptr;
}
@ -341,7 +341,7 @@ public:
{
LSStackIterator *pIterator=(LSStackIterator *)(*i);
if (pIterator->pNode==pTop)
pIterator->pNode=0;
pIterator->pNode=nullptr;
}
LSStackNode *pNext=pTop->pNext;
@ -472,7 +472,7 @@ public:
{
return Iterator->first.c_str();
}
return false;
return nullptr;
}
virtual const char * GetCurrentKey()
@ -482,7 +482,7 @@ public:
{
return Iterator->first.c_str();
}
return false;
return nullptr;
}
virtual const char *GetNextKey()
@ -493,7 +493,7 @@ public:
{
return Iterator->first.c_str();
}
return false;
return nullptr;
}
virtual bool GetItem(const char *Key, LSOBJECT &Dest)

38
scripts/bot.iss Normal file
View File

@ -0,0 +1,38 @@
objectdef BotController
{
variable string target = ""
method Initialize()
{
LGUI2:LoadPackageFile["${LavishScript.HomeDirectory}/scripts/mr/ui/test.json"]
}
method Shutdown()
{
LGUI2:UnloadPackageFile["${LavishScript.HomeDirectory}/scripts/mr/ui/test.json"]
}
method GetTarget()
{
echo "GetTarget"
Event[OnGetTarget]:Execute
}
method OnClose()
{
echo "OnClose"
Event[OnCloseButtonClicked]:Execute
Script:End
}
}
variable(global) BotController MRBotController
function main()
{
while 1
{
wait 5
}
}

1
scripts/controller.iss
View File

@ -1 +0,0 @@
test

5
src/Commands.cpp
View File

@ -1,6 +1,11 @@
#include <argh.h>
#include <ISXDK.h>
#include "ISXMr.h"
int CMD_Mr(int argc, char *argv[])
{
const argh::parser cmdl(argv);
pISInterface->Printf("Argc: %s", (cmdl[{"-v", "--verbose"}] ? "ON" : "OFF"));
return 0;
}

1
src/DataTypeList.h
View File

@ -8,7 +8,6 @@
// sample data type is the MrType class, and we're making a variable called pMrType.
// this type does not inherit from another type, so we use 0. If it did inherit from another single type,
// we would use the pointer to the definition of that type, such as pStringType
DATATYPE(MrType,pMrType,0);

91
src/DataTypes.cpp
View File

@ -1,91 +0,0 @@
#include "ISXMr.h"
#define DATATYPE(_class_,_variable_,_inherits_) class _class_ *_variable_=0
#include "DataTypeList.h"
#undef DATATYPE
// A LavishScript data type is much like a C++ class. It has data members and methods, and can use
// inheritance. A data type describes the view of a type of object; it is not the object itself.
// The sample data type does NOT allow variables to be created of its type. That is slightly more
// advanced, and unnecessary for most purposes. If you need help with that, please get in touch with
// Lax for an example.
bool MrType::ToText(LSOBJECTDATA ObjectData, char *buf, unsigned int buflen)
{
// The ToString function is used when a data sequence ends with an object of this type. Its job is
// to fill the Destination with the default value of this object. For example, the "int" type simply
// performs itoa (integer to ascii conversion).
// ObjectData is the object, or a pointer to the object. Validate the object here.
if (!ObjectData.Ptr)
return false;
strcpy_s(buf,buflen,"ISXMr");
return true;
}
bool MrType::GetMember(LSOBJECTDATA ObjectData, PLSTYPEMEMBER pMember, int argc, char *argv[], LSOBJECT &Object)
{
// The GetMember function is used when a data sequence accesses a member of an object of this type.
// Its job is to take the member name (such as RetrieveData), retrieve the requested data, and place
// it in Dest, to be used as the next object in the data sequence. argc and argv are used if the member
// access uses an index, such as RetrieveData[1] or RetrieveData[my coat,1,seventeen]. argc is the
// number of parameters (or dimensions) separated by commas, and does NOT include the name of the member.
// As a general rule, members should NOT make changes to the object, or perform actions -- that is what
// methods are for :)
// LSOBJECT, used for Dest, is ObjectData with a Type. Type should be set to a pointer to a data type,
// such as Dest.Type=pIntType for integers. Do not set the Type or return true if the data retrieval
// fails (there is no object). For example, if the requested data is a string, and the string does
// not exist, return false and do not set the type.
// ObjectData is the object, or a pointer to the object. Validate the object here.
if (!ObjectData.Ptr)
return false;
// Based on the member ID, retrieve the desired member
switch((MrTypeMembers)pMember->ID)
{
case RetrieveData:
// Handle the "RetrieveData" member
{
// use argc and argv if you need to process parameters
// return true if you set Dest to a new, valid object. otherwise, return false.
return false;
}
}
return false;
}
bool MrType::GetMethod(LSOBJECTDATA &ObjectData, PLSTYPEMETHOD pMethod, int argc, char *argv[])
{
// The GetMethod function is used when a data sequence access a method of an object of this type.
// Its job is to take the method name (such as PerformAction), and perform the requested action.
// Unlike members, methods do not result in a new object -- they may make changes to the original
// object, but always result in the same object (return true), or no object if the object was deleted
// (return false).
// ObjectData here is passed by reference, so that you may modify the value stored if necessary. 32-bit
// (or less) integer types, for example, use a value directly in the ObjectData, rather than a pointer
// to an object.
// ObjectData is the object, or a pointer to the object. Validate the object here.
if (!ObjectData.Ptr)
return false;
// Based on the method ID, execute the desired method
switch((MrTypeMethods)pMethod->ID)
{
case PerformAction:
// Handle the "PerformAction" member
{
// use argc and argv if you need to process parameters
// return true if the object is still valid. return false if not.
return true;
}
}
return false;
}

32
src/DataTypes.h
View File

@ -1,32 +0,0 @@
#pragma once
#include "DataTypeList.h"
// custom data type declarations
class MrType : public LSTypeDefinition
{
public:
// All data members (retrieving data) should be listed in this enumeration
enum MrTypeMembers
{
RetrieveData,
};
// All data methods (performing actions on or with the object) should be listed in this enumeration
enum MrTypeMethods
{
PerformAction,
};
MrType() : LSType("mr")
{
// Use the TypeMember macro to activate each member, or use AddMember
TypeMember(RetrieveData);
// Use the TypeMethod macro to activate each member, or use AddMethod
TypeMethod(PerformAction);
}
virtual bool GetMember(LSOBJECTDATA ObjectData, PLSTYPEMEMBER Member, int argc, char *argv[], LSOBJECT &Object);
virtual bool GetMethod(LSOBJECTDATA &ObjectData, PLSTYPEMETHOD pMethod, int argc, char *argv[]);
virtual bool ToText(LSOBJECTDATA ObjectData, char *buf, unsigned int buflen);
};

156
src/ISXMr.cpp
View File

@ -13,7 +13,14 @@
#include "ISXMr.h"
#include <filesystem>
#include <fstream>
#include <iostream>
#include <__msvc_filebuf.hpp>
#include "isxeq2/Character.h"
#include "../lgui2/test.json.h"
#include "../scripts/bot.iss.h"
#pragma comment(lib,"isxdk.lib")
// The mandatory pre-setup function. Our name is "ISXMr", and the class is ISXMr.
// This sets up a "ModulePath" variable which contains the path to this module in case we want it,
@ -74,8 +81,25 @@ bool ISXMr::Initialize(ISInterface *p_ISInterface)
* Most of the functionality in Initialize is completely optional and could be removed or
* changed if so desired. The defaults are simply a suggestion that can be easily followed.
*/
constexpr size_t innerspacePathBufferLength = 255;
char innerspacePathBuffer[innerspacePathBufferLength];
const std::filesystem::path innerspacePath = p_ISInterface->GetInnerSpacePath(innerspacePathBuffer, innerspacePathBufferLength);
std::filesystem::path fullPath = innerspacePath / R"(scripts\mr\ui\test.json)";
__try // exception handling. See __except below.
if(fullPath.has_parent_path() && !std::filesystem::exists(fullPath.parent_path())) {
std::filesystem::create_directories(fullPath.parent_path());
}
std::ofstream file(fullPath, std::ios::binary);
if(!file) {
std::cerr << "Error opening file for writing: " << fullPath << std::endl;
}
file.write(reinterpret_cast<const char*>(test_json), test_json_len);
file.close();
//__try // exception handling. See __except below.
{
// Keep a global copy of the ISInterface pointer, which is for calling Inner Space API
pISInterface=p_ISInterface;
@ -84,17 +108,17 @@ bool ISXMr::Initialize(ISInterface *p_ISInterface)
RegisterExtension();
// retrieve basic LavishScript data types for use in ISXMr data types
pStringType=pISInterface->FindLSType("string");
pIntType=pISInterface->FindLSType("int");
pUintType=pISInterface->FindLSType("uint");
pBoolType=pISInterface->FindLSType("bool");
pFloatType=pISInterface->FindLSType("float");
pTimeType=pISInterface->FindLSType("time");
pByteType=pISInterface->FindLSType("byte");
pIntPtrType=pISInterface->FindLSType("intptr");
pBoolPtrType=pISInterface->FindLSType("boolptr");
pFloatPtrType=pISInterface->FindLSType("floatptr");
pBytePtrType=pISInterface->FindLSType("byteptr");
pStringType=pISInterface->FindLSType(const_cast<char*>("string"));
pIntType=pISInterface->FindLSType(const_cast<char*>("int"));
pUintType=pISInterface->FindLSType(const_cast<char*>("uint"));
pBoolType=pISInterface->FindLSType(const_cast<char*>("bool"));
pFloatType=pISInterface->FindLSType(const_cast<char*>("float"));
pTimeType=pISInterface->FindLSType(const_cast<char*>("time"));
pByteType=pISInterface->FindLSType(const_cast<char*>("byte"));
pIntPtrType=pISInterface->FindLSType(const_cast<char*>("intptr"));
pBoolPtrType=pISInterface->FindLSType(const_cast<char*>("boolptr"));
pFloatPtrType=pISInterface->FindLSType(const_cast<char*>("floatptr"));
pBytePtrType=pISInterface->FindLSType(const_cast<char*>("byteptr"));
// Connect to commonly used Inner Space services
ConnectServices();
@ -102,8 +126,8 @@ bool ISXMr::Initialize(ISInterface *p_ISInterface)
// Register LavishScript extensions (commands, aliases, data types, objects)
RegisterCommands();
RegisterAliases();
RegisterDataTypes();
RegisterTopLevelObjects();
RegisterEvents();
// Register (create) our own services
RegisterServices();
@ -111,6 +135,7 @@ bool ISXMr::Initialize(ISInterface *p_ISInterface)
// Register any text triggers built into ISXMr
RegisterTriggers();
pISInterface->RunScriptFromBuffer("mrbot", reinterpret_cast<const char*>(bot_iss), bot_iss_len);
printf("ISXMr version %s Loaded",Mr_Version);
return true;
}
@ -118,7 +143,7 @@ bool ISXMr::Initialize(ISInterface *p_ISInterface)
// Exception handling sample. Exception handling should at LEAST be used in functions that
// are suspected of causing user crashes. This will help users report the crash and hopefully
// enable the extension developer to locate and fix the crash condition.
__except(EzCrashFilter(GetExceptionInformation(),"Crash in initialize routine"))
//__except(EzCrashFilter(GetExceptionInformation(),"Crash in initialize routine"))
{
TerminateProcess(GetCurrentProcess(),0);
return 0;
@ -155,9 +180,9 @@ void ISXMr::Shutdown()
// Remove LavishScript extensions (commands, aliases, data types, objects)
UnRegisterTopLevelObjects();
UnRegisterDataTypes();
UnRegisterAliases();
UnRegisterCommands();
UnRegisterEvents();
}
/*
@ -261,6 +286,45 @@ void ISXMr::RegisterTriggers()
// add any Triggers
}
unsigned int onGetTargetEventId = 0;
unsigned int onCloseButtonClickedEventId = 0;
void __cdecl OnGetTargetEvent(int argc, char *argv[], PLSOBJECT lsObj) {
const auto me = pISInterface->IsTopLevelObject("Me");
if(me != nullptr) {
LSOBJECT response;
me(0, nullptr, response);
auto characterObject = make_shared<LSObject>(LSObject(response));
Character c(characterObject);
Actor target = c.GetTarget();
string targetName(target.GetName());
printf("Target ID: %d", target.GetId());
printf("Target: %s", targetName.c_str());
LSOBJECT controller;
pISInterface->DataParse("MRBotController", controller);
//printf("Controller Type: %s", controller.Type->GetName());
LSOBJECT targetObj;
controller.Type->GetMemberEx(controller.GetObjectData(), const_cast<char*>("target"), 0, nullptr, targetObj);
//printf("Target Type: %s", targetObj.Type->GetName());
auto targetNameCstr = const_cast<char*>(targetName.c_str());
targetObj.Type->GetMethodEx(targetObj.GetObjectData(), const_cast<char*>("Set"), 1, &targetNameCstr);
}
printf("OnGetTargetEvent");
}
void __cdecl OnCloseButtonClicked(int argc, char *argv[], PLSOBJECT lsObj) {
printf("OnCloseButtonClicked");
}
void ISXMr::RegisterEvents() {
onGetTargetEventId = pISInterface->RegisterEvent("OnGetTarget");
pISInterface->AttachEventTarget(onGetTargetEventId, OnGetTargetEvent);
onCloseButtonClickedEventId = pISInterface->RegisterEvent("OnCloseButtonClicked");
pISInterface->AttachEventTarget(onCloseButtonClickedEventId, OnCloseButtonClicked);
}
void ISXMr::DisconnectServices()
{
// gracefully disconnect from services
@ -327,6 +391,14 @@ void ISXMr::UnRegisterServices()
#undef SERVICE
}
void ISXMr::UnRegisterEvents() {
pISInterface->DetachEventTarget(onGetTargetEventId, OnGetTargetEvent);
pISInterface->UnregisterEvent(onGetTargetEventId);
pISInterface->DetachEventTarget(onCloseButtonClickedEventId, OnCloseButtonClicked);
pISInterface->UnregisterEvent(onCloseButtonClickedEventId);
}
int frameCount = 0;
void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData)
@ -339,33 +411,33 @@ void __cdecl PulseService(bool Broadcast, unsigned int MSG, void *lpData)
* displayed by the game. This is the place to put any repeating
* tasks.
*/
if(frameCount++ > 80) {
frameCount = 0;
const auto me = pISInterface->IsTopLevelObject("Me");
if(me != nullptr) {
LSOBJECT response;
me(0, nullptr, response);
Character c(response);
printf("------------------------------------");
printf("ID: %u", c.GetId());
printf("Name: %s", c.GetName());
printf("Race: %s", c.GetRace());
printf("Archetype: %s", c.GetArchetype());
printf("Class: %s", c.GetClass());
printf("SubClass: %s", c.GetSubClass());
printf("TSArchetype: %s", c.GetTradeskillArchtype());
printf("TSClass: %s", c.GetTradeskillClass());
printf("TSSubClass: %s", c.GetTradeskillSubClass());
printf("Gender: %s", c.GetGender());
printf("------------------------------------");
}
// if(pISInterface->IsExtensionLoaded("ISXEq2")) {
// printf("Loaded");
// } else {
// printf("Not loaded");
// }
}
// if(frameCount++ > 80) {
// frameCount = 0;
// const auto me = pISInterface->IsTopLevelObject("Me");
// if(me != nullptr) {
// LSOBJECT response;
// me(0, nullptr, response);
// Character c(response);
// printf("------------------------------------");
// printf("ID: %u", c.GetId());
// printf("Name: %s", c.GetName());
// printf("Race: %s", c.GetRace());
// printf("Archetype: %s", c.GetArchetype());
// printf("Class: %s", c.GetClass());
// printf("SubClass: %s", c.GetSubClass());
// printf("TSArchetype: %s", c.GetTradeskillArchtype());
// printf("TSClass: %s", c.GetTradeskillClass());
// printf("TSSubClass: %s", c.GetTradeskillSubClass());
// printf("Gender: %s", c.GetGender());
// printf("------------------------------------");
// }
// // if(pISInterface->IsExtensionLoaded("ISXEq2")) {
// // printf("Loaded");
// // } else {
// // printf("Not loaded");
// // }
//
// }
}
}

4
src/ISXMr.h
View File

@ -23,6 +23,8 @@ public:
void RegisterServices();
void RegisterTriggers();
static void RegisterEvents();
void DisconnectServices();
void UnRegisterCommands();
void UnRegisterAliases();
@ -30,6 +32,7 @@ public:
void UnRegisterTopLevelObjects();
void UnRegisterServices();
static void UnRegisterEvents();
};
extern ISInterface *pISInterface;
@ -90,7 +93,6 @@ extern LSType *pBytePtrType;
extern char Mr_Version[];
#include "Commands.h"
#include "DataTypes.h"
#include "TopLevelObjects.h"
#include "Services.h"

50
src/LGUIMrFrame.cpp
View File

@ -1,50 +0,0 @@
#include "ISXMr.h"
#include "LGUIMrFrame.h"
LGUIFactory<LGUIMrFrame> MrFrameFactory("mrframe");
LGUIMrFrame::LGUIMrFrame(const char *p_Factory, LGUIElement *p_pParent, const char *p_Name):LGUIFrame(p_Factory,p_pParent,p_Name)
{
pText=0;
Count=0;
}
LGUIMrFrame::~LGUIMrFrame(void)
{
}
bool LGUIMrFrame::IsTypeOf(char *TestFactory)
{
return (!_stricmp(TestFactory,"mrframe")) || LGUIFrame::IsTypeOf(TestFactory);
}
bool LGUIMrFrame::FromXML(class XMLNode *pXML, class XMLNode *pTemplate)
{
if (!pTemplate)
pTemplate=g_UIManager.FindTemplate(XMLHelper::GetStringAttribute(pXML,"Template"));
if (!pTemplate)
pTemplate=g_UIManager.FindTemplate("mrframe");
if (!LGUIFrame::FromXML(pXML,pTemplate))
return false;
// custom xml properties
return true;
}
void LGUIMrFrame::OnCreate()
{
// All children of this element are guaranteed to have been created now.
pText = (LGUIText*)FindUsableChild("Output","text");
}
void LGUIMrFrame::Render()
{
Count++;
if (pText)
{
char Temp[256];
sprintf_s(Temp,"This frame has been rendered %d times.",Count);
pText->SetText(Temp);
}
LGUIFrame::Render();
}

19
src/LGUIMrFrame.h
View File

@ -1,19 +0,0 @@
#pragma once
class LGUIMrFrame :
public LGUIFrame
{
public:
LGUIMrFrame(const char *p_Factory, LGUIElement *p_pParent, const char *p_Name);
~LGUIMrFrame(void);
bool IsTypeOf(char *TestFactory);
bool FromXML(class XMLNode *pXML, class XMLNode *pTemplate=0);
void OnCreate();
void Render();
LGUIText *pText;
unsigned int Count;
};
extern LGUIFactory<LGUIMrFrame> MrFrameFactory;

2
src/TopLevelObjects.cpp
View File

@ -16,7 +16,5 @@ bool __cdecl TLO_Mr(int argc, char *argv[], LSTYPEVAR &Dest)
// fails (there is no object). For example, if the requested data is a string, and the string does
// not exist, return false and do not set the type.
Dest.DWord=1;
Dest.Type=pMrType;
return true;
}

37
src/WriteUIFileToDisk.cpp Normal file
View File

@ -0,0 +1,37 @@
#include <filesystem>
#include <fstream>
#include <iostream>
#include <chrono>
std::chrono::system_clock::time_point ParseEmbeddedTimestamp(const std::string& timestamp) {
std::tm tm = {};
std::istringstream ss(timestamp);
ss >> std::get_time(&tm, "%Y-%m-%d %H:%M:%S");
return std::chrono::system_clock::from_time_t(std::mktime(&tm));
}
void WriteUIFileToDiskIfChanged(
const std::string& filePath,
const unsigned char* data,
const size_t length,
const std::string& lastModified) {
auto embeddedTimestamp = ParseEmbeddedTimestamp(lastModified);
if (std::filesystem::exists(filePath)) {
const auto lastWriteTime = std::filesystem::last_write_time(filePath);
// Convert file_time_type to system_clock::time_point
const auto lastWriteTimeTp = std::chrono::time_point_cast<std::chrono::system_clock::duration>(
lastWriteTime - std::filesystem::file_time_type::clock::now() + std::chrono::system_clock::now()
);
if (lastWriteTimeTp < embeddedTimestamp) {
std::ofstream file(filePath, std::ios::binary);
file.write(reinterpret_cast<const char*>(data), length);
}
} else {
std::ofstream file(filePath, std::ios::binary);
file.write(reinterpret_cast<const char*>(data), length);
}
}

134
src/isxeq2/Actor.cpp
View File

@ -4,136 +4,136 @@
#include "Actor.h"
u_long Actor::GetId() {
return {static_cast<u_long>(this->GetMemberResponse("ID").Int64)};
u_long Actor::GetId() const {
return {static_cast<u_long>(this->lsObject->GetMember("ID").Int64)};
}
std::string Actor::GetName() {
return {this->GetMemberResponse("Name").CharPtr};
std::string Actor::GetName() const {
return {this->lsObject->GetMember("Name").CharPtr};
}
std::string Actor::GetLastName() {
return { this->GetMemberResponse("LastName").CharPtr };
std::string Actor::GetLastName() const {
return { this->lsObject->GetMember("LastName").CharPtr };
}
int Actor::GetHealthPercentage() {
return this->GetMemberResponse("Health").Int;
int Actor::GetHealthPercentage() const {
return this->lsObject->GetMember("Health").Int;
}
int Actor::GetPowerPercentage() {
return this->GetMemberResponse("Power").Int;
int Actor::GetPowerPercentage() const {
return this->lsObject->GetMember("Power").Int;
}
int Actor::GetLevel() {
return this->GetMemberResponse("Level").Int;
int Actor::GetLevel() const {
return this->lsObject->GetMember("Level").Int;
}
int Actor::GetEffectiveLevel() {
return this->GetMemberResponse("EffectiveLevel").Int;
int Actor::GetEffectiveLevel() const {
return this->lsObject->GetMember("EffectiveLevel").Int;
}
u_int Actor::GetTintFlags() {
return this->GetMemberResponse("TintFlags").Int;
u_int Actor::GetTintFlags() const {
return this->lsObject->GetMember("TintFlags").Int;
}
std::string Actor::GetVisualVariant() {
return { this->GetMemberResponse("VisualVariant").CharPtr };
std::string Actor::GetVisualVariant() const {
return { this->lsObject->GetMember("VisualVariant").CharPtr };
}
std::string Actor::GetMood() {
return { this->GetMemberResponse("Mood").CharPtr };
std::string Actor::GetMood() const {
return { this->lsObject->GetMember("Mood").CharPtr };
}
std::string Actor::GetCurrentAnimation() {
return { this->GetMemberResponse("CurrentAnimation").CharPtr };
std::string Actor::GetCurrentAnimation() const {
return { this->lsObject->GetMember("CurrentAnimation").CharPtr };
}
std::string Actor::GetOverlay() {
return { this->GetMemberResponse("Overlay").CharPtr };
std::string Actor::GetOverlay() const {
return { this->lsObject->GetMember("Overlay").CharPtr };
}
std::string Actor::GetAura() {
return { this->GetMemberResponse("Aura").CharPtr };
std::string Actor::GetAura() const {
return { this->lsObject->GetMember("Aura").CharPtr };
}
std::string Actor::GetGuild() {
return { this->GetMemberResponse("Guild").CharPtr };
std::string Actor::GetGuild() const {
return { this->lsObject->GetMember("Guild").CharPtr };
}
std::string Actor::GetType() {
return { this->GetMemberResponse("Type").CharPtr };
std::string Actor::GetType() const {
return { this->lsObject->GetMember("Type").CharPtr };
}
std::string Actor::GetSuffixTitle() {
return { this->GetMemberResponse("SuffixTitle").CharPtr };
std::string Actor::GetSuffixTitle() const {
return { this->lsObject->GetMember("SuffixTitle").CharPtr };
}
std::string Actor::GetConColor() {
return { this->GetMemberResponse("ConColor").CharPtr };
std::string Actor::GetConColor() const {
return { this->lsObject->GetMember("ConColor").CharPtr };
}
std::string Actor::GetRawConColor() {
std::string Actor::GetRawConColor() const {
// TODO: Modify to accept a parameter & pass in the string 'raw'
return { this->GetMemberResponse("RawConColor").CharPtr };
return { this->lsObject->GetMember("RawConColor").CharPtr };
}
std::string Actor::GetFactionStanding() {
return { this->GetMemberResponse("FactionStanding").CharPtr };
std::string Actor::GetFactionStanding() const {
return { this->lsObject->GetMember("FactionStanding").CharPtr };
}
int Actor::GetFaction() {
return this->GetMemberResponse("Faction").Int;
int Actor::GetFaction() const {
return this->lsObject->GetMember("Faction").Int;
}
Actor Actor::GetTarget() {
return Actor(this->GetMemberResponse("Target"));
Actor Actor::GetTarget() const {
return Actor(make_shared<LSObject>(LSObject(this->lsObject->GetMember("Target"))));
}
Actor Actor::GetPet() {
return Actor(this->GetMemberResponse("Pet"));
Actor Actor::GetPet() const {
return Actor(make_shared<LSObject>(LSObject(this->lsObject->GetMember("Pet"))));
}
int Actor::GetThreatToPet() {
return this->GetMemberResponse("ThreatToPet").Int;
int Actor::GetThreatToPet() const {
return this->lsObject->GetMember("ThreatToPet").Int;
}
int Actor::GetThreatToMe() {
return this->GetMemberResponse("GetThreatToMe").Int;
int Actor::GetThreatToMe() const {
return this->lsObject->GetMember("GetThreatToMe").Int;
}
int Actor::GetThreatToNext() {
return this->GetMemberResponse("GetThreatToNext").Int;
int Actor::GetThreatToNext() const {
return this->lsObject->GetMember("GetThreatToNext").Int;
}
float Actor::GetDistance() {
return this->GetMemberResponse("Distance").Float;
float Actor::GetDistance() const {
return this->lsObject->GetMember("Distance").Float;
}
float Actor::GetDistance2d() {
return this->GetMemberResponse("Distance2D").Float;
float Actor::GetDistance2d() const {
return this->lsObject->GetMember("Distance2D").Float;
}
float Actor::GetX() {
return this->GetMemberResponse("X").Float;
float Actor::GetX() const {
return this->lsObject->GetMember("X").Float;
}
float Actor::GetY() {
return this->GetMemberResponse("Y").Float;
float Actor::GetY() const {
return this->lsObject->GetMember("Y").Float;
}
float Actor::GetZ() {
return this->GetMemberResponse("Z").Float;
float Actor::GetZ() const {
return this->lsObject->GetMember("Z").Float;
}
std::string Actor::GetRace() {
return {this->GetMemberResponse("Race").CharPtr};
std::string Actor::GetRace() const {
return {this->lsObject->GetMember("Race").CharPtr};
}
std::string Actor::GetClass() {
return {this->GetMemberResponse("Class").CharPtr};
std::string Actor::GetClass() const {
return {this->lsObject->GetMember("Class").CharPtr};
}
std::string Actor::GetGender() {
return {this->GetMemberResponse("Gender").CharPtr};
}
std::string Actor::GetGender() const {
return {this->lsObject->GetMember("Gender").CharPtr};
}

82
src/isxeq2/Actor.h
View File

@ -1,63 +1,59 @@
//
// Created by marob on 12/20/2023.
//
#ifndef ACTOR_H
#define ACTOR_H
#include <ISXDK.h>
#include <memory>
#include "LSObject.h"
class Actor : public LSObject {
class Actor {
public:
explicit Actor(const LSOBJECT &obj) : LSObject(obj), lsObject(obj) {
explicit Actor(const shared_ptr<LSObject> &obj) : lsObject(obj) {
}
// General
u_long GetId();
std::string GetName();
std::string GetLastName();
int GetHealthPercentage();
int GetPowerPercentage();
int GetLevel();
int GetEffectiveLevel();
u_int GetTintFlags();
std::string GetVisualVariant();
std::string GetMood();
std::string GetCurrentAnimation();
std::string GetOverlay();
std::string GetAura();
std::string GetGender();
std::string GetRace();
std::string GetClass();
std::string GetGuild();
std::string GetType();
std::string GetSuffixTitle();
std::string GetConColor();
std::string GetRawConColor();
std::string GetFactionStanding();
int GetFaction();
Actor GetTarget();
Actor GetPet();
u_long GetId() const;
std::string GetName() const;
std::string GetLastName() const;
int GetHealthPercentage() const;
int GetPowerPercentage() const;
int GetLevel() const;
int GetEffectiveLevel() const;
u_int GetTintFlags() const;
std::string GetVisualVariant() const;
std::string GetMood() const;
std::string GetCurrentAnimation() const;
std::string GetOverlay() const;
std::string GetAura() const;
std::string GetGender() const;
std::string GetRace() const;
std::string GetClass() const;
std::string GetGuild() const;
std::string GetType() const;
std::string GetSuffixTitle() const;
std::string GetConColor() const;
std::string GetRawConColor() const;
std::string GetFactionStanding() const;
int GetFaction() const;
Actor GetTarget() const;
Actor GetPet() const;
// Threat
int GetThreatToPet();
int GetThreatToMe();
int GetThreatToNext();
int GetThreatToPet() const;
int GetThreatToMe() const;
int GetThreatToNext() const;
// Location
float GetDistance(); // Note: This is the distance using three dimensions, which is what the EQ2 client primarily uses for determining ability ranges, etc.
float GetDistance2d();
float GetX();
float GetY();
float GetZ();
float GetDistance() const; // Note: This is the distance using three dimensions, which is what the EQ2 client primarily uses for determining ability ranges, etc.
float GetDistance2d() const;
float GetX() const;
float GetY() const;
float GetZ() const;
protected:
const shared_ptr<LSObject> lsObject;
private:
LSOBJECT lsObject;
};

24
src/isxeq2/Character.cpp
View File

@ -1,35 +1,31 @@
//
// Created by marob on 12/20/2023.
//
#include "Character.h"
std::string Character::GetArchetype() {
const auto response = this->GetMemberResponse("Archetype");
std::string Character::GetArchetype() const {
const auto response = this->lsObject->GetMember("Archetype");
return {response.CharPtr};
}
std::string Character::GetSubClass() {
const auto response = this->GetMemberResponse("SubClass");
std::string Character::GetSubClass() const {
const auto response = this->lsObject->GetMember("SubClass");
return {response.CharPtr};
}
std::string Character::GetTradeskillArchtype() {
const auto response = this->GetMemberResponse("TSArchetype");
std::string Character::GetTradeskillArchtype() const {
const auto response = this->lsObject->GetMember("TSArchetype");
return {response.CharPtr};
}
std::string Character::GetTradeskillClass() {
const auto response = this->GetMemberResponse("TSClass");
std::string Character::GetTradeskillClass() const {
const auto response = this->lsObject->GetMember("TSClass");
return {response.CharPtr};
}
std::string Character::GetTradeskillSubClass() {
const auto response = this->GetMemberResponse("TSSubClass");
std::string Character::GetTradeskillSubClass() const {
const auto response = this->lsObject->GetMember("TSSubClass");
return {response.CharPtr};
}

22
src/isxeq2/Character.h
View File

@ -1,29 +1,19 @@
//
// Created by marob on 12/20/2023.
//
#ifndef CHARACTER_H
#define CHARACTER_H
#include <string>
#include <ISXDK.h>
#include "Actor.h"
class Character : public Actor {
public:
explicit Character(const LSOBJECT &obj) : Actor(obj), lsObject(obj) { }
std::string GetArchetype();
std::string GetSubClass();
std::string GetTradeskillArchtype();
std::string GetTradeskillClass();
std::string GetTradeskillSubClass();
private:
LSOBJECT lsObject;
explicit Character(const shared_ptr<LSObject> &obj) : Actor(obj) { }
std::string GetArchetype() const;
std::string GetSubClass() const;
std::string GetTradeskillArchtype() const;
std::string GetTradeskillClass() const;
std::string GetTradeskillSubClass() const;
};

14
src/isxeq2/LSObject.cpp
View File

@ -4,16 +4,8 @@
#include "LSObject.h"
LSOBJECT LSObject::GetMemberResponse(const std::string &memberName) {
LSOBJECT response;
#include <vector>
#include "ISXMr.h"
this->lsObject.Type->GetMemberEx(
this->lsObject.GetObjectData(),
const_cast<char*>(memberName.c_str()),
0,
nullptr,
response
);
return response;
}

30
src/isxeq2/LSObject.h
View File

@ -5,13 +5,39 @@
#ifndef LSOBJECT_H
#define LSOBJECT_H
#include <ISXDK.h>
#include <vector>
#include "ISXMr.h"
class LSObject {
public:
explicit LSObject (const LSOBJECT &obj) : lsObject(obj) {}
protected:
LSOBJECT GetMemberResponse(const std::string &memberName);
template <typename... Args>
LSOBJECT GetMember(const std::string &memberName, Args... args) {
LSOBJECT response;
const vector<std::string> arguments = {args...};
const int argc = arguments.size();
vector<char*> argv;
for(auto &arg : arguments) {
argv.push_back(const_cast<char*>(arg.c_str()));
}
this->lsObject.Type->GetMemberEx(
this->lsObject.GetObjectData(),
const_cast<char*>(memberName.c_str()),
argc,
argv.data(),
response
);
pISInterface->Printf("%s Type: %s", memberName.c_str(), response.Type->GetName());
return response;
}
private:
LSOBJECT lsObject;
};