Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Simox
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
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Florian Leander Singer
Simox
Commits
bd8e04b2
Commit
bd8e04b2
authored
5 years ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Fix arg names
parent
381c8482
No related branches found
Branches containing commit
Tags
v2.3.35
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SimoxUtility/color/Color.h
+8
-8
8 additions, 8 deletions
SimoxUtility/color/Color.h
with
8 additions
and
8 deletions
SimoxUtility/color/Color.h
+
8
−
8
View file @
bd8e04b2
...
...
@@ -142,9 +142,9 @@ namespace simox::color
}
/// Red + Blue
static
inline
Color
magenta
(
int
p
=
255
,
int
a
=
255
)
static
inline
Color
magenta
(
int
m
=
255
,
int
a
=
255
)
{
return
Color
(
p
,
0
,
p
,
a
);
return
Color
(
m
,
0
,
m
,
a
);
}
...
...
@@ -157,9 +157,9 @@ namespace simox::color
}
/// 2 Red + 1 Blue
static
inline
Color
pink
(
int
o
=
255
,
int
a
=
255
)
static
inline
Color
pink
(
int
p
=
255
,
int
a
=
255
)
{
return
Color
(
o
,
o
/
2
,
0
,
a
);
return
Color
(
p
,
p
/
2
,
0
,
a
);
}
/// 2 Green + 1 Red
...
...
@@ -175,15 +175,15 @@ namespace simox::color
}
/// 2 Blue + 1 Green
static
inline
Color
azure
(
int
c
=
255
,
int
a
=
255
)
static
inline
Color
azure
(
int
az
=
255
,
int
a
=
255
)
{
return
Color
(
0
,
c
/
2
,
c
,
a
);
return
Color
(
0
,
az
/
2
,
az
,
a
);
}
/// 2 Blue + 1 Red
static
inline
Color
purple
(
int
c
=
255
,
int
a
=
255
)
static
inline
Color
purple
(
int
p
=
255
,
int
a
=
255
)
{
return
Color
(
0
,
c
/
2
,
c
,
a
);
return
Color
(
0
,
p
/
2
,
p
,
a
);
}
};
...
...
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