Skip to content

Add on-canvas relight light shapes with 3D aim #1865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CyberTimon merged 2 commits into from
Oct 7, 2026
Merged

Add on-canvas relight light shapes with 3D aim #1865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68b14a3
add on-canvas relight light shapes with 3D aim
fabian-co Oct 7, 2026
4fd1f00
remove code comments from relight light shapes
fabian-co Oct 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src-tauri/src/relight.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ pub fn apply_relight<'a>(
let strength = get("intensity", 60.0).max(0.0) / 100.0 * 4.0 / luma.max(1e-3);
let radius = 0.05 + get("radius", 30.0) / 100.0 * 1.45;
let angle = get("angle", 135.0).to_radians();
let elevation = get("elevation", 60.0).clamp(0.0, 90.0).to_radians();
let elevation = get("elevation", 60.0).clamp(-180.0, 180.0).to_radians();
let (plane_x, plane_y) = (
angle.cos() * elevation.cos(),
-angle.sin() * elevation.cos(),
Expand Down
5 changes: 2 additions & 3 deletions src/components/adjustments/Effects.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,8 +670,8 @@ export default function EffectsPanel({

<Slider
label={t('adjustments.effects.relightElevation')}
max={90}
min={0}
max={180}
min={-180}
defaultValue={60}
onChange={(e: any) =>
handleLightChange('elevation', parseInt(e.target.value, 10))
Expand All @@ -680,7 +680,6 @@ export default function EffectsPanel({
suffix="掳"
value={activeLight.elevation}
onDragStateChange={onDragStateChange}
fillOrigin="min"
/>
</>
)}
Expand Down
85 changes: 53 additions & 32 deletions src/components/panel/editor/ImageCanvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
GuideOrientation,
RelightLight,
createRelightLight,
getRelightLightColor,
} from '../../../utils/adjustments';
import { Mask, SubMask, SubMaskMode, ToolType } from '../right/Masks';
import { AppSettings, BrushSettings, Invokes, SelectedImage } from '../../ui/AppProperties';
Expand All @@ -24,6 +23,7 @@ import { useTranslation } from 'react-i18next';
import { useEditorStore } from '../../../store/useEditorStore';
import type { OverlayMode } from '../right/CropPanel';
import CompositionOverlays from './overlays/CompositionOverlays';
import RelightLightShape, { RelightBasis } from './overlays/RelightLightShape';
import { calculateStraightenAngle } from '../../../utils/cropUtils';
import { toast } from 'react-toastify';
import {
Expand Down Expand Up @@ -2199,6 +2199,40 @@ const ImageCanvas = memo(
[mapCanvasPointToUv, setAdjustments],
);

const aimRelightLight = useCallback(
(id: string, angle: number, elevation: number) => {
setAdjustments((prev: Adjustments) => ({
...prev,
relightLights: (prev.relightLights || []).map((l: RelightLight) =>
l.id === id ? { ...l, angle, elevation } : l,
),
}));
},
[setAdjustments],
);

const relightBasis = useMemo((): RelightBasis => {
const width = selectedImage?.width || 1920;
const height = selectedImage?.height || 1080;
const longSide = Math.max(width, height);
const step = 0.01;
const origin = mapRelightUvToCanvas({ x: 0.5, y: 0.5 });
const px = mapRelightUvToCanvas({ x: 0.5 + (step * longSide) / width, y: 0.5 });
const py = mapRelightUvToCanvas({ x: 0.5, y: 0.5 + (step * longSide) / height });
return {
ex: { x: (px.x - origin.x) / step, y: (px.y - origin.y) / step },
ey: { x: (py.x - origin.x) / step, y: (py.y - origin.y) / step },
};
}, [mapRelightUvToCanvas, selectedImage?.width, selectedImage?.height]);

const showRelightLights =
isRelightPickerActive ||
(!!adjustments.relightEnabled &&
(adjustments.relightLights?.length ?? 0) > 0 &&
!isCropping &&
!isMasking &&
!isAiEditing);

useEffect(() => {
if (!isRelightPickerActive) return;

Expand Down Expand Up @@ -3507,7 +3541,7 @@ const ImageCanvas = memo(
</div>
</div>

{(isMasking || isAiEditing || isWbPickerActive || isRelightPickerActive) && (
{(isMasking || isAiEditing || isWbPickerActive || showRelightLights) && (
<div
style={{
position: 'absolute',
Expand Down Expand Up @@ -3627,36 +3661,23 @@ const ImageCanvas = memo(
zoomScale={effectiveZoomScale}
/>
)}
{isRelightPickerActive &&
(adjustments.relightLights || [])
.filter((light: RelightLight) => light.type !== 'directional')
.map((light: RelightLight) => {
const pos = mapRelightUvToCanvas(light);
return (
<Circle
key={light.id}
x={pos.x}
y={pos.y}
radius={(6 + (100 - light.depth) * 0.06) / effectiveZoomScale}
fill={getRelightLightColor(light)}
stroke={light.id === activeRelightLightId ? '#0ea5e9' : 'white'}
strokeWidth={2 / effectiveZoomScale}
shadowColor="black"
shadowBlur={4}
shadowOpacity={0.6}
draggable
onMouseDown={() => setEditor({ activeRelightLightId: light.id })}
onTouchStart={() => setEditor({ activeRelightLightId: light.id })}
onDragStart={() => setEditor({ isSliderDragging: true })}
onDragEnd={() => setEditor({ isSliderDragging: false })}
onDragMove={(e: any) =>
moveRelightLight(light.id, { x: e.target.x(), y: e.target.y() })
}
onMouseEnter={(e: any) => (e.target.getStage().container().style.cursor = 'move')}
onMouseLeave={(e: any) => (e.target.getStage().container().style.cursor = '')}
/>
);
})}
{showRelightLights &&
(adjustments.relightLights || []).map((light: RelightLight) => (
<RelightLightShape
key={light.id}
light={light}
pos={mapRelightUvToCanvas(light)}
basis={relightBasis}
zoomScale={effectiveZoomScale}
isActive={light.id === activeRelightLightId}
onSelect={() => setEditor({ activeRelightLightId: light.id })}
onMove={(pos) => moveRelightLight(light.id, pos)}
onAim={(angle, elevation) => aimRelightLight(light.id, angle, elevation)}
onDragStateChange={(isDragging) => setEditor({ isSliderDragging: isDragging })}
onHoverChange={setIsMaskHovered}
onTouchInteraction={() => setIsMaskTouchInteracting(true)}
/>
))}
{isBrushActive &&
cursorPreview.visible &&
(!isCloneOrHealActive ||
Expand Down
Loading