Commit ef650ac0 authored by Jan Möbius's avatar Jan Möbius
Browse files

Christopher:

Changes to light and material dialog to set alpha channel




git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12381 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 8a4a3286
......@@ -478,7 +478,9 @@ void QtMaterialDialog::changeAmbientColor()
{
bool* ok = 0;
QColor newColor = QColor( QColorDialog::getRgba(convertColor(ambient_).rgba(), ok, this));
QColor oldColor = convertColor(ambient_);
QColor newColor = QColorDialog::getColor(oldColor, this, "Ambient Color", QColorDialog::ShowAlphaChannel);
if( newColor.isValid())
{
......
......@@ -240,6 +240,13 @@ LightNode::~LightNode() {
//----------------------------------------------------------------------------
void LightNode::getLightSource(LightSource* _light) const
{
memcpy(_light, &light_, sizeof(LightSource));
}
//----------------------------------------------------------------------------
void LightNode::boundingBox(ACG::Vec3d& _bbMin, ACG::Vec3d& _bbMax) {
if( visualize_ && !light_.directional() ) {
......
......@@ -259,6 +259,9 @@ public:
/// Set the light source parameters
void setLightSource(LightSource _light ) { light_ = _light; };
/// Get the light source parameters
void getLightSource(LightSource* _light) const;
ACG_CLASSNAME(LightNode);
/// Get bounding box (for visualization purposes)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment