Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Game Library
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Game Development
Game Library
Commits
6a4e91ad
Commit
6a4e91ad
authored
2 years ago
by
Joseph Walton-Rivers
Browse files
Options
Downloads
Patches
Plain Diff
compile new math types
parent
5100104d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#3304
failed
2 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
fggl/CMakeLists.txt
+1
-0
1 addition, 0 deletions
fggl/CMakeLists.txt
include/fggl/math/shapes.hpp
+2
-0
2 additions, 0 deletions
include/fggl/math/shapes.hpp
with
3 additions
and
0 deletions
fggl/CMakeLists.txt
+
1
−
0
View file @
6a4e91ad
...
...
@@ -31,6 +31,7 @@ target_sources(${PROJECT_NAME}
gui/widgets.cpp
gui/containers.cpp
math/triangulation.cpp
math/shapes.cpp
)
# spdlog for cleaner logging
...
...
This diff is collapsed.
Click to expand it.
include/fggl/math/shapes.hpp
+
2
−
0
View file @
6a4e91ad
...
...
@@ -180,6 +180,7 @@ namespace fggl::math::phs3d {
// (c3 + c1 ) / c_2
// (c1 + c2 ) / c_2
// return BarycentricToCart(bary)
return
glm
::
zero
<
vec3
>
();
}
inline
float
circumradius
()
{
...
...
@@ -192,6 +193,7 @@ namespace fggl::math::phs3d {
// c = c1 + c2 + c3
// c_2 = 2 * c
// return sqrt( (d1+d2) * (d2+d3) * ( d3 + d1 ) / c ) / 2
return
0.0
F
;
}
bool
CartToBarycentric
(
const
math
::
vec3
&
cart
,
Barycentric
&
outVal
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment