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
37d3c3d3
Commit
37d3c3d3
authored
10 years ago
by
kwolekr
Browse files
Options
Downloads
Patches
Plain Diff
Fix misc. style issues
parent
01ce57ad
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/nodedef.cpp
+4
-2
4 additions, 2 deletions
src/nodedef.cpp
src/tile.h
+6
-4
6 additions, 4 deletions
src/tile.h
src/util/string.cpp
+4
-1
4 additions, 1 deletion
src/util/string.cpp
with
14 additions
and
7 deletions
src/nodedef.cpp
+
4
−
2
View file @
37d3c3d3
...
...
@@ -536,8 +536,8 @@ content_t CNodeDefManager::getId(const std::string &name) const
}
void
CNodeDefManager
::
getIds
(
const
std
::
string
&
name
,
std
::
set
<
content_t
>
&
result
)
const
void
CNodeDefManager
::
getIds
(
const
std
::
string
&
name
,
std
::
set
<
content_t
>
&
result
)
const
{
//TimeTaker t("getIds", NULL, PRECISION_MICRO);
if
(
name
.
substr
(
0
,
6
)
!=
"group:"
)
{
...
...
@@ -768,6 +768,8 @@ void CNodeDefManager::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
break
;
case
NDT_FIRELIKE
:
f
->
backface_culling
=
false
;
f
->
solidness
=
0
;
break
;
case
NDT_TORCHLIKE
:
case
NDT_SIGNLIKE
:
case
NDT_FENCELIKE
:
...
...
This diff is collapsed.
Click to expand it.
src/tile.h
+
6
−
4
View file @
37d3c3d3
...
...
@@ -229,7 +229,7 @@ struct TileSpec
// Sets everything else except the texture in the material
void
applyMaterialOptions
(
video
::
SMaterial
&
material
)
const
{
switch
(
material_type
){
switch
(
material_type
)
{
case
TILE_MATERIAL_BASIC
:
material
.
MaterialType
=
video
::
EMT_TRANSPARENT_ALPHA_CHANNEL_REF
;
break
;
...
...
@@ -247,14 +247,16 @@ struct TileSpec
break
;
case
TILE_MATERIAL_WAVING_PLANTS
:
material
.
MaterialType
=
video
::
EMT_TRANSPARENT_ALPHA_CHANNEL_REF
;
break
;
break
;
}
material
.
BackfaceCulling
=
(
material_flags
&
MATERIAL_FLAG_BACKFACE_CULLING
)
?
true
:
false
;
material
.
BackfaceCulling
=
(
material_flags
&
MATERIAL_FLAG_BACKFACE_CULLING
)
?
true
:
false
;
}
void
applyMaterialOptionsWithShaders
(
video
::
SMaterial
&
material
)
const
{
material
.
BackfaceCulling
=
(
material_flags
&
MATERIAL_FLAG_BACKFACE_CULLING
)
?
true
:
false
;
material
.
BackfaceCulling
=
(
material_flags
&
MATERIAL_FLAG_BACKFACE_CULLING
)
?
true
:
false
;
}
u32
texture_id
;
...
...
This diff is collapsed.
Click to expand it.
src/util/string.cpp
+
4
−
1
View file @
37d3c3d3
...
...
@@ -30,7 +30,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include
"../porting.h"
#ifdef __ANDROID__
const
wchar_t
*
wide_chars
=
L" !
\"
#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[
\\
]^_`abcdefghijklmnopqrstuvwxyz{|}~"
;
const
wchar_t
*
wide_chars
=
L" !
\"
#$%&'()*+,-./0123456789:;<=>?@"
L"ABCDEFGHIJKLMNOPQRSTUVWXYZ[
\\
]^_`"
L"abcdefghijklmnopqrstuvwxyz{|}~"
;
int
wctomb
(
char
*
s
,
wchar_t
wc
)
{
...
...
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