Skip to content

Commit 6234b78

Browse files
authored
Merge pull request #1068 from CesiumGS/geospatial-guide-tag
Link to Geospatial Guide instead of including a glossary
2 parents 0f9ecc1 + 5e5c5e4 commit 6234b78

File tree

8 files changed

+40
-27
lines changed

8 files changed

+40
-27
lines changed

CesiumGeospatial/include/CesiumGeospatial/Ellipsoid.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ namespace CesiumGeospatial {
3333
* 1`. This is primarily used by Cesium to represent the shape of planetary
3434
* bodies. Rather than constructing this object directly, one of the provided
3535
* constants is normally used.
36+
*
37+
* @see \ref what-is-an-ellipsoid
3638
*/
3739
class CESIUMGEOSPATIAL_API Ellipsoid final {
3840
public:

CesiumGeospatial/include/CesiumGeospatial/GlobeAnchor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class LocalHorizontalCoordinateSystem;
1414
/**
1515
* @brief Anchors an object to the globe by defining a transformation from the
1616
* object's coordinate to the globe-fixed coordinate system (usually
17-
* \ref glossary-ecef).
17+
* \ref what-are-ecef-coordinates).
1818
*
1919
* This class allows the anchored coordinate system to be realized in any
2020
* {@link LocalHorizontalCoordinateSystem}. When the object is moved, either by

CesiumGeospatial/include/CesiumGeospatial/LocalHorizontalCoordinateSystem.h

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ class CESIUMGEOSPATIAL_API LocalHorizontalCoordinateSystem {
5555
const Ellipsoid& ellipsoid = CesiumGeospatial::Ellipsoid::WGS84);
5656

5757
/**
58-
* @brief Create a new coordinate system centered at a \ref glossary-ecef
59-
* "Earth-Centered, Earth-Fixed" position.
58+
* @brief Create a new coordinate system centered at a \ref
59+
* what-are-ecef-coordinates "Earth-Centered, Earth-Fixed" position.
6060
*
6161
* @param originEcef The origin of the coordinate system.
6262
* @param xAxisDirection The local direction in which the X axis points at the
@@ -80,8 +80,8 @@ class CESIUMGEOSPATIAL_API LocalHorizontalCoordinateSystem {
8080

8181
/**
8282
* @brief Create a new coordinate system with a specified transformation to
83-
* the \ref glossary-ecef "Earth-Centered, Earth-Fixed" frame. This is an
84-
* advanced constructor and should be avoided in most cases.
83+
* the \ref what-are-ecef-coordinates "Earth-Centered, Earth-Fixed" frame.
84+
* This is an advanced constructor and should be avoided in most cases.
8585
*
8686
* This constructor can be used to save/restore the state of an instance. It
8787
* can also be used to create unusual coordinate systems that can't be created
@@ -96,8 +96,8 @@ class CESIUMGEOSPATIAL_API LocalHorizontalCoordinateSystem {
9696
/**
9797
* @brief Create a new coordinate system with the specified transformations
9898
* between the local frame and the
99-
* \ref glossary-ecef "Earth-Centered, Earth-Fixed" frame. This is an advanced
100-
* constructor and should be avoided in most cases.
99+
* \ref what-are-ecef-coordinates "Earth-Centered, Earth-Fixed" frame. This is
100+
* an advanced constructor and should be avoided in most cases.
101101
*
102102
* This constructor can be used to save/restore the state of an instance. It
103103
* can also be used to create unusual coordinate systems that can't be created
@@ -117,7 +117,7 @@ class CESIUMGEOSPATIAL_API LocalHorizontalCoordinateSystem {
117117

118118
/**
119119
* @brief Gets the transformation matrix from the local horizontal coordinate
120-
* system managed by this instance to the \ref glossary-ecef.
120+
* system managed by this instance to the \ref what-are-ecef-coordinates.
121121
*
122122
* @return The transformation.
123123
*/
@@ -126,8 +126,8 @@ class CESIUMGEOSPATIAL_API LocalHorizontalCoordinateSystem {
126126
}
127127

128128
/**
129-
* @brief Gets the transformation matrix from \ref glossary-ecef to the
130-
* local horizontal coordinate system managed by this instance.
129+
* @brief Gets the transformation matrix from \ref what-are-ecef-coordinates
130+
* to the local horizontal coordinate system managed by this instance.
131131
*
132132
* @return The transformation.
133133
*/
@@ -138,7 +138,7 @@ class CESIUMGEOSPATIAL_API LocalHorizontalCoordinateSystem {
138138
/**
139139
* @brief Converts a position in the local horizontal coordinate system
140140
* managed by this instance to
141-
* \ref glossary-ecef "Earth-Centered, Earth-Fixed (ECEF)".
141+
* \ref what-are-ecef-coordinates "Earth-Centered, Earth-Fixed (ECEF)".
142142
*
143143
* @param localPosition The position in the local coordinate system.
144144
* @return The equivalent position in the ECEF coordinate system.
@@ -148,8 +148,9 @@ class CESIUMGEOSPATIAL_API LocalHorizontalCoordinateSystem {
148148

149149
/**
150150
* @brief Converts a position in the
151-
* \ref glossary-ecef "Earth-Centered, Earth-Fixed (ECEF)" coordinate system
152-
* to the local horizontal coordinate system managed by this instance.
151+
* \ref what-are-ecef-coordinates "Earth-Centered, Earth-Fixed (ECEF)"
152+
* coordinate system to the local horizontal coordinate system managed by this
153+
* instance.
153154
*
154155
* @param ecefPosition The position in the ECEF coordinate system.
155156
* @return The equivalent position in the local coordinate system.
@@ -159,7 +160,7 @@ class CESIUMGEOSPATIAL_API LocalHorizontalCoordinateSystem {
159160
/**
160161
* @brief Converts a direction in the local horizontal coordinate system
161162
* managed by this instance to
162-
* \ref glossary-ecef "Earth-Centered, Earth-Fixed (ECEF)".
163+
* \ref what-are-ecef-coordinates "Earth-Centered, Earth-Fixed (ECEF)".
163164
*
164165
* Because the vector is treated as a direction only, the translation portion
165166
* of the transformation is ignored.
@@ -172,8 +173,9 @@ class CESIUMGEOSPATIAL_API LocalHorizontalCoordinateSystem {
172173

173174
/**
174175
* @brief Converts a direction in the
175-
* \ref glossary-ecef "Earth-Centered, Earth-Fixed (ECEF)" coordinate system
176-
* to the local horizontal coordinate system managed by this instance.
176+
* \ref what-are-ecef-coordinates "Earth-Centered, Earth-Fixed (ECEF)"
177+
* coordinate system to the local horizontal coordinate system managed by this
178+
* instance.
177179
*
178180
* Because the vector is treated as a direction only, the translation portion
179181
* of the transformation is ignored.

CesiumGltfContent/include/CesiumGltfContent/SkirtMeshMetadata.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ struct SkirtMeshMetadata {
8989
*/
9090
uint32_t noSkirtVerticesCount;
9191
/**
92-
* @brief The center coordinates of the mesh, in \ref glossary-ecef.
92+
* @brief The center coordinates of the mesh, in \ref
93+
* what-are-ecef-coordinates.
9394
*/
9495
glm::dvec3 meshCenter;
9596
/**

doc/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ if(DOXYGEN_FOUND)
115115
set(DOXYGEN_VERBATIM_VARS DOXYGEN_ALIASES DOXYGEN_HTML_EXTRA_FILES)
116116
list(APPEND DOXYGEN_EXAMPLE_PATH "${CMAKE_CURRENT_LIST_DIR}/diagrams")
117117

118+
list(APPEND DOXYGEN_TAGFILES "${CMAKE_CURRENT_LIST_DIR}/community.tag=https://github.com/CesiumGS/community/blob/main")
119+
118120
cesium_glob_files(
119121
CESIUM_DOC_TOPICS
120122
${CMAKE_CURRENT_LIST_DIR}/topics/*.md

doc/community.tag

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
2+
<!--
3+
This is a handcrafted tag file for the CesiumGS/community repo.
4+
Pages and headings should be added to this file as needed.
5+
-->
6+
<tagfile doxygen_version="1.12.0" doxygen_gitid="c73f5d30f9e8b1df5ba15a1d064ff2067cbb8267">
7+
<compound kind="page">
8+
<name>geospatial-guide</name>
9+
<title>Geospatial Guide</title>
10+
<filename>GeospatialGuide/README.md</filename>
11+
<docanchor file="GeospatialGuide/README.md" title="Earth-Centered, Earth-Fixed Coordinates (ECEF)">what-are-ecef-coordinates</docanchor>
12+
<docanchor file="GeospatialGuide/README.md" title="What is an ellipsoid?">what-is-an-ellipsoid</docanchor>
13+
</compound>
14+
</tagfile>

doc/topics/developer.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
* \subpage developer-setup
66
* \subpage style-guide
77
* \subpage contributing
8+
* \subpage geospatial-guide
89

910
## Architecture of Cesium Native
1011

1112
* \subpage multithreading
1213
* \subpage selection-algorithm-details
13-
* \subpage rendering-3d-tiles
14+
* \subpage rendering-3d-tiles

doc/topics/glossary.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)