TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Restore setShaderInput overload taking 4 numbers, but deprecate it

Browse Source
This commit is contained in:
rdb 2017-10-18 11:26:20 +02:00
parent 410049fd4b
commit 7d721a33a6
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/pgraph/nodePath.h
View File

@ -657,12 +657,12 @@ public:
INLINE void set_shader_input(CPT_InternalName id, const LVecBase4i &v, int priority=0); INLINE void set_shader_input(CPT_InternalName id, const LVecBase4i &v, int priority=0);
INLINE void set_shader_input(CPT_InternalName id, const LVecBase3i &v, int priority=0); INLINE void set_shader_input(CPT_InternalName id, const LVecBase3i &v, int priority=0);
INLINE void set_shader_input(CPT_InternalName id, const LVecBase2i &v, int priority=0); INLINE void set_shader_input(CPT_InternalName id, const LVecBase2i &v, int priority=0);
INLINE void set_shader_input(CPT_InternalName id, int n1, int n2=0, int n3=0, PUBLISHED:
INLINE void set_shader_input(CPT_InternalName id, int n1, int n2, int n3=0,
int n4=0, int priority=0); int n4=0, int priority=0);
INLINE void set_shader_input(CPT_InternalName id, PN_stdfloat n1, PN_stdfloat n2=0, INLINE void set_shader_input(CPT_InternalName id, PN_stdfloat n1, PN_stdfloat n2,
PN_stdfloat n3=0, PN_stdfloat n4=0, int priority=0); PN_stdfloat n3=0, PN_stdfloat n4=0, int priority=0);
PUBLISHED:
EXTENSION(void set_shader_input(CPT_InternalName, PyObject *, int priority=0)); EXTENSION(void set_shader_input(CPT_InternalName, PyObject *, int priority=0));
EXTENSION(void set_shader_inputs(PyObject *args, PyObject *kwargs)); EXTENSION(void set_shader_inputs(PyObject *args, PyObject *kwargs));

2
samples/fireflies/main.py
View File

@ -338,7 +338,7 @@ class FireflyDemo(ShowBase):
color_g = random.uniform(0.8, 1.0) color_g = random.uniform(0.8, 1.0)
color_b = min(color_g, random.uniform(0.5, 1.0)) color_b = min(color_g, random.uniform(0.5, 1.0))
fly.setColor(color_r, color_g, color_b, 1.0) fly.setColor(color_r, color_g, color_b, 1.0)
fly.setShaderInput("lightcolor", color_r, color_g, color_b, 1.0) fly.setShaderInput("lightcolor", (color_r, color_g, color_b, 1.0))
int1 = fly.posInterval(random.uniform(7, 12), pos1, pos2) int1 = fly.posInterval(random.uniform(7, 12), pos1, pos2)
int2 = fly.posInterval(random.uniform(7, 12), pos2, pos1) int2 = fly.posInterval(random.uniform(7, 12), pos2, pos1)
si1 = fly.scaleInterval(random.uniform(0.8, 1.5), si1 = fly.scaleInterval(random.uniform(0.8, 1.5),

10
samples/shadows/advanced.py
View File

@ -103,7 +103,7 @@ class World(DirectObject):
self.pandaModel = Actor.Actor('panda-model', {'walk': 'panda-walk4'}) self.pandaModel = Actor.Actor('panda-model', {'walk': 'panda-walk4'})
self.pandaModel.reparentTo(self.pandaAxis) self.pandaModel.reparentTo(self.pandaAxis)
self.pandaModel.setPos(9, 0, 0) self.pandaModel.setPos(9, 0, 0)
self.pandaModel.setShaderInput("scale", 0.01, 0.01, 0.01, 1.0) self.pandaModel.setShaderInput("scale", (0.01, 0.01, 0.01, 1.0))
self.pandaWalk = self.pandaModel.actorInterval('walk', playRate=1.8) self.pandaWalk = self.pandaModel.actorInterval('walk', playRate=1.8)
self.pandaWalk.loop() self.pandaWalk.loop()
self.pandaMovement = self.pandaAxis.hprInterval( self.pandaMovement = self.pandaAxis.hprInterval(
@ -113,7 +113,7 @@ class World(DirectObject):
self.teapot = loader.loadModel('teapot') self.teapot = loader.loadModel('teapot')
self.teapot.reparentTo(render) self.teapot.reparentTo(render)
self.teapot.setPos(0, -20, 10) self.teapot.setPos(0, -20, 10)
self.teapot.setShaderInput("texDisable", 1, 1, 1, 1) self.teapot.setShaderInput("texDisable", (1, 1, 1, 1))
self.teapotMovement = self.teapot.hprInterval(50, LPoint3(0, 360, 360)) self.teapotMovement = self.teapot.hprInterval(50, LPoint3(0, 360, 360))
self.teapotMovement.loop() self.teapotMovement.loop()
@ -145,9 +145,9 @@ class World(DirectObject):
# setting up shader # setting up shader
render.setShaderInput('light', self.LCam) render.setShaderInput('light', self.LCam)
render.setShaderInput('Ldepthmap', Ldepthmap) render.setShaderInput('Ldepthmap', Ldepthmap)
render.setShaderInput('ambient', self.ambient, 0, 0, 1.0) render.setShaderInput('ambient', (self.ambient, 0, 0, 1.0))
render.setShaderInput('texDisable', 0, 0, 0, 0) render.setShaderInput('texDisable', (0, 0, 0, 0))
render.setShaderInput('scale', 1, 1, 1, 1) render.setShaderInput('scale', (1, 1, 1, 1))
# Put a shader on the Light camera. # Put a shader on the Light camera.
lci = NodePath(PandaNode("Light Camera Initializer")) lci = NodePath(PandaNode("Light Camera Initializer"))

1
samples/shadows/basic.py
View File

@ -80,7 +80,6 @@ class World(DirectObject):
self.teapot = loader.loadModel('teapot') self.teapot = loader.loadModel('teapot')
self.teapot.reparentTo(render) self.teapot.reparentTo(render)
self.teapot.setPos(0, -20, 10) self.teapot.setPos(0, -20, 10)
self.teapot.setShaderInput("texDisable", 1, 1, 1, 1)
self.teapotMovement = self.teapot.hprInterval(50, LPoint3(0, 360, 360)) self.teapotMovement = self.teapot.hprInterval(50, LPoint3(0, 360, 360))
self.teapotMovement.loop() self.teapotMovement.loop()