diff --git a/MessageBasic/MessageBasic.vcxproj b/MessageBasic/MessageBasic.vcxproj index 0d47bfe..1e52966 100644 --- a/MessageBasic/MessageBasic.vcxproj +++ b/MessageBasic/MessageBasic.vcxproj @@ -60,7 +60,7 @@ - $(SolutionDir)SimsBasic;$(IncludePath) + $(SolutionDir)SimsBasic;$(SolutionDir)StandardGlobe;$(IncludePath) diff --git a/MessageBasic/messagebasic.h b/MessageBasic/messagebasic.h index 983b7c0..05bb00a 100644 --- a/MessageBasic/messagebasic.h +++ b/MessageBasic/messagebasic.h @@ -2,6 +2,7 @@ #include "messagebasic_global.h" #include "simsbasic.h" +#include "standardglobe.h" #define NAME(v) #v #define DOUBLE_SAVE(u) obj[NAME(u)] = u @@ -92,14 +93,6 @@ public: uint64_t sourceEntity() const override; }; -/// -/// WGS84×ø±êϵ×ø±êÀàÐÍ -/// -struct LLAPos { - double _lon_deg = 0; - double _lat_deg = 0; - double _alt_m = 0; -}; /// /// ×Ë̬Êý¾Ý½á¹¹¶¨Òå /// diff --git a/SimsWorld.sln b/SimsWorld.sln index 124b16c..f71c738 100644 --- a/SimsWorld.sln +++ b/SimsWorld.sln @@ -15,9 +15,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComponentBasic", "Component EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MessageBasic", "MessageBasic\MessageBasic.vcxproj", "{E1104048-F35B-40B7-995C-0320E689BF09}" ProjectSection(ProjectDependencies) = postProject + {C4A07990-233A-46F5-A3A0-48544CABA594} = {C4A07990-233A-46F5-A3A0-48544CABA594} {DF15B899-B9AE-4EBE-8FCC-436C9DB6CEF0} = {DF15B899-B9AE-4EBE-8FCC-436C9DB6CEF0} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StandardGlobe", "StandardGlobe\StandardGlobe.vcxproj", "{C4A07990-233A-46F5-A3A0-48544CABA594}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -40,6 +43,10 @@ Global {E1104048-F35B-40B7-995C-0320E689BF09}.Debug|x64.Build.0 = Debug|x64 {E1104048-F35B-40B7-995C-0320E689BF09}.Release|x64.ActiveCfg = Release|x64 {E1104048-F35B-40B7-995C-0320E689BF09}.Release|x64.Build.0 = Release|x64 + {C4A07990-233A-46F5-A3A0-48544CABA594}.Debug|x64.ActiveCfg = Debug|x64 + {C4A07990-233A-46F5-A3A0-48544CABA594}.Debug|x64.Build.0 = Debug|x64 + {C4A07990-233A-46F5-A3A0-48544CABA594}.Release|x64.ActiveCfg = Release|x64 + {C4A07990-233A-46F5-A3A0-48544CABA594}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/StandardGlobe/StandardGlobe.vcxproj b/StandardGlobe/StandardGlobe.vcxproj new file mode 100644 index 0000000..11a6985 --- /dev/null +++ b/StandardGlobe/StandardGlobe.vcxproj @@ -0,0 +1,107 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {C4A07990-233A-46F5-A3A0-48544CABA594} + QtVS_v304 + 10.0 + 10.0 + $(MSBuildProjectDirectory)\QtMsBuild + + + + DynamicLibrary + v143 + true + Unicode + + + DynamicLibrary + v143 + false + true + Unicode + + + + + + + 5.12.11_msvc2017_64 + core + debug + + + 5.12.11_msvc2017_64 + core + release + + + + + + + + + + + + + + + + + + + + + + true + STANDARDGLOBE_LIB;%(PreprocessorDefinitions) + Level3 + true + true + + + Windows + true + + + + + true + STANDARDGLOBE_LIB;%(PreprocessorDefinitions) + Level3 + true + true + true + true + + + Windows + false + true + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/StandardGlobe/StandardGlobe.vcxproj.filters b/StandardGlobe/StandardGlobe.vcxproj.filters new file mode 100644 index 0000000..567f2d4 --- /dev/null +++ b/StandardGlobe/StandardGlobe.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + qml;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + qrc;rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {99349809-55BA-4b9d-BF79-8FDBB0286EB3} + ui + + + {639EADAA-A684-42e4-A9AD-28FC9BCB8F7C} + ts + + + + + Header Files + + + Source Files + + + Header Files + + + \ No newline at end of file diff --git a/StandardGlobe/StandardGlobe.vcxproj.user b/StandardGlobe/StandardGlobe.vcxproj.user new file mode 100644 index 0000000..41a709a --- /dev/null +++ b/StandardGlobe/StandardGlobe.vcxproj.user @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/StandardGlobe/standardglobe.cpp b/StandardGlobe/standardglobe.cpp new file mode 100644 index 0000000..0c2a982 --- /dev/null +++ b/StandardGlobe/standardglobe.cpp @@ -0,0 +1,5 @@ +#include "standardglobe.h" + +StandardGlobe::StandardGlobe() +{ +} diff --git a/StandardGlobe/standardglobe.h b/StandardGlobe/standardglobe.h new file mode 100644 index 0000000..b367ada --- /dev/null +++ b/StandardGlobe/standardglobe.h @@ -0,0 +1,22 @@ +#pragma once + +#include "standardglobe_global.h" + + +/// +/// WGS84×ø±êϵ×ø±êÀàÐÍ +/// +struct LLAPos { + double _lon_deg = 0; + double _lat_deg = 0; + double _alt_m = 0; +}; + +/// +/// ±ê×¼ÇòÌå×ø±êת»»¹¤¾ß +/// +class STANDARDGLOBE_EXPORT StandardGlobe +{ +public: + StandardGlobe(); +}; diff --git a/StandardGlobe/standardglobe_global.h b/StandardGlobe/standardglobe_global.h new file mode 100644 index 0000000..c53f162 --- /dev/null +++ b/StandardGlobe/standardglobe_global.h @@ -0,0 +1,13 @@ +#pragma once + +#include + +#ifndef BUILD_STATIC +# if defined(STANDARDGLOBE_LIB) +# define STANDARDGLOBE_EXPORT Q_DECL_EXPORT +# else +# define STANDARDGLOBE_EXPORT Q_DECL_IMPORT +# endif +#else +# define STANDARDGLOBE_EXPORT +#endif