Bladeren bron

disable alpha when texture doesnt have alpha

Darragh Burke 5 jaren geleden
bovenliggende
commit
f24502ae49

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/materials/textures/textureEditorComponent.tsx

@@ -286,7 +286,7 @@ export class TextureEditorComponent extends React.Component<ITextureEditorCompon
 
 
     render() {
     render() {
         const currentTool : ITool | undefined = this.state.tools[this.state.activeToolIndex];
         const currentTool : ITool | undefined = this.state.tools[this.state.activeToolIndex];
-        
+
         return <div id="texture-editor" onPointerDown={this.onPointerDown}>
         return <div id="texture-editor" onPointerDown={this.onPointerDown}>
             <PropertiesBar
             <PropertiesBar
                 texture={this.props.texture}
                 texture={this.props.texture}
@@ -311,6 +311,7 @@ export class TextureEditorComponent extends React.Component<ITextureEditorCompon
                 pickerOpen={this.state.pickerOpen}
                 pickerOpen={this.state.pickerOpen}
                 setPickerOpen={this.setPickerOpen}
                 setPickerOpen={this.setPickerOpen}
                 pickerRef={this._pickerRef}
                 pickerRef={this._pickerRef}
+                hasAlpha={this.props.texture.hasAlpha}
             />}
             />}
             <ChannelsBar channels={this.state.channels} setChannels={(channels) => {this.setState({channels})}}/>
             <ChannelsBar channels={this.state.channels} setChannels={(channels) => {this.setState({channels})}}/>
             <TextureCanvasComponent canvas2D={this._2DCanvas} canvas3D={this._3DCanvas} canvasUI={this._UICanvas} texture={this.props.texture}/>
             <TextureCanvasComponent canvas2D={this._2DCanvas} canvas3D={this._3DCanvas} canvasUI={this._UICanvas} texture={this.props.texture}/>

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/materials/textures/toolBar.tsx

@@ -16,6 +16,7 @@ interface IToolBarProps {
     pickerOpen: boolean;
     pickerOpen: boolean;
     setPickerOpen(open: boolean): void;
     setPickerOpen(open: boolean): void;
     pickerRef: React.RefObject<HTMLDivElement>;
     pickerRef: React.RefObject<HTMLDivElement>;
+    hasAlpha: boolean;
 }
 }
 
 
 interface IToolBarState {
 interface IToolBarState {
@@ -75,7 +76,7 @@ export class ToolBar extends React.Component<IToolBarProps, IToolBarState> {
             {
             {
                 this.props.pickerOpen &&
                 this.props.pickerOpen &&
                 <div id='color-picker' ref={this.props.pickerRef}>
                 <div id='color-picker' ref={this.props.pickerRef}>
-                    <SketchPicker color={this.computeRGBAColor()}  onChange={color => this.props.setMetadata({color: color.hex, alpha: color.rgb.a})}/>
+                    <SketchPicker disableAlpha={!this.props.hasAlpha} color={this.computeRGBAColor()}  onChange={color => this.props.setMetadata({color: color.hex, alpha: color.rgb.a})}/>
                 </div>
                 </div>
             }
             }
         </div>;
         </div>;