Skip to content

Commit e1d04d9

Browse files
authored
Merge pull request #43 from iwatake2222/feature-#42-update_document
Feature #42 update document
2 parents 3423135 + 22bbd05 commit e1d04d9

File tree

3 files changed

+49
-17
lines changed

3 files changed

+49
-17
lines changed

NOTICE.md

+35
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
## EuclideanSpace - Mathematics and Computing
2+
- http://www.euclideanspace.com/maths/geometry/rotations/conversions
3+
- Some conversion formulas are retrieved from EuclideanSpace
4+
5+
## three.js
6+
- https://github.com/mrdoob/three.js
7+
- Copyright © 2010-2022 three.js authors
8+
- Licensed under the MIT License
9+
- Modification: Yes (Port some portion of the original JavaScript code to C++ code)
10+
- Some conversion calculations are retrieved from three.js
11+
12+
```
13+
The MIT License
14+
15+
Copyright © 2010-2022 three.js authors
16+
17+
Permission is hereby granted, free of charge, to any person obtaining a copy
18+
of this software and associated documentation files (the "Software"), to deal
19+
in the Software without restriction, including without limitation the rights
20+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
21+
copies of the Software, and to permit persons to whom the Software is
22+
furnished to do so, subject to the following conditions:
23+
24+
The above copyright notice and this permission notice shall be included in
25+
all copies or substantial portions of the Software.
26+
27+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
28+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
29+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
30+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
31+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
32+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
33+
THE SOFTWARE.
34+
```
35+
136
## Dear ImGui
237
- https://github.com/ocornut/imgui
338
- Copyright (c) 2014-2022 Omar Cornut

README.md

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
# +++++++++++++++++++++
2-
# Under development
3-
# +++++++++++++++++++++
4-
5-
![image](https://user-images.githubusercontent.com/11009876/148526709-ecfff1a4-e0e4-4cc5-ab08-d74964e935f2.png)
6-
1+
![image](https://user-images.githubusercontent.com/11009876/148989308-2d9c70b0-d25e-4124-b109-2fcb03c8ebb9.png)
72

83
# Rotation Master
9-
- Provide conversion between the following representations of 3D rotation and display the pose
4+
- Provide conversion between the following representations of 3D rotation (rigid body orientation) and display the pose
105
- Rotation Matrix
116
- Rotation Vector
127
- Axis-angle
138
- Quaternion
14-
- Euler Angle (Intrinsic(Mobile))
15-
- Euler Angle (Extrinsic(Fixed))
9+
- Euler Angle (Intrinsic; Mobile)
10+
- Euler Angle (Extrinsic; Fixed)
11+
12+
https://user-images.githubusercontent.com/11009876/148988739-5f775a11-c923-4557-aff7-12b9a4811d36.mp4
1613

1714
## CI Status
1815
Status | Build Type

desktop/ui.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ void Ui::Update(Window& window, AngleUnit& angle_unit, InputContainer& input_con
147147
}
148148
ImGui::Separator();
149149

150-
ImGui::RadioButton("Intrinsic (Mobile) Euler Angle", &input_container.selected_representation_type, static_cast<int32_t>(REPRESENTATION_TYPE::EULER_MOBILE));
151-
if (ImGui::BeginTable("Intrinsic (Mobile) Euler Angle", 4)) {
150+
ImGui::RadioButton("Euler Angle (Intrinsic; Mobile)", &input_container.selected_representation_type, static_cast<int32_t>(REPRESENTATION_TYPE::EULER_MOBILE));
151+
if (ImGui::BeginTable("Euler Angle (Intrinsic; Mobile)", 4)) {
152152
bool is_value_changed = false;
153153
float val[3] = { angle_unit.Display(input_container.mobile_euler_angle[0]), angle_unit.Display(input_container.mobile_euler_angle[1]), angle_unit.Display(input_container.mobile_euler_angle[2]) };
154154
ImGui::TableNextRow();
@@ -164,8 +164,8 @@ void Ui::Update(Window& window, AngleUnit& angle_unit, InputContainer& input_con
164164
}
165165
ImGui::Separator();
166166

167-
ImGui::RadioButton("Extrinsic (Fixed) Euler Angle", &input_container.selected_representation_type, static_cast<int32_t>(REPRESENTATION_TYPE::EULER_FIXED));
168-
if (ImGui::BeginTable("Extrinsic (Fixed) Euler Angle", 4)) {
167+
ImGui::RadioButton("Euler Angle (Extrinsic; Fixed)", &input_container.selected_representation_type, static_cast<int32_t>(REPRESENTATION_TYPE::EULER_FIXED));
168+
if (ImGui::BeginTable("Euler Angle (Extrinsic; Fixed)", 4)) {
169169
bool is_value_changed = false;
170170
float val[3] = { angle_unit.Display(input_container.fixed_euler_angle[0]), angle_unit.Display(input_container.fixed_euler_angle[1]), angle_unit.Display(input_container.fixed_euler_angle[2]) };
171171
ImGui::TableNextRow();
@@ -230,8 +230,8 @@ void Ui::Update(Window& window, AngleUnit& angle_unit, InputContainer& input_con
230230
}
231231
ImGui::Separator();
232232

233-
ImGui::Text("Intrinsic (Mobile) Euler Angle");
234-
if (ImGui::BeginTable("Intrinsic (Mobile) Euler Angle", 4)) {
233+
ImGui::Text("Euler Angle (Intrinsic; Mobile)");
234+
if (ImGui::BeginTable("Euler Angle (Intrinsic; Mobile)", 4)) {
235235
for (int32_t i = 0; i < static_cast<int32_t>(sizeof(EULER_ORDER_STR) / sizeof(char*)); i++) {
236236
ImGui::TableNextRow();
237237
ImGui::TableSetColumnIndex(0); ImGui::Text("%s", EULER_ORDER_STR[i]);
@@ -244,8 +244,8 @@ void Ui::Update(Window& window, AngleUnit& angle_unit, InputContainer& input_con
244244
}
245245
ImGui::Separator();
246246

247-
ImGui::Text("Extrinsic (Fixed) Euler Angle");
248-
if (ImGui::BeginTable("Extrinsic (Fixed) Euler Angle", 4)) {
247+
ImGui::Text("Euler Angle (Extrinsic; Fixed)");
248+
if (ImGui::BeginTable("Euler Angle (Extrinsic; Fixed)", 4)) {
249249
for (int32_t i = 0; i < static_cast<int32_t>(sizeof(EULER_ORDER_STR) / sizeof(char*)); i++) {
250250
ImGui::TableNextRow();
251251
ImGui::TableSetColumnIndex(0); ImGui::Text("%s", EULER_ORDER_STR[i]);

0 commit comments

Comments
 (0)