TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Finished adding RGBA attribute to object data structure

Browse Source
This commit is contained in:
Gyedo Jeon 2010-01-29 23:05:13 +00:00
parent b60fa8ff04
commit b01ea267c2
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/leveleditor/ObjectMgr.py
View File

@ -275,7 +275,7 @@ class ObjectMgr:
obj[OG.OBJ_RGBA] = (r,g,b,a) obj[OG.OBJ_RGBA] = (r,g,b,a)
for child in np.getChildren(): for child in np.getChildren():
if not child.hasTag('OBJRoot') and\ if not child.hasTag('OBJRoot') and\
child.getName() != 'bboxines': child.getName() != 'bboxLines':
child.setTransparency(1) child.setTransparency(1)
child.setColorScale(r, g, b, a) child.setColorScale(r, g, b, a)

17
direct/src/leveleditor/ObjectPropertyUI.py
View File

@ -269,12 +269,11 @@ class ObjectPropertyUI(ScrolledPanel):
self.editor.objectMgr.updateObjectTransform) self.editor.objectMgr.updateObjectTransform)
objNP = obj[OG.OBJ_NP] objNP = obj[OG.OBJ_NP]
objNP.setTransparency(1) objRGBA = obj[OG.OBJ_RGBA]
colorScale = objNP.getColorScale() self.propCR = ObjectPropUISlider(self.propPane, 'CR', objRGBA[0], 0, 1)
self.propCR = ObjectPropUISlider(self.propPane, 'CR', colorScale.getX(), 0, 1) self.propCG = ObjectPropUISlider(self.propPane, 'CG', objRGBA[1], 0, 1)
self.propCG = ObjectPropUISlider(self.propPane, 'CG', colorScale.getY(), 0, 1) self.propCB = ObjectPropUISlider(self.propPane, 'CB', objRGBA[2], 0, 1)
self.propCB = ObjectPropUISlider(self.propPane, 'CB', colorScale.getZ(), 0, 1) self.propCA = ObjectPropUISlider(self.propPane, 'CA', objRGBA[3], 0, 1)
self.propCA = ObjectPropUISlider(self.propPane, 'CA', colorScale.getW(), 0, 1)
colorProps = [self.propCR, self.propCG, self.propCB, self.propCA] colorProps = [self.propCR, self.propCG, self.propCB, self.propCA]
for colorProp in colorProps: for colorProp in colorProps:
@ -283,13 +282,13 @@ class ObjectPropertyUI(ScrolledPanel):
sizer.AddMany(colorProps) sizer.AddMany(colorProps)
button = wx.Button(self.propPane, -1, 'Color Picker', (0,0), (140, 20)) button = wx.Button(self.propPane, -1, 'Color Picker', (0,0), (140, 20))
_colourData = wx.ColourData() _colourData = wx.ColourData()
_colourData.SetColour(wx.Colour(colorScale.getX() * 255, colorScale.getY() * 255, colorScale.getZ() * 255)) _colourData.SetColour(wx.Colour(objRGBA[0] * 255, objRGBA[1] * 255, objRGBA[2] * 255))
button.Bind(wx.EVT_BUTTON, lambda p0=None, p1=_colourData, p2=colorScale.getW() * 255: self.openColorPicker(p0, p1, p2)) button.Bind(wx.EVT_BUTTON, lambda p0=None, p1=_colourData, p2=objRGBA[3] * 255: self.openColorPicker(p0, p1, p2))
sizer.Add(button) sizer.Add(button)
if self.colorPicker: if self.colorPicker:
self.openColorPicker(None, _colourData, colorScale.getW() * 255) self.openColorPicker(None, _colourData, objRGBA[3] * 255)
objDef = obj[OG.OBJ_DEF] objDef = obj[OG.OBJ_DEF]