Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
illuna-minetest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Illuna-Minetest
illuna-minetest
Commits
439079ca
Commit
439079ca
authored
11 years ago
by
BlockMen
Committed by
Kahrl
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add support for using textures in hotbar
parent
fead7a27
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/hud.cpp
+48
-22
48 additions, 22 deletions
src/hud.cpp
src/hud.h
+2
-0
2 additions, 0 deletions
src/hud.h
with
50 additions
and
22 deletions
src/hud.cpp
+
48
−
22
View file @
439079ca
...
...
@@ -64,6 +64,8 @@ Hud::Hud(video::IVideoDriver *driver, gui::IGUIEnvironment* guienv,
selectionbox_argb
=
video
::
SColor
(
255
,
sbox_r
,
sbox_g
,
sbox_b
);
use_crosshair_image
=
tsrc
->
isKnownSourceImage
(
"crosshair.png"
);
use_hotbar_bg_img
=
tsrc
->
isKnownSourceImage
(
"hotbar.png"
);
use_hotbar_border_img
=
tsrc
->
isKnownSourceImage
(
"hotbar_selected.png"
);
}
...
...
@@ -90,6 +92,18 @@ void Hud::drawItem(v2s32 upperleftpos, s32 imgsize, s32 itemcount,
driver->draw2DRectangle(bgcolor, barrect, NULL);*/
core
::
rect
<
s32
>
imgrect
(
0
,
0
,
imgsize
,
imgsize
);
const
video
::
SColor
hbar_color
(
255
,
255
,
255
,
255
);
const
video
::
SColor
hbar_colors
[]
=
{
hbar_color
,
hbar_color
,
hbar_color
,
hbar_color
};
if
(
use_hotbar_bg_img
)
{
core
::
rect
<
s32
>
imgrect2
(
-
padding
/
2
,
-
padding
/
2
,
width
+
padding
/
2
,
height
+
padding
/
2
);
core
::
rect
<
s32
>
rect2
=
imgrect2
+
pos
;
video
::
ITexture
*
texture
=
tsrc
->
getTexture
(
"hotbar.png"
);
core
::
dimension2di
imgsize
(
texture
->
getOriginalSize
());
driver
->
draw2DImage
(
texture
,
rect2
,
core
::
rect
<
s32
>
(
core
::
position2d
<
s32
>
(
0
,
0
),
imgsize
),
NULL
,
hbar_colors
,
true
);
}
for
(
s32
i
=
0
;
i
<
itemcount
;
i
++
)
{
...
...
@@ -112,62 +126,74 @@ void Hud::drawItem(v2s32 upperleftpos, s32 imgsize, s32 itemcount,
core
::
rect
<
s32
>
rect
=
imgrect
+
pos
+
steppos
;
if
(
selectitem
==
i
+
1
)
{
video
::
SColor
c_outside
(
255
,
255
,
0
,
0
);
//video::SColor c_outside(255,0,0,0);
//video::SColor c_inside(255,192,192,192);
s32
x1
=
rect
.
UpperLeftCorner
.
X
;
s32
y1
=
rect
.
UpperLeftCorner
.
Y
;
s32
x2
=
rect
.
LowerRightCorner
.
X
;
s32
y2
=
rect
.
LowerRightCorner
.
Y
;
// Black base borders
driver
->
draw2DRectangle
(
c_outside
,
if
(
selectitem
==
i
+
1
)
{
if
(
use_hotbar_border_img
)
{
core
::
rect
<
s32
>
imgrect2
(
-
padding
*
2
,
-
padding
*
2
,
height
,
height
);
rect
=
imgrect2
+
pos
+
steppos
;
video
::
ITexture
*
texture
=
tsrc
->
getTexture
(
"hotbar_selected.png"
);
core
::
dimension2di
imgsize
(
texture
->
getOriginalSize
());
driver
->
draw2DImage
(
texture
,
rect
,
core
::
rect
<
s32
>
(
core
::
position2d
<
s32
>
(
0
,
0
),
imgsize
),
NULL
,
hbar_colors
,
true
);
rect
=
imgrect
+
pos
+
steppos
;
}
else
{
rect
=
imgrect
+
pos
+
steppos
;
video
::
SColor
c_outside
(
255
,
255
,
0
,
0
);
//video::SColor c_outside(255,0,0,0);
//video::SColor c_inside(255,192,192,192);
s32
x1
=
rect
.
UpperLeftCorner
.
X
;
s32
y1
=
rect
.
UpperLeftCorner
.
Y
;
s32
x2
=
rect
.
LowerRightCorner
.
X
;
s32
y2
=
rect
.
LowerRightCorner
.
Y
;
// Black base borders
driver
->
draw2DRectangle
(
c_outside
,
core
::
rect
<
s32
>
(
v2s32
(
x1
-
padding
,
y1
-
padding
),
v2s32
(
x2
+
padding
,
y1
)
),
NULL
);
driver
->
draw2DRectangle
(
c_outside
,
driver
->
draw2DRectangle
(
c_outside
,
core
::
rect
<
s32
>
(
v2s32
(
x1
-
padding
,
y2
),
v2s32
(
x2
+
padding
,
y2
+
padding
)
),
NULL
);
driver
->
draw2DRectangle
(
c_outside
,
driver
->
draw2DRectangle
(
c_outside
,
core
::
rect
<
s32
>
(
v2s32
(
x1
-
padding
,
y1
),
v2s32
(
x1
,
y2
)
),
NULL
);
driver
->
draw2DRectangle
(
c_outside
,
driver
->
draw2DRectangle
(
c_outside
,
core
::
rect
<
s32
>
(
v2s32
(
x2
,
y1
),
v2s32
(
x2
+
padding
,
y2
)
),
NULL
);
/*// Light inside borders
driver->draw2DRectangle(c_inside,
/*// Light inside borders
driver->draw2DRectangle(c_inside,
core::rect<s32>(
v2s32(x1 - padding/2, y1 - padding/2),
v2s32(x2 + padding/2, y1)
), NULL);
driver->draw2DRectangle(c_inside,
driver->draw2DRectangle(c_inside,
core::rect<s32>(
v2s32(x1 - padding/2, y2),
v2s32(x2 + padding/2, y2 + padding/2)
), NULL);
driver->draw2DRectangle(c_inside,
driver->draw2DRectangle(c_inside,
core::rect<s32>(
v2s32(x1 - padding/2, y1),
v2s32(x1, y2)
), NULL);
driver->draw2DRectangle(c_inside,
driver->draw2DRectangle(c_inside,
core::rect<s32>(
v2s32(x2, y1),
v2s32(x2 + padding/2, y2)
), NULL);
*/
*/
}
}
video
::
SColor
bgcolor2
(
128
,
0
,
0
,
0
);
driver
->
draw2DRectangle
(
bgcolor2
,
rect
,
NULL
);
if
(
!
use_hotbar_bg_img
)
driver
->
draw2DRectangle
(
bgcolor2
,
rect
,
NULL
);
drawItemStack
(
driver
,
font
,
item
,
rect
,
NULL
,
gamedef
);
}
}
...
...
@@ -222,7 +248,7 @@ void Hud::drawLuaElements() {
break
;
}
default
:
infostream
<<
"Hud::drawLuaElements: ignoring drawform "
<<
e
->
type
<<
"of hud element ID "
<<
i
<<
" due to unrecognized type"
<<
std
::
endl
;
"
of hud element ID "
<<
i
<<
" due to unrecognized type"
<<
std
::
endl
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/hud.h
+
2
−
0
View file @
439079ca
...
...
@@ -106,6 +106,8 @@ class Hud {
video
::
SColor
crosshair_argb
;
video
::
SColor
selectionbox_argb
;
bool
use_crosshair_image
;
bool
use_hotbar_border_img
;
bool
use_hotbar_bg_img
;
Hud
(
video
::
IVideoDriver
*
driver
,
gui
::
IGUIEnvironment
*
guienv
,
gui
::
IGUIFont
*
font
,
u32
text_height
,
IGameDef
*
gamedef
,
...
...
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