Skip to content

C
core
Kaydet (Commit) 3a153e93 authored tarafından Christian Lippka's avatar Christian Lippka
Dosyalara gözat
Seçenekler

#99712# high contrast for 3d flyer

üst 8375c9c3
Show whitespace changes
Inline Side-by-side
Showing with 356 additions and 91 deletions
svx/inc/float3d.hrc
Dosyayı görüntüle @ 3a153e93
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: float3d.hrc,v $ * $RCSfile: float3d.hrc,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: fme $ $Date: 2001-06-14 18:05:49 $ * last change: $Author: cl $ $Date: 2002-06-03 08:57:04 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -191,3 +191,38 @@ ...@@ -191,3 +191,38 @@
//#define BTN_MAT_EDITOR 126 //#define BTN_MAT_EDITOR 126
// high contrast
#define BMP_FAVORITES_H 129
#define BMP_GEO_H 130
#define BMP_REPRESENTATION_H 131
#define BMP_LIGHT_H 132
#define BMP_TEXTURE_H 133
#define BMP_MATERIAL_H 134
#define BMP_UPDATE_H 135
#define BMP_ASSIGN_H 136
#define BMP_CHANGE_TO_3D_H 137
#define BMP_LATHE_OBJ_H 138
#define BMP_PERSPECTIVE_H 139
#define BMP_ONLY_3D_H 140
#define BMP_ALL_ATTRIBUTES_H 141
#define BMP_NORMALS_OBJ_H 142
#define BMP_NORMALS_FLAT_H 143
#define BMP_NORMALS_SPHERE_H 144
#define BMP_NORMALS_INVERT_H 145
#define BMP_TWO_SIDED_LIGHTING_H 146
#define BMP_DOUBLE_SIDED_H 147
#define BMP_SHADOW_3D_H 148
#define BMP_3DLIGHT_H 149
#define BMP_LIGHT_COLOR_H 150
#define BMP_AMBIENT_COLOR_H 151
#define BMP_TEX_LUMINANCE_H 152
#define BMP_TEX_COLOR_H 153
#define BMP_TEX_REPLACE_H 154
#define BMP_TEX_MODULATE_H 155
#define BMP_TEX_BLEND_H 156
#define BMP_TEX_OBJECT_H 157
#define BMP_TEX_PARALLEL_H 158
#define BMP_TEX_CIRCLE_H 159
#define BMP_TEX_FILTER_H 160
#define BMP_COLORDLG_H 161
svx/source/engine3d/float3d.cxx
Dosyayı görüntüle @ 3a153e93
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: float3d.cxx,v $ * $RCSfile: float3d.cxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: fme $ $Date: 2001-06-15 07:35:38 $ * last change: $Author: cl $ $Date: 2002-06-03 09:01:44 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -151,6 +151,20 @@ ...@@ -151,6 +151,20 @@
SFX_IMPL_DOCKINGWINDOW( Svx3DChildWindow, SID_3D_WIN ) SFX_IMPL_DOCKINGWINDOW( Svx3DChildWindow, SID_3D_WIN )
struct Svx3DWinImpl
{
SfxItemPool* pPool;
Image maImgLightOnH;
Image maImgLightOffH;
};
#define SETHCIMAGE(btn,res) \
{ \
Bitmap aBmp( SVX_RES( res ) ); \
Image aImage( aBmp, COL_LIGHTMAGENTA ); \
btn.SetModeImage( aImage, BMP_COLOR_HIGHCONTRAST ); \
}
/************************************************************************* /*************************************************************************
|* Svx3DWin - FloatingWindow |* Svx3DWin - FloatingWindow
\************************************************************************/ \************************************************************************/
...@@ -295,10 +309,60 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, ...@@ -295,10 +309,60 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
pMatFavSetList ( NULL ), pMatFavSetList ( NULL ),
pBindings ( pInBindings ), pBindings ( pInBindings ),
pPool ( NULL ), // pPool ( NULL ),
mpImpl ( new Svx3DWinImpl() ),
mpRemember2DAttributes(NULL), mpRemember2DAttributes(NULL),
bOnly3DChanged ( FALSE ) bOnly3DChanged ( FALSE )
{ {
SETHCIMAGE( aBtnFavorites, BMP_FAVORITES_H );
SETHCIMAGE( aBtnGeo, BMP_GEO_H );
SETHCIMAGE( aBtnRepresentation, BMP_REPRESENTATION_H );
SETHCIMAGE( aBtnLight, BMP_3DLIGHT_H );
SETHCIMAGE( aBtnTexture, BMP_TEXTURE_H );
SETHCIMAGE( aBtnMaterial, BMP_MATERIAL_H );
SETHCIMAGE( aBtnUpdate, BMP_UPDATE_H );
SETHCIMAGE( aBtnAssign, BMP_ASSIGN_H );
SETHCIMAGE( aBtnOnly3D, BMP_ONLY_3D_H );
SETHCIMAGE( aBtnAllAttributes, BMP_ALL_ATTRIBUTES_H );
SETHCIMAGE( aBtnNormalsObj, BMP_NORMALS_OBJ_H );
SETHCIMAGE( aBtnNormalsFlat, BMP_NORMALS_FLAT_H );
SETHCIMAGE( aBtnNormalsSphere, BMP_NORMALS_SPHERE_H );
SETHCIMAGE( aBtnTwoSidedLighting, BMP_TWO_SIDED_LIGHTING_H );
SETHCIMAGE( aBtnNormalsInvert, BMP_NORMALS_INVERT_H );
SETHCIMAGE( aBtnDoubleSided, BMP_DOUBLE_SIDED_H );
SETHCIMAGE( aBtnShadow3d, BMP_SHADOW_3D_H );
SETHCIMAGE( aBtnLight1, BMP_LIGHT_H );
SETHCIMAGE( aBtnLight2, BMP_LIGHT_H );
SETHCIMAGE( aBtnLight3, BMP_LIGHT_H );
SETHCIMAGE( aBtnLight4, BMP_LIGHT_H );
SETHCIMAGE( aBtnLight5, BMP_LIGHT_H );
SETHCIMAGE( aBtnLight6, BMP_LIGHT_H );
SETHCIMAGE( aBtnLight7, BMP_LIGHT_H );
SETHCIMAGE( aBtnLight8, BMP_LIGHT_H );
SETHCIMAGE( aBtnLightColor, BMP_LIGHT_COLOR_H );
SETHCIMAGE( aBtnAmbientColor, BMP_AMBIENT_COLOR_H );
SETHCIMAGE( aBtnTexLuminance, BMP_TEX_LUMINANCE_H );
SETHCIMAGE( aBtnTexColor, BMP_TEX_COLOR_H );
SETHCIMAGE( aBtnTexReplace, BMP_TEX_REPLACE_H );
SETHCIMAGE( aBtnTexModulate, BMP_TEX_MODULATE_H );
SETHCIMAGE( aBtnTexBlend, BMP_TEX_BLEND_H );
SETHCIMAGE( aBtnTexParallelX, BMP_TEX_PARALLEL_H );
SETHCIMAGE( aBtnTexCircleX, BMP_TEX_CIRCLE_H );
SETHCIMAGE( aBtnTexObjectX, BMP_TEX_OBJECT_H );
SETHCIMAGE( aBtnTexParallelY, BMP_TEX_PARALLEL_H );
SETHCIMAGE( aBtnTexCircleY, BMP_TEX_CIRCLE_H );
SETHCIMAGE( aBtnTexObjectY, BMP_TEX_OBJECT_H );
SETHCIMAGE( aBtnTexFilter, BMP_TEX_FILTER_H );
SETHCIMAGE( aBtnMatColor, BMP_COLORDLG_H );
SETHCIMAGE( aBtnEmissionColor, BMP_COLORDLG_H );
SETHCIMAGE( aBtnSpecularColor, BMP_COLORDLG_H );
SETHCIMAGE( aBtnPerspective, BMP_PERSPECTIVE_H );
SETHCIMAGE( aBtnConvertTo3D, BMP_CHANGE_TO_3D_H );
SETHCIMAGE( aBtnLatheObject, BMP_LATHE_OBJ_H );
mpImpl->pPool = NULL;
mpImpl->maImgLightOnH = Image( SVX_RES( RID_SVXIMAGE_LIGHT_ON_H ) );
mpImpl->maImgLightOffH = Image( SVX_RES( RID_SVXIMAGE_LIGHT_OFF_H ) );
FreeResource(); FreeResource();
// Metrik einstellen // Metrik einstellen
...@@ -438,6 +502,8 @@ __EXPORT Svx3DWin::~Svx3DWin() ...@@ -438,6 +502,8 @@ __EXPORT Svx3DWin::~Svx3DWin()
if(mpRemember2DAttributes) if(mpRemember2DAttributes)
delete mpRemember2DAttributes; delete mpRemember2DAttributes;
delete mpImpl;
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
...@@ -526,6 +592,17 @@ void Svx3DWin::Reset() ...@@ -526,6 +592,17 @@ void Svx3DWin::Reset()
aCtlLightPreview.GetPreviewControl().SelectLight(Base3DLight0); aCtlLightPreview.GetPreviewControl().SelectLight(Base3DLight0);
} }
bool Svx3DWin::GetUILightState( ImageButton& aBtn ) const
{
return (aBtn.GetImage() == aImgLightOn) || (aBtn.GetImage() == mpImpl->maImgLightOnH);
}
void Svx3DWin::SetUILightState( ImageButton& aBtn, bool bState )
{
aBtn.SetImage( bState ? aImgLightOn : aImgLightOff );
aBtn.SetModeImage( bState ? mpImpl->maImgLightOnH : mpImpl->maImgLightOffH, BMP_COLOR_HIGHCONTRAST );
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void Svx3DWin::Update( SfxItemSet& rAttrs ) void Svx3DWin::Update( SfxItemSet& rAttrs )
{ {
...@@ -559,11 +636,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ...@@ -559,11 +636,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
BOOL bUpdate = FALSE; BOOL bUpdate = FALSE;
// evtl. PoolUnit ermitteln // evtl. PoolUnit ermitteln
if( !pPool ) if( !mpImpl->pPool )
{ {
pPool = rAttrs.GetPool(); mpImpl->pPool = rAttrs.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool?" ); DBG_ASSERT( mpImpl->pPool, "Wo ist der Pool?" );
ePoolUnit = pPool->GetMetric( SID_ATTR_LINE_WIDTH ); ePoolUnit = mpImpl->pPool->GetMetric( SID_ATTR_LINE_WIDTH );
} }
eFUnit = GetModuleFieldUnit( &rAttrs ); eFUnit = GetModuleFieldUnit( &rAttrs );
...@@ -841,7 +918,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ...@@ -841,7 +918,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE); eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE);
if( eState != SFX_ITEM_DONTCARE ) if( eState != SFX_ITEM_DONTCARE )
{ {
UINT32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue(); INT32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
if( nValue != aMtrEndAngle.GetValue() ) if( nValue != aMtrEndAngle.GetValue() )
{ {
aMtrEndAngle.SetValue( nValue ); aMtrEndAngle.SetValue( nValue );
...@@ -1073,11 +1150,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ...@@ -1073,11 +1150,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_1); eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_1);
if( eState != SFX_ITEM_DONTCARE ) if( eState != SFX_ITEM_DONTCARE )
{ {
BOOL bOn = ((const Svx3DLightOnOff1Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); bool bOn = ((const Svx3DLightOnOff1Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue() != 0;
if( ( bOn && aBtnLight1.GetImage() != aImgLightOn ) || if( ( bOn && !GetUILightState( aBtnLight1 )) ||
( !bOn && aBtnLight1.GetImage() != aImgLightOff ) ) ( !bOn && GetUILightState( aBtnLight1 )) )
{ {
aBtnLight1.SetImage( bOn ? aImgLightOn : aImgLightOff ); SetUILightState( aBtnLight1, bOn );
pLightGroup->Enable( bOn, Base3DLight0 ); pLightGroup->Enable( bOn, Base3DLight0 );
bUpdate = TRUE; bUpdate = TRUE;
} }
...@@ -1131,11 +1208,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ...@@ -1131,11 +1208,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_2); eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_2);
if( eState != SFX_ITEM_DONTCARE ) if( eState != SFX_ITEM_DONTCARE )
{ {
BOOL bOn = ((const Svx3DLightOnOff2Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); bool bOn = ((const Svx3DLightOnOff2Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue() != 0;
if( ( bOn && aBtnLight2.GetImage() != aImgLightOn ) || if( ( bOn && !GetUILightState( aBtnLight2 )) ||
( !bOn && aBtnLight2.GetImage() != aImgLightOff ) ) ( !bOn && GetUILightState( aBtnLight2 )) )
{ {
aBtnLight2.SetImage( bOn ? aImgLightOn : aImgLightOff ); SetUILightState( aBtnLight2, bOn );
pLightGroup->Enable( bOn, Base3DLight1 ); pLightGroup->Enable( bOn, Base3DLight1 );
bUpdate = TRUE; bUpdate = TRUE;
} }
...@@ -1189,11 +1266,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ...@@ -1189,11 +1266,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_3); eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_3);
if( eState != SFX_ITEM_DONTCARE ) if( eState != SFX_ITEM_DONTCARE )
{ {
BOOL bOn = ((const Svx3DLightOnOff3Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); bool bOn = ((const Svx3DLightOnOff3Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue() != 0;
if( ( bOn && aBtnLight3.GetImage() != aImgLightOn ) || if( ( bOn && !GetUILightState( aBtnLight3)) ||
( !bOn && aBtnLight3.GetImage() != aImgLightOff ) ) ( !bOn && GetUILightState( aBtnLight3)) )
{ {
aBtnLight3.SetImage( bOn ? aImgLightOn : aImgLightOff ); SetUILightState( aBtnLight3, bOn );
pLightGroup->Enable( bOn, Base3DLight2 ); pLightGroup->Enable( bOn, Base3DLight2 );
bUpdate = TRUE; bUpdate = TRUE;
} }
...@@ -1247,11 +1324,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ...@@ -1247,11 +1324,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_4); eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_4);
if( eState != SFX_ITEM_DONTCARE ) if( eState != SFX_ITEM_DONTCARE )
{ {
BOOL bOn = ((const Svx3DLightOnOff4Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); bool bOn = ((const Svx3DLightOnOff4Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue() != 0;
if( ( bOn && aBtnLight4.GetImage() != aImgLightOn ) || if( ( bOn && !GetUILightState( aBtnLight4 )) ||
( !bOn && aBtnLight4.GetImage() != aImgLightOff ) ) ( !bOn && GetUILightState( aBtnLight4 )) )
{ {
aBtnLight4.SetImage( bOn ? aImgLightOn : aImgLightOff ); SetUILightState( aBtnLight4, bOn );
pLightGroup->Enable( bOn, Base3DLight3 ); pLightGroup->Enable( bOn, Base3DLight3 );
bUpdate = TRUE; bUpdate = TRUE;
} }
...@@ -1305,11 +1382,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ...@@ -1305,11 +1382,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_5); eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_5);
if( eState != SFX_ITEM_DONTCARE ) if( eState != SFX_ITEM_DONTCARE )
{ {
BOOL bOn = ((const Svx3DLightOnOff5Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); bool bOn = ((const Svx3DLightOnOff5Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue() != 0;
if( ( bOn && aBtnLight5.GetImage() != aImgLightOn ) || if( ( bOn && !GetUILightState( aBtnLight5 )) ||
( !bOn && aBtnLight5.GetImage() != aImgLightOff ) ) ( !bOn && GetUILightState( aBtnLight5 )) )
{ {
aBtnLight5.SetImage( bOn ? aImgLightOn : aImgLightOff ); SetUILightState( aBtnLight5, bOn );
pLightGroup->Enable( bOn, Base3DLight4 ); pLightGroup->Enable( bOn, Base3DLight4 );
bUpdate = TRUE; bUpdate = TRUE;
} }
...@@ -1363,11 +1440,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ...@@ -1363,11 +1440,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_6); eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_6);
if( eState != SFX_ITEM_DONTCARE ) if( eState != SFX_ITEM_DONTCARE )
{ {
BOOL bOn = ((const Svx3DLightOnOff6Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); bool bOn = ((const Svx3DLightOnOff6Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue() != 0;
if( ( bOn && aBtnLight6.GetImage() != aImgLightOn ) || if( ( bOn && !GetUILightState( aBtnLight6 )) ||
( !bOn && aBtnLight6.GetImage() != aImgLightOff ) ) ( !bOn && GetUILightState( aBtnLight6 )) )
{ {
aBtnLight6.SetImage( bOn ? aImgLightOn : aImgLightOff ); SetUILightState( aBtnLight6, bOn );
pLightGroup->Enable( bOn, Base3DLight5 ); pLightGroup->Enable( bOn, Base3DLight5 );
bUpdate = TRUE; bUpdate = TRUE;
} }
...@@ -1421,11 +1498,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ...@@ -1421,11 +1498,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_7); eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_7);
if( eState != SFX_ITEM_DONTCARE ) if( eState != SFX_ITEM_DONTCARE )
{ {
BOOL bOn = ((const Svx3DLightOnOff7Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); bool bOn = ((const Svx3DLightOnOff7Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue() != 0;
if( ( bOn && aBtnLight7.GetImage() != aImgLightOn ) || if( ( bOn && !GetUILightState( aBtnLight7 )) ||
( !bOn && aBtnLight7.GetImage() != aImgLightOff ) ) ( !bOn && GetUILightState( aBtnLight7 )) )
{ {
aBtnLight7.SetImage( bOn ? aImgLightOn : aImgLightOff ); SetUILightState( aBtnLight7 , bOn );
pLightGroup->Enable( bOn, Base3DLight6 ); pLightGroup->Enable( bOn, Base3DLight6 );
bUpdate = TRUE; bUpdate = TRUE;
} }
...@@ -1479,11 +1556,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ...@@ -1479,11 +1556,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_8); eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_8);
if( eState != SFX_ITEM_DONTCARE ) if( eState != SFX_ITEM_DONTCARE )
{ {
BOOL bOn = ((const Svx3DLightOnOff8Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); bool bOn = ((const Svx3DLightOnOff8Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue() != 0;
if( ( bOn && aBtnLight8.GetImage() != aImgLightOn ) || if( ( bOn && !GetUILightState( aBtnLight8 )) ||
( !bOn && aBtnLight8.GetImage() != aImgLightOff ) ) ( !bOn && GetUILightState( aBtnLight8 )) )
{ {
aBtnLight8.SetImage( bOn ? aImgLightOn : aImgLightOff ); SetUILightState( aBtnLight8, bOn );
pLightGroup->Enable( bOn, Base3DLight7 ); pLightGroup->Enable( bOn, Base3DLight7 );
bUpdate = TRUE; bUpdate = TRUE;
} }
...@@ -1862,12 +1939,12 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) ...@@ -1862,12 +1939,12 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Geometrie // Geometrie
// evtl. PoolUnit ermitteln (Falls dies in Update() nicht passiert ist) // evtl. PoolUnit ermitteln (Falls dies in Update() nicht passiert ist)
if( !pPool ) if( !mpImpl->pPool )
{ {
DBG_ERROR( "Kein Pool in GetAttr()! Evtl. inkompatibel zu drviewsi.cxx ?" ); DBG_ERROR( "Kein Pool in GetAttr()! Evtl. inkompatibel zu drviewsi.cxx ?" );
pPool = rAttrs.GetPool(); mpImpl->pPool = rAttrs.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool?" ); DBG_ASSERT( mpImpl->pPool, "Wo ist der Pool?" );
ePoolUnit = pPool->GetMetric( SID_ATTR_LINE_WIDTH ); ePoolUnit = mpImpl->pPool->GetMetric( SID_ATTR_LINE_WIDTH );
eFUnit = GetModuleFieldUnit( &rAttrs ); eFUnit = GetModuleFieldUnit( &rAttrs );
} }
...@@ -1930,7 +2007,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) ...@@ -1930,7 +2007,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Endwinkel // Endwinkel
if( !aMtrEndAngle.IsEmptyFieldValue() ) if( !aMtrEndAngle.IsEmptyFieldValue() )
{ {
UINT16 nValue = (UINT32)aMtrEndAngle.GetValue(); UINT16 nValue = (UINT16)aMtrEndAngle.GetValue();
rAttrs.Put(Svx3DEndAngleItem(nValue)); rAttrs.Put(Svx3DEndAngleItem(nValue));
} }
else else
...@@ -2037,10 +2114,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) ...@@ -2037,10 +2114,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight1.GetState(); eState = aBtnLight1.GetState();
if( eState != STATE_DONTKNOW ) if( eState != STATE_DONTKNOW )
{ {
aImg = aBtnLight1.GetImage(); BOOL bValue = GetUILightState( aBtnLight1 );
BOOL bValue = FALSE;
if( aImg == aImgLightOn )
bValue = TRUE;
rAttrs.Put(Svx3DLightOnOff1Item(bValue)); rAttrs.Put(Svx3DLightOnOff1Item(bValue));
// Licht 1 (Richtung) // Licht 1 (Richtung)
...@@ -2066,10 +2140,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) ...@@ -2066,10 +2140,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight2.GetState(); eState = aBtnLight2.GetState();
if( eState != STATE_DONTKNOW ) if( eState != STATE_DONTKNOW )
{ {
aImg = aBtnLight2.GetImage(); BOOL bValue = GetUILightState( aBtnLight2 );
BOOL bValue = FALSE;
if( aImg == aImgLightOn )
bValue = TRUE;
rAttrs.Put(Svx3DLightOnOff2Item(bValue)); rAttrs.Put(Svx3DLightOnOff2Item(bValue));
// Licht 2 (Richtung) // Licht 2 (Richtung)
...@@ -2094,10 +2165,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) ...@@ -2094,10 +2165,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight3.GetState(); eState = aBtnLight3.GetState();
if( eState != STATE_DONTKNOW ) if( eState != STATE_DONTKNOW )
{ {
aImg = aBtnLight3.GetImage(); BOOL bValue = GetUILightState( aBtnLight3 );
BOOL bValue = FALSE;
if( aImg == aImgLightOn )
bValue = TRUE;
rAttrs.Put(Svx3DLightOnOff3Item(bValue)); rAttrs.Put(Svx3DLightOnOff3Item(bValue));
// Licht 3 (Richtung) // Licht 3 (Richtung)
...@@ -2122,10 +2190,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) ...@@ -2122,10 +2190,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight4.GetState(); eState = aBtnLight4.GetState();
if( eState != STATE_DONTKNOW ) if( eState != STATE_DONTKNOW )
{ {
aImg = aBtnLight4.GetImage(); BOOL bValue = GetUILightState( aBtnLight4 );
BOOL bValue = FALSE;
if( aImg == aImgLightOn )
bValue = TRUE;
rAttrs.Put(Svx3DLightOnOff4Item(bValue)); rAttrs.Put(Svx3DLightOnOff4Item(bValue));
// Licht 4 (Richtung) // Licht 4 (Richtung)
...@@ -2150,10 +2215,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) ...@@ -2150,10 +2215,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight5.GetState(); eState = aBtnLight5.GetState();
if( eState != STATE_DONTKNOW ) if( eState != STATE_DONTKNOW )
{ {
aImg = aBtnLight5.GetImage(); BOOL bValue = GetUILightState( aBtnLight5 );
BOOL bValue = FALSE;
if( aImg == aImgLightOn )
bValue = TRUE;
rAttrs.Put(Svx3DLightOnOff5Item(bValue)); rAttrs.Put(Svx3DLightOnOff5Item(bValue));
// Licht 5 (Richtung) // Licht 5 (Richtung)
...@@ -2178,10 +2240,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) ...@@ -2178,10 +2240,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight6.GetState(); eState = aBtnLight6.GetState();
if( eState != STATE_DONTKNOW ) if( eState != STATE_DONTKNOW )
{ {
aImg = aBtnLight6.GetImage(); BOOL bValue = GetUILightState( aBtnLight6 );
BOOL bValue = FALSE;
if( aImg == aImgLightOn )
bValue = TRUE;
rAttrs.Put(Svx3DLightOnOff6Item(bValue)); rAttrs.Put(Svx3DLightOnOff6Item(bValue));
// Licht 6 (Richtung) // Licht 6 (Richtung)
...@@ -2206,10 +2265,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) ...@@ -2206,10 +2265,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight7.GetState(); eState = aBtnLight7.GetState();
if( eState != STATE_DONTKNOW ) if( eState != STATE_DONTKNOW )
{ {
aImg = aBtnLight7.GetImage(); BOOL bValue = GetUILightState( aBtnLight7 );
BOOL bValue = FALSE;
if( aImg == aImgLightOn )
bValue = TRUE;
rAttrs.Put(Svx3DLightOnOff7Item(bValue)); rAttrs.Put(Svx3DLightOnOff7Item(bValue));
// Licht 7 (Richtung) // Licht 7 (Richtung)
...@@ -2234,10 +2290,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) ...@@ -2234,10 +2290,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight8.GetState(); eState = aBtnLight8.GetState();
if( eState != STATE_DONTKNOW ) if( eState != STATE_DONTKNOW )
{ {
aImg = aBtnLight8.GetImage(); BOOL bValue = GetUILightState( aBtnLight8 );
BOOL bValue = FALSE;
if( aImg == aImgLightOn )
bValue = TRUE;
rAttrs.Put(Svx3DLightOnOff8Item(bValue)); rAttrs.Put(Svx3DLightOnOff8Item(bValue));
// Licht 8 (Richtung) // Licht 8 (Richtung)
...@@ -2839,12 +2892,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) ...@@ -2839,12 +2892,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
if( pBtn->IsChecked() ) if( pBtn->IsChecked() )
{ {
Image aImg( pBtn->GetImage() ); SetUILightState( *(ImageButton*)pBtn, !GetUILightState( *(ImageButton*)pBtn ) );
if( aImg == aImgLightOn )
pBtn->SetImage( aImgLightOff );
else
pBtn->SetImage( aImgLightOn );
} }
else else
{ {
...@@ -2891,7 +2939,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) ...@@ -2891,7 +2939,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
aLbLight8.Hide(); aLbLight8.Hide();
} }
} }
BOOL bEnable = pBtn->GetImage() == aImgLightOn; BOOL bEnable = GetUILightState( *(ImageButton*)pBtn );
aBtnLightColor.Enable( bEnable ); aBtnLightColor.Enable( bEnable );
pLb->Enable( bEnable ); pLb->Enable( bEnable );
...@@ -3175,9 +3223,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn ) ...@@ -3175,9 +3223,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
Base3DMaterialDiffuse, Base3DMaterialDiffuse,
(Base3DLightNumber) nLightSource ); (Base3DLightNumber) nLightSource );
Image aImg( pBtn->GetImage() ); pLightGroup->Enable( GetUILightState( *(ImageButton*)pBtn ), (Base3DLightNumber) nLightSource );
pLightGroup->Enable( aImg == aImgLightOn,
(Base3DLightNumber) nLightSource );
aCtlLightPreview.GetPreviewControl().SetLightGroup( pLightGroup ); aCtlLightPreview.GetPreviewControl().SetLightGroup( pLightGroup );
aCtlLightPreview.GetPreviewControl().SelectLight( (Base3DLightNumber) nLightSource ); aCtlLightPreview.GetPreviewControl().SelectLight( (Base3DLightNumber) nLightSource );
......
svx/source/engine3d/float3d.src
Dosyayı görüntüle @ 3a153e93
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: float3d.src,v $ * $RCSfile: float3d.src,v $
* *
* $Revision: 1.44 $ * $Revision: 1.45 $
* *
* last change: $Author: kz $ $Date: 2002-05-27 12:33:31 $ * last change: $Author: cl $ $Date: 2002-06-03 09:01:44 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -79,6 +79,9 @@ ...@@ -79,6 +79,9 @@
#ifndef STD_MASKCOLOR #ifndef STD_MASKCOLOR
#define STD_MASKCOLOR Color { Red=0xC000; Green=0xC000; Blue=0xC000; } #define STD_MASKCOLOR Color { Red=0xC000; Green=0xC000; Blue=0xC000; }
#endif #endif
#ifndef STD_MASKCOLOR_HC
#define STD_MASKCOLOR_HC Color { Red=0xf000; Green=0x0000; Blue=0xf000; }
#endif
DockingWindow RID_SVXFLOAT_3D DockingWindow RID_SVXFLOAT_3D
{ {
HelpID = SID_3D_WIN ; HelpID = SID_3D_WIN ;
...@@ -3398,17 +3401,197 @@ DockingWindow RID_SVXFLOAT_3D ...@@ -3398,17 +3401,197 @@ DockingWindow RID_SVXFLOAT_3D
Text[ turkish ] = "3B efektler"; Text[ turkish ] = "3B efektler";
Text[ catalan ] = "Efectos 3D"; Text[ catalan ] = "Efectos 3D";
Text[ finnish ] = "Kolmiulotteiset tehosteet"; Text[ finnish ] = "Kolmiulotteiset tehosteet";
Bitmap BMP_FAVORITES_H
{
File = "3dfavor_h.bmp";
};
Bitmap BMP_GEO_H
{
File = "3dgeo_h.bmp";
};
Bitmap BMP_REPRESENTATION_H
{
File = "3drepres_h.bmp";
};
Bitmap BMP_3DLIGHT_H
{
File = "3dlight_h.bmp";
};
Bitmap BMP_TEXTURE_H
{
File = "3dtextur_h.bmp";
};
Bitmap BMP_MATERIAL_H
{
File = "material_h.bmp";
};
Bitmap BMP_UPDATE_H
{
File = "sc10350_h.bmp";
};
Bitmap BMP_ASSIGN_H
{
File = "apply_h.bmp";
};
Bitmap BMP_CHANGE_TO_3D_H
{
File = "convrt3d_h.bmp";
};
Bitmap BMP_LATHE_OBJ_H
{
File = "rotate3d_h.bmp";
};
Bitmap BMP_PERSPECTIVE_H
{
File = "persp3d_h.bmp";
};
Bitmap BMP_ONLY_3D_H
{
File = "only3d_h.bmp";
};
Bitmap BMP_ALL_ATTRIBUTES_H
{
File = "allattri_h.bmp";
};
Bitmap BMP_NORMALS_OBJ_H
{
File = "normobjs_h.bmp";
};
Bitmap BMP_NORMALS_FLAT_H
{
File = "normflat_h.bmp";
};
Bitmap BMP_NORMALS_SPHERE_H
{
File = "normsphe_h.bmp";
};
Bitmap BMP_NORMALS_INVERT_H
{
File = "invert3d_h.bmp";
};
Bitmap BMP_TWO_SIDED_LIGHTING_H
{
File = "lght2sid_h.bmp";
};
Bitmap BMP_DOUBLE_SIDED_H
{
File = "doublesi_h.bmp";
};
Bitmap BMP_SHADOW_3D_H
{
File = "shadow3d_h.bmp";
};
Bitmap BMP_LIGHT_H
{
File = "light_h.bmp";
};
Bitmap BMP_LIGHT_COLOR_H
{
File = "colordlg_h.bmp";
};
Bitmap BMP_AMBIENT_COLOR_H
{
File = "colordlg_h.bmp";
};
Bitmap BMP_TEX_LUMINANCE_H
{
File = "luminanc_h.bmp";
};
Bitmap BMP_TEX_COLOR_H
{
File = "color_h.bmp";
};
Bitmap BMP_TEX_REPLACE_H
{
File = "replac3d_h.bmp";
};
Bitmap BMP_TEX_MODULATE_H
{
File = "modula3d_h.bmp";
};
Bitmap BMP_TEX_BLEND_H
{
File = "blend3d_h.bmp";
};
Bitmap BMP_TEX_OBJECT_H
{
File = "objspc3d_h.bmp";
};
Bitmap BMP_TEX_PARALLEL_H
{
File = "parallel_h.bmp";
};
Bitmap BMP_TEX_CIRCLE_H
{
File = "sphere3d_h.bmp";
};
Bitmap BMP_TEX_FILTER_H
{
File = "filter3d_h.bmp";
};
Bitmap BMP_COLORDLG_H
{
File = "colordlg_h.bmp";
};
}; };
Image RID_SVXIMAGE_LIGHT_ON Image RID_SVXIMAGE_LIGHT_ON
{ {
ImageBitmap = Bitmap { File = "lighton.bmp" ; }; ImageBitmap = Bitmap { File = "lighton.bmp" ; };
MaskColor = STD_MASKCOLOR ; MaskColor = STD_MASKCOLOR ;
}; };
Image RID_SVXIMAGE_LIGHT_OFF Image RID_SVXIMAGE_LIGHT_OFF
{ {
ImageBitmap = Bitmap { File = "light.bmp" ; }; ImageBitmap = Bitmap { File = "light.bmp" ; };
MaskColor = STD_MASKCOLOR ; MaskColor = STD_MASKCOLOR ;
}; };
Image RID_SVXIMAGE_LIGHT_ON_H
{
ImageBitmap = Bitmap { File = "lighton_h.bmp" ; };
MaskColor = STD_MASKCOLOR_HC ;
};
Image RID_SVXIMAGE_LIGHT_OFF_H
{
ImageBitmap = Bitmap { File = "light_h.bmp" ; };
MaskColor = STD_MASKCOLOR_HC ;
};
/*Image RID_SVXIMAGE_LIGHT_ON_SELECTED { /*Image RID_SVXIMAGE_LIGHT_ON_SELECTED {
ImageBitmap = Bitmap { File = "lightons.bmp" ; }; ImageBitmap = Bitmap { File = "lightons.bmp" ; };
MaskColor = STD_MASKCOLOR ; MaskColor = STD_MASKCOLOR ;
...@@ -3593,6 +3776,7 @@ String RID_SVXFLOAT3D_FIX_B ...@@ -3593,6 +3776,7 @@ String RID_SVXFLOAT3D_FIX_B
Text[ arabic ] = "B:"; Text[ arabic ] = "B:";
Text[ catalan ] = "A:"; Text[ catalan ] = "A:";
Text[ finnish ] = "B:"; Text[ finnish ] = "B:";
}; };
......
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