projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove FPS from being next to the version string
[oweals/minetest.git]
/
src
/
itemdef.cpp
diff --git
a/src/itemdef.cpp
b/src/itemdef.cpp
index d5e03f7b367242d29471d13790779a81b74a6088..10e1afe2dbaedcf160e1ad692a5030d0ffda3b8e 100644
(file)
--- a/
src/itemdef.cpp
+++ b/
src/itemdef.cpp
@@
-38,6
+38,10
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include <map>
#include <set>
#include <map>
#include <set>
+#ifdef __ANDROID__
+#include <GLES/gl.h>
+#endif
+
/*
ItemDefinition
*/
/*
ItemDefinition
*/
@@
-398,7
+402,7
@@
public:
MeshMakeData mesh_make_data(gamedef);
MapNode mesh_make_node(id, param1, 0);
mesh_make_data.fillSingleNode(&mesh_make_node);
MeshMakeData mesh_make_data(gamedef);
MapNode mesh_make_node(id, param1, 0);
mesh_make_data.fillSingleNode(&mesh_make_node);
- MapBlockMesh mapblock_mesh(&mesh_make_data);
+ MapBlockMesh mapblock_mesh(&mesh_make_data
, v3s16(0, 0, 0)
);
scene::IMesh *node_mesh = mapblock_mesh.getMesh();
assert(node_mesh);
video::SColor c(255, 255, 255, 255);
scene::IMesh *node_mesh = mapblock_mesh.getMesh();
assert(node_mesh);
video::SColor c(255, 255, 255, 255);
@@
-433,6
+437,11
@@
public:
params.light_color.set(1.0, 0.5, 0.5, 0.5);
params.light_radius = 1000;
params.light_color.set(1.0, 0.5, 0.5, 0.5);
params.light_radius = 1000;
+#ifdef __ANDROID__
+ params.camera_position.set(0, -1.0, -1.5);
+ params.camera_position.rotateXZBy(45);
+ params.light_position.set(10, -100, -50);
+#endif
cc->inventory_texture =
tsrc->generateTextureFromMesh(params);
cc->inventory_texture =
tsrc->generateTextureFromMesh(params);