Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
ygopro-2pick
Commits
97f2c43b
Commit
97f2c43b
authored
Aug 08, 2017
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test revert
parent
fa5234f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
7 deletions
+27
-7
gframe/CGUITTFont.cpp
gframe/CGUITTFont.cpp
+23
-2
gframe/client_field.h
gframe/client_field.h
+0
-1
gframe/materials.cpp
gframe/materials.cpp
+4
-4
No files found.
gframe/CGUITTFont.cpp
View file @
97f2c43b
...
...
@@ -812,8 +812,29 @@ void CGUITTFont::setInvisibleCharacters(const core::ustring& s) {
}
video
::
IImage
*
CGUITTFont
::
createTextureFromChar
(
const
uchar32_t
&
ch
)
{
return
0
;
u32
n
=
getGlyphIndexByChar
(
ch
);
const
SGUITTGlyph
&
glyph
=
Glyphs
[
n
-
1
];
CGUITTGlyphPage
*
page
=
Glyph_Pages
[
glyph
.
glyph_page
];
if
(
page
->
dirty
)
page
->
updateTexture
();
video
::
ITexture
*
tex
=
page
->
texture
;
// Acquire a read-only lock of the corresponding page texture.
void
*
ptr
=
tex
->
lock
(
video
::
ETLM_READ_ONLY
);
video
::
ECOLOR_FORMAT
format
=
tex
->
getColorFormat
();
core
::
dimension2du
tex_size
=
tex
->
getOriginalSize
();
video
::
IImage
*
pageholder
=
Driver
->
createImageFromData
(
format
,
tex_size
,
ptr
,
true
,
false
);
// Copy the image data out of the page texture.
core
::
dimension2du
glyph_size
(
glyph
.
source_rect
.
getSize
());
video
::
IImage
*
image
=
Driver
->
createImage
(
format
,
glyph_size
);
pageholder
->
copyTo
(
image
,
core
::
position2di
(
0
,
0
),
glyph
.
source_rect
);
tex
->
unlock
();
return
image
;
}
video
::
ITexture
*
CGUITTFont
::
getPageTextureByIndex
(
const
u32
&
page_index
)
const
{
...
...
gframe/client_field.h
View file @
97f2c43b
...
...
@@ -2,7 +2,6 @@
#define CLIENT_FIELD_H
#include "config.h"
/*
#include <vector>
#include <set>
...
...
gframe/materials.cpp
View file @
97f2c43b
...
...
@@ -250,7 +250,7 @@ Materials::Materials() {
mCard
.
DiffuseColor
=
0xff000000
;
mCard
.
ColorMaterial
=
irr
::
video
::
ECM_NONE
;
mCard
.
MaterialType
=
irr
::
video
::
EMT_ONETEXTURE_BLEND
;
//
mCard.MaterialTypeParam = pack_textureBlendFunc(EBF_SRC_ALPHA, EBF_ONE_MINUS_SRC_ALPHA, EMFN_MODULATE_1X, EAS_VERTEX_COLOR);
mCard
.
MaterialTypeParam
=
pack_textureBlendFunc
(
EBF_SRC_ALPHA
,
EBF_ONE_MINUS_SRC_ALPHA
,
EMFN_MODULATE_1X
,
EAS_VERTEX_COLOR
);
mTexture
.
AmbientColor
=
0xffffffff
;
mTexture
.
DiffuseColor
=
0xff000000
;
mTexture
.
ColorMaterial
=
irr
::
video
::
ECM_NONE
;
...
...
@@ -260,13 +260,13 @@ Materials::Materials() {
mBackLine
.
DiffuseColor
=
0xc0000000
;
mBackLine
.
AntiAliasing
=
EAAM_FULL_BASIC
;
mBackLine
.
MaterialType
=
irr
::
video
::
EMT_ONETEXTURE_BLEND
;
//
mBackLine.MaterialTypeParam = pack_textureBlendFunc(EBF_SRC_ALPHA, EBF_ONE_MINUS_SRC_ALPHA, EMFN_MODULATE_1X, EAS_VERTEX_COLOR);
mBackLine
.
MaterialTypeParam
=
pack_textureBlendFunc
(
EBF_SRC_ALPHA
,
EBF_ONE_MINUS_SRC_ALPHA
,
EMFN_MODULATE_1X
,
EAS_VERTEX_COLOR
);
mBackLine
.
Thickness
=
2
;
mSelField
.
ColorMaterial
=
irr
::
video
::
ECM_NONE
;
mSelField
.
AmbientColor
=
0xffffffff
;
mSelField
.
DiffuseColor
=
0xff000000
;
mSelField
.
MaterialType
=
irr
::
video
::
EMT_ONETEXTURE_BLEND
;
//
mSelField.MaterialTypeParam = pack_textureBlendFunc(EBF_SRC_ALPHA, EBF_ONE_MINUS_SRC_ALPHA, EMFN_MODULATE_1X, EAS_VERTEX_COLOR);
mSelField
.
MaterialTypeParam
=
pack_textureBlendFunc
(
EBF_SRC_ALPHA
,
EBF_ONE_MINUS_SRC_ALPHA
,
EMFN_MODULATE_1X
,
EAS_VERTEX_COLOR
);
mOutLine
.
ColorMaterial
=
irr
::
video
::
ECM_AMBIENT
;
mOutLine
.
DiffuseColor
=
0xff000000
;
mOutLine
.
Thickness
=
2
;
...
...
@@ -276,7 +276,7 @@ Materials::Materials() {
mATK
.
DiffuseColor
=
0x80000000
;
mATK
.
setFlag
(
EMF_BACK_FACE_CULLING
,
FALSE
);
mATK
.
MaterialType
=
irr
::
video
::
EMT_ONETEXTURE_BLEND
;
//
mATK.MaterialTypeParam = pack_textureBlendFunc(EBF_SRC_ALPHA, EBF_ONE_MINUS_SRC_ALPHA, EMFN_MODULATE_1X, EAS_VERTEX_COLOR);
mATK
.
MaterialTypeParam
=
pack_textureBlendFunc
(
EBF_SRC_ALPHA
,
EBF_ONE_MINUS_SRC_ALPHA
,
EMFN_MODULATE_1X
,
EAS_VERTEX_COLOR
);
}
void
Materials
::
GenArrow
(
float
y
)
{
float
ay
=
1.0
f
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment