projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Node highlighting.
[oweals/minetest.git]
/
src
/
content_cso.cpp
diff --git
a/src/content_cso.cpp
b/src/content_cso.cpp
index 20eb88b7d41161ce311211c9dfe5b9089884cabe..4f652a8a3127ffd8845363a370aba769e6485c73 100644
(file)
--- a/
src/content_cso.cpp
+++ b/
src/content_cso.cpp
@@
-25,6
+25,7
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include "log.h"
#include "map.h"
#include "log.h"
#include "map.h"
+/*
static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill,
float txs, float tys, int col, int row)
{
static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill,
float txs, float tys, int col, int row)
{
@@
-33,6
+34,7
@@
static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill,
matrix.setTextureTranslate(txs*col, tys*row);
matrix.setTextureScale(txs, tys);
}
matrix.setTextureTranslate(txs*col, tys*row);
matrix.setTextureScale(txs, tys);
}
+*/
class SmokePuffCSO: public ClientSimpleObject
{
class SmokePuffCSO: public ClientSimpleObject
{
@@
-48,7
+50,7
@@
public:
m_spritenode = smgr->addBillboardSceneNode(
NULL, v2f(1,1), pos, -1);
m_spritenode->setMaterialTexture(0,
m_spritenode = smgr->addBillboardSceneNode(
NULL, v2f(1,1), pos, -1);
m_spritenode->setMaterialTexture(0,
- env->getGameDef()->tsrc()->getTexture
Raw
("smoke_puff.png"));
+ env->getGameDef()->tsrc()->getTexture("smoke_puff.png"));
m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false);
m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
//m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false);
m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
//m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);