Compare commits
3 Commits
12ff9c1518
...
c1ae70282c
| Author | SHA1 | Date | |
|---|---|---|---|
|
c1ae70282c
|
|||
|
4c7b03dfb8
|
|||
|
144e8cc797
|
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 43 KiB |
@@ -6,15 +6,12 @@
|
|||||||
toneMapped: false
|
toneMapped: false
|
||||||
});
|
});
|
||||||
|
|
||||||
let lineColor = $state(colors.outline.clone().convertSRGBToLinear());
|
|
||||||
|
|
||||||
$effect.root(() => {
|
$effect.root(() => {
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (appSettings.value.theme === undefined) {
|
if (appSettings.value.theme === undefined) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
circleMaterial.color = colors.outline.clone().convertSRGBToLinear();
|
circleMaterial.color = colors.outline.clone().convertSRGBToLinear();
|
||||||
lineColor = colors.outline.clone().convertSRGBToLinear();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -35,6 +32,7 @@
|
|||||||
import { CubicBezierCurve } from 'three/src/extras/curves/CubicBezierCurve.js';
|
import { CubicBezierCurve } from 'three/src/extras/curves/CubicBezierCurve.js';
|
||||||
import { Vector2 } from 'three/src/math/Vector2.js';
|
import { Vector2 } from 'three/src/math/Vector2.js';
|
||||||
import { getGraphState } from '../graph-state.svelte';
|
import { getGraphState } from '../graph-state.svelte';
|
||||||
|
import MeshGradientLineMaterial from './MeshGradientLine/MeshGradientLineMaterial.svelte';
|
||||||
|
|
||||||
const graphState = getGraphState();
|
const graphState = getGraphState();
|
||||||
|
|
||||||
@@ -45,12 +43,17 @@
|
|||||||
y2: number;
|
y2: number;
|
||||||
z: number;
|
z: number;
|
||||||
id?: string;
|
id?: string;
|
||||||
|
inputType?: string;
|
||||||
|
outputType?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
const { x1, y1, x2, y2, z, id }: Props = $props();
|
const { x1, y1, x2, y2, z, inputType = 'unknown', outputType = 'unknown', id }: Props = $props();
|
||||||
|
|
||||||
const thickness = $derived(Math.max(0.001, 0.00082 * Math.exp(0.055 * z)));
|
const thickness = $derived(Math.max(0.001, 0.00082 * Math.exp(0.055 * z)));
|
||||||
|
|
||||||
|
const inputColor = $derived(graphState.colors.getColor(inputType));
|
||||||
|
const outputColor = $derived(graphState.colors.getColor(outputType));
|
||||||
|
|
||||||
let points = $state<Vector3[]>([]);
|
let points = $state<Vector3[]>([]);
|
||||||
|
|
||||||
let lastId: string | null = null;
|
let lastId: string | null = null;
|
||||||
@@ -106,9 +109,9 @@
|
|||||||
position.z={y1}
|
position.z={y1}
|
||||||
position.y={0.8}
|
position.y={0.8}
|
||||||
rotation.x={-Math.PI / 2}
|
rotation.x={-Math.PI / 2}
|
||||||
material={circleMaterial}
|
|
||||||
>
|
>
|
||||||
<T.CircleGeometry args={[0.5, 16]} />
|
<T.CircleGeometry args={[0.5, 16]} />
|
||||||
|
<T.MeshBasicMaterial color={inputColor} toneMapped={false} />
|
||||||
</T.Mesh>
|
</T.Mesh>
|
||||||
|
|
||||||
<T.Mesh
|
<T.Mesh
|
||||||
@@ -119,6 +122,7 @@
|
|||||||
material={circleMaterial}
|
material={circleMaterial}
|
||||||
>
|
>
|
||||||
<T.CircleGeometry args={[0.5, 16]} />
|
<T.CircleGeometry args={[0.5, 16]} />
|
||||||
|
<T.MeshBasicMaterial color={outputColor} toneMapped={false} />
|
||||||
</T.Mesh>
|
</T.Mesh>
|
||||||
|
|
||||||
{#if graphState.hoveredEdgeId === id}
|
{#if graphState.hoveredEdgeId === id}
|
||||||
@@ -126,7 +130,8 @@
|
|||||||
<MeshLineGeometry {points} />
|
<MeshLineGeometry {points} />
|
||||||
<MeshLineMaterial
|
<MeshLineMaterial
|
||||||
width={thickness * 5}
|
width={thickness * 5}
|
||||||
color={lineColor}
|
color={inputColor}
|
||||||
|
tonemapped={false}
|
||||||
opacity={0.5}
|
opacity={0.5}
|
||||||
transparent
|
transparent
|
||||||
/>
|
/>
|
||||||
@@ -135,5 +140,10 @@
|
|||||||
|
|
||||||
<T.Mesh position.x={x1} position.z={y1} position.y={0.1}>
|
<T.Mesh position.x={x1} position.z={y1} position.y={0.1}>
|
||||||
<MeshLineGeometry {points} />
|
<MeshLineGeometry {points} />
|
||||||
<MeshLineMaterial width={thickness} color={lineColor} />
|
<MeshGradientLineMaterial
|
||||||
|
width={thickness}
|
||||||
|
colorStart={inputColor}
|
||||||
|
colorEnd={outputColor}
|
||||||
|
tonemapped={false}
|
||||||
|
/>
|
||||||
</T.Mesh>
|
</T.Mesh>
|
||||||
|
|||||||
@@ -0,0 +1,112 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { T, useThrelte } from '@threlte/core';
|
||||||
|
import { Color, ShaderMaterial, Vector2 } from 'three';
|
||||||
|
import fragmentShader from './fragment.frag';
|
||||||
|
import type { MeshLineMaterialProps } from './types';
|
||||||
|
import vertexShader from './vertex.vert';
|
||||||
|
|
||||||
|
let {
|
||||||
|
opacity = 1,
|
||||||
|
colorStart = '#ffffff',
|
||||||
|
colorEnd = '#ffffff',
|
||||||
|
dashOffset = 0,
|
||||||
|
dashArray = 0,
|
||||||
|
dashRatio = 0,
|
||||||
|
attenuate = true,
|
||||||
|
width = 1,
|
||||||
|
scaleDown = 0,
|
||||||
|
alphaMap,
|
||||||
|
ref = $bindable(),
|
||||||
|
children,
|
||||||
|
...props
|
||||||
|
}: MeshLineMaterialProps = $props();
|
||||||
|
|
||||||
|
let { invalidate, size } = useThrelte();
|
||||||
|
|
||||||
|
// svelte-ignore state_referenced_locally
|
||||||
|
const uniforms = {
|
||||||
|
lineWidth: { value: width },
|
||||||
|
colorStart: { value: new Color(colorStart) },
|
||||||
|
colorEnd: { value: new Color(colorEnd) },
|
||||||
|
opacity: { value: opacity },
|
||||||
|
resolution: { value: new Vector2(1, 1) },
|
||||||
|
sizeAttenuation: { value: attenuate ? 1 : 0 },
|
||||||
|
dashArray: { value: dashArray },
|
||||||
|
useDash: { value: dashArray > 0 ? 1 : 0 },
|
||||||
|
dashOffset: { value: dashOffset },
|
||||||
|
dashRatio: { value: dashRatio },
|
||||||
|
scaleDown: { value: scaleDown / 10 },
|
||||||
|
alphaTest: { value: 0 },
|
||||||
|
alphaMap: { value: alphaMap },
|
||||||
|
useAlphaMap: { value: alphaMap ? 1 : 0 }
|
||||||
|
};
|
||||||
|
|
||||||
|
const material = new ShaderMaterial({ uniforms });
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.lineWidth.value = width;
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.opacity.value = opacity;
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.resolution.value.set($size.width, $size.height);
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.sizeAttenuation.value = attenuate ? 1 : 0;
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.dashArray.value = dashArray;
|
||||||
|
uniforms.useDash.value = dashArray > 0 ? 1 : 0;
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.dashOffset.value = dashOffset;
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.dashRatio.value = dashRatio;
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.scaleDown.value = scaleDown / 10;
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.alphaMap.value = alphaMap;
|
||||||
|
uniforms.useAlphaMap.value = alphaMap ? 1 : 0;
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.colorStart.value.set(colorStart);
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect.pre(() => {
|
||||||
|
uniforms.colorEnd.value.set(colorEnd);
|
||||||
|
invalidate();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<T
|
||||||
|
is={material}
|
||||||
|
bind:ref
|
||||||
|
{fragmentShader}
|
||||||
|
{vertexShader}
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
{@render children?.({ ref: material })}
|
||||||
|
</T>
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
uniform vec3 colorStart;
|
||||||
|
uniform vec3 colorEnd;
|
||||||
|
|
||||||
|
uniform float useDash;
|
||||||
|
uniform float dashArray;
|
||||||
|
uniform float dashOffset;
|
||||||
|
uniform float dashRatio;
|
||||||
|
uniform sampler2D alphaMap;
|
||||||
|
uniform float useAlphaMap;
|
||||||
|
|
||||||
|
varying vec2 vUV;
|
||||||
|
varying vec4 vColor;
|
||||||
|
varying float vCounters;
|
||||||
|
|
||||||
|
vec4 CustomLinearTosRGB( in vec4 value ) {
|
||||||
|
return vec4( mix( pow( value.rgb, vec3( 0.41666 ) ) * 1.055 - vec3( 0.055 ), value.rgb * 12.92, vec3( lessThanEqual( value.rgb, vec3( 0.0031308 ) ) ) ), value.a );
|
||||||
|
}
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
|
||||||
|
vec4 c = mix(vec4(colorStart,1.0),vec4(colorEnd, 1.0), vCounters);
|
||||||
|
|
||||||
|
if( useAlphaMap == 1. ) c.a *= texture2D( alphaMap, vUV ).r;
|
||||||
|
|
||||||
|
if( useDash == 1. ){
|
||||||
|
c.a *= ceil(mod(vCounters + dashOffset, dashArray) - (dashArray * dashRatio));
|
||||||
|
}
|
||||||
|
|
||||||
|
gl_FragColor = CustomLinearTosRGB(c);
|
||||||
|
}
|
||||||
68
app/src/lib/graph-interface/edges/MeshGradientLine/types.ts
Normal file
68
app/src/lib/graph-interface/edges/MeshGradientLine/types.ts
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
import type { Props } from '@threlte/core';
|
||||||
|
import type { BufferGeometry, Vector3 } from 'three';
|
||||||
|
import type { ColorRepresentation, ShaderMaterial, Texture } from 'three';
|
||||||
|
|
||||||
|
export type MeshLineGeometryProps = Props<BufferGeometry> & {
|
||||||
|
/**
|
||||||
|
* @default []
|
||||||
|
*/
|
||||||
|
points: Vector3[];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @default 'none'
|
||||||
|
*/
|
||||||
|
shape?: 'none' | 'taper' | 'custom';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @default () => 1
|
||||||
|
*/
|
||||||
|
shapeFunction?: (p: number) => number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type MeshLineMaterialProps =
|
||||||
|
& Omit<
|
||||||
|
Props<ShaderMaterial>,
|
||||||
|
'uniforms' | 'fragmentShader' | 'vertexShader'
|
||||||
|
>
|
||||||
|
& {
|
||||||
|
/**
|
||||||
|
* @default 1
|
||||||
|
*/
|
||||||
|
opacity?: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @default '#ffffff'
|
||||||
|
*/
|
||||||
|
color?: ColorRepresentation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @default 0
|
||||||
|
*/
|
||||||
|
dashOffset?: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @default 0
|
||||||
|
*/
|
||||||
|
dashArray?: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @default 0
|
||||||
|
*/
|
||||||
|
dashRatio?: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @default true
|
||||||
|
*/
|
||||||
|
attenuate?: boolean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @default 1
|
||||||
|
*/
|
||||||
|
width?: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @default 0
|
||||||
|
*/
|
||||||
|
scaleDown?: number;
|
||||||
|
alphaMap?: Texture | undefined;
|
||||||
|
};
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
attribute vec3 previous;
|
||||||
|
attribute vec3 next;
|
||||||
|
attribute float side;
|
||||||
|
attribute float width;
|
||||||
|
attribute float counters;
|
||||||
|
|
||||||
|
uniform vec2 resolution;
|
||||||
|
uniform float lineWidth;
|
||||||
|
uniform vec3 color;
|
||||||
|
uniform float opacity;
|
||||||
|
uniform float sizeAttenuation;
|
||||||
|
uniform float scaleDown;
|
||||||
|
|
||||||
|
varying vec2 vUV;
|
||||||
|
varying vec4 vColor;
|
||||||
|
varying float vCounters;
|
||||||
|
|
||||||
|
vec2 intoScreen(vec4 i) {
|
||||||
|
return resolution * (0.5 * i.xy / i.w + 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
float aspect = resolution.y / resolution.x;
|
||||||
|
|
||||||
|
mat4 m = projectionMatrix * modelViewMatrix;
|
||||||
|
|
||||||
|
vec4 currentClip = m * vec4( position, 1.0 );
|
||||||
|
vec4 prevClip = m * vec4( previous, 1.0 );
|
||||||
|
vec4 nextClip = m * vec4( next, 1.0 );
|
||||||
|
|
||||||
|
vec4 currentNormed = currentClip / currentClip.w;
|
||||||
|
vec4 prevNormed = prevClip / prevClip.w;
|
||||||
|
vec4 nextNormed = nextClip / nextClip.w;
|
||||||
|
|
||||||
|
vec2 currentScreen = intoScreen(currentNormed);
|
||||||
|
vec2 prevScreen = intoScreen(prevNormed);
|
||||||
|
vec2 nextScreen = intoScreen(nextNormed);
|
||||||
|
|
||||||
|
float actualWidth = lineWidth * width;
|
||||||
|
|
||||||
|
vec2 dir;
|
||||||
|
if(nextScreen == currentScreen) {
|
||||||
|
dir = normalize( currentScreen - prevScreen );
|
||||||
|
} else if(prevScreen == currentScreen) {
|
||||||
|
dir = normalize( nextScreen - currentScreen );
|
||||||
|
} else {
|
||||||
|
vec2 inDir = currentScreen - prevScreen;
|
||||||
|
vec2 outDir = nextScreen - currentScreen;
|
||||||
|
vec2 fullDir = nextScreen - prevScreen;
|
||||||
|
|
||||||
|
if(length(fullDir) > 0.0) {
|
||||||
|
dir = normalize(fullDir);
|
||||||
|
} else if(length(inDir) > 0.0){
|
||||||
|
dir = normalize(inDir);
|
||||||
|
} else {
|
||||||
|
dir = normalize(outDir);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
vec2 normal = vec2(-dir.y, dir.x);
|
||||||
|
|
||||||
|
if(sizeAttenuation != 0.0) {
|
||||||
|
normal /= currentClip.w;
|
||||||
|
normal *= min(resolution.x, resolution.y);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (scaleDown > 0.0) {
|
||||||
|
float dist = length(nextNormed - prevNormed);
|
||||||
|
normal *= smoothstep(0.0, scaleDown, dist);
|
||||||
|
}
|
||||||
|
|
||||||
|
vec2 offsetInScreen = actualWidth * normal * side * 0.5;
|
||||||
|
|
||||||
|
vec2 withOffsetScreen = currentScreen + offsetInScreen;
|
||||||
|
vec3 withOffsetNormed = vec3((2.0 * withOffsetScreen/resolution - 1.0), currentNormed.z);
|
||||||
|
|
||||||
|
vCounters = counters;
|
||||||
|
vColor = vec4( color, opacity );
|
||||||
|
vUV = uv;
|
||||||
|
|
||||||
|
gl_Position = currentClip.w * vec4(withOffsetNormed, 1.0);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ import { getContext, setContext } from 'svelte';
|
|||||||
import { SvelteMap, SvelteSet } from 'svelte/reactivity';
|
import { SvelteMap, SvelteSet } from 'svelte/reactivity';
|
||||||
import type { OrthographicCamera, Vector3 } from 'three';
|
import type { OrthographicCamera, Vector3 } from 'three';
|
||||||
import type { GraphManager } from './graph-manager.svelte';
|
import type { GraphManager } from './graph-manager.svelte';
|
||||||
|
import { ColorGenerator } from './graph/colors';
|
||||||
import { getNodeHeight, getSocketPosition } from './helpers/nodeHelpers';
|
import { getNodeHeight, getSocketPosition } from './helpers/nodeHelpers';
|
||||||
|
|
||||||
const graphStateKey = Symbol('graph-state');
|
const graphStateKey = Symbol('graph-state');
|
||||||
@@ -28,7 +29,32 @@ type EdgeData = {
|
|||||||
points: Vector3[];
|
points: Vector3[];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const predefinedColors = {
|
||||||
|
path: {
|
||||||
|
hue: 80,
|
||||||
|
lightness: 20,
|
||||||
|
saturation: 80
|
||||||
|
},
|
||||||
|
float: {
|
||||||
|
hue: 70,
|
||||||
|
lightness: 10,
|
||||||
|
saturation: 0
|
||||||
|
},
|
||||||
|
geometry: {
|
||||||
|
hue: 0,
|
||||||
|
lightness: 50,
|
||||||
|
saturation: 70
|
||||||
|
},
|
||||||
|
'*': {
|
||||||
|
hue: 200,
|
||||||
|
lightness: 20,
|
||||||
|
saturation: 100
|
||||||
|
}
|
||||||
|
} as const;
|
||||||
|
|
||||||
export class GraphState {
|
export class GraphState {
|
||||||
|
colors = new ColorGenerator(predefinedColors);
|
||||||
|
|
||||||
constructor(private graph: GraphManager) {
|
constructor(private graph: GraphManager) {
|
||||||
$effect.root(() => {
|
$effect.root(() => {
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
|
|||||||
@@ -95,6 +95,13 @@
|
|||||||
graphState.activeSocket = null;
|
graphState.activeSocket = null;
|
||||||
graphState.addMenuPosition = null;
|
graphState.addMenuPosition = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getSocketType(node: NodeInstance, index: number | string): string {
|
||||||
|
if (typeof index === 'string') {
|
||||||
|
return node.state.type?.inputs?.[index].type || 'unknown';
|
||||||
|
}
|
||||||
|
return node.state.type?.outputs?.[index] || 'unknown';
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:window
|
<svelte:window
|
||||||
@@ -175,6 +182,8 @@
|
|||||||
{#if graphState.activeSocket}
|
{#if graphState.activeSocket}
|
||||||
<EdgeEl
|
<EdgeEl
|
||||||
z={graphState.cameraPosition[2]}
|
z={graphState.cameraPosition[2]}
|
||||||
|
inputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index)}
|
||||||
|
outputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index)}
|
||||||
x1={graphState.activeSocket.position[0]}
|
x1={graphState.activeSocket.position[0]}
|
||||||
y1={graphState.activeSocket.position[1]}
|
y1={graphState.activeSocket.position[1]}
|
||||||
x2={graphState.edgeEndPosition?.[0] ?? graphState.mousePosition[0]}
|
x2={graphState.edgeEndPosition?.[0] ?? graphState.mousePosition[0]}
|
||||||
@@ -187,6 +196,8 @@
|
|||||||
<EdgeEl
|
<EdgeEl
|
||||||
id={graph.getEdgeId(edge)}
|
id={graph.getEdgeId(edge)}
|
||||||
z={graphState.cameraPosition[2]}
|
z={graphState.cameraPosition[2]}
|
||||||
|
inputType={getSocketType(edge[0], edge[1])}
|
||||||
|
outputType={getSocketType(edge[2], edge[3])}
|
||||||
{x1}
|
{x1}
|
||||||
{y1}
|
{y1}
|
||||||
{x2}
|
{x2}
|
||||||
|
|||||||
45
app/src/lib/graph-interface/graph/colors.ts
Normal file
45
app/src/lib/graph-interface/graph/colors.ts
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
type Color = { hue: number; saturation: number; lightness: number };
|
||||||
|
|
||||||
|
export class ColorGenerator {
|
||||||
|
private colors: Map<string, Color> = new Map();
|
||||||
|
private lightnessLevels = [10, 60];
|
||||||
|
|
||||||
|
constructor(predefined: Record<string, Color>) {
|
||||||
|
for (const [id, colorStr] of Object.entries(predefined)) {
|
||||||
|
this.colors.set(id, colorStr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public getColor(id: string): string {
|
||||||
|
if (this.colors.has(id)) {
|
||||||
|
return this.colorToHsl(this.colors.get(id)!);
|
||||||
|
}
|
||||||
|
|
||||||
|
const newColor = this.generateNewColor();
|
||||||
|
this.colors.set(id, newColor);
|
||||||
|
console.log(id, newColor);
|
||||||
|
return this.colorToHsl(newColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
private generateNewColor(): Color {
|
||||||
|
const existingHues = Array.from(this.colors.values()).map(c => c.hue).sort();
|
||||||
|
let hue = existingHues[0];
|
||||||
|
let attempts = 0;
|
||||||
|
|
||||||
|
while (
|
||||||
|
existingHues.some(h => Math.abs(h - hue) < 30 || Math.abs(h - hue) > 330)
|
||||||
|
&& attempts < 360
|
||||||
|
) {
|
||||||
|
hue = (hue + 30) % 360;
|
||||||
|
attempts++;
|
||||||
|
}
|
||||||
|
|
||||||
|
const lightness = 60;
|
||||||
|
|
||||||
|
return { hue, lightness, saturation: 100 };
|
||||||
|
}
|
||||||
|
|
||||||
|
private colorToHsl(c: Color): string {
|
||||||
|
return `hsl(${c.hue}, ${c.saturation}%, ${c.lightness}%)`;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { appSettings } from '$lib/settings/app-settings.svelte';
|
import { appSettings } from '$lib/settings/app-settings.svelte';
|
||||||
import type { NodeInstance } from '@nodarium/types';
|
import type { NodeInstance, Socket } from '@nodarium/types';
|
||||||
import { getGraphState } from '../graph-state.svelte';
|
import { getGraphState } from '../graph-state.svelte';
|
||||||
import { createNodePath } from '../helpers/index.js';
|
import { createNodePath } from '../helpers/index.js';
|
||||||
import { getSocketPosition } from '../helpers/nodeHelpers';
|
import { getSocketPosition } from '../helpers/nodeHelpers';
|
||||||
@@ -45,9 +45,27 @@
|
|||||||
aspectRatio
|
aspectRatio
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const socketId = $derived(`${node.id}-${0}`);
|
||||||
|
|
||||||
|
function getSocketType(s: Socket | null) {
|
||||||
|
if (!s) return 'unknown';
|
||||||
|
if (typeof s.index === 'string') {
|
||||||
|
return s.node.state.type?.inputs?.[s.index].type || 'unknown';
|
||||||
|
}
|
||||||
|
return s.node.state.type?.outputs?.[s.index] || 'unknown';
|
||||||
|
}
|
||||||
|
const socketType = $derived(getSocketType(graphState.activeSocket));
|
||||||
|
const hoverColor = $derived(graphState.colors.getColor(socketType));
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="wrapper" data-node-id={node.id} data-node-type={node.type}>
|
<div
|
||||||
|
class="wrapper"
|
||||||
|
data-node-id={node.id}
|
||||||
|
data-node-type={node.type}
|
||||||
|
style:--socket-color={hoverColor}
|
||||||
|
class:possible-socket={graphState?.possibleSocketIds.has(socketId)}
|
||||||
|
>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
{#if appSettings.value.debug.advancedMode}
|
{#if appSettings.value.debug.advancedMode}
|
||||||
<span class="bg-white text-black! mr-2 px-1 rounded-sm opacity-30">{node.id}</span>
|
<span class="bg-white text-black! mr-2 px-1 rounded-sm opacity-30">{node.id}</span>
|
||||||
@@ -55,7 +73,7 @@
|
|||||||
{node.type.split('/').pop()}
|
{node.type.split('/').pop()}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="click-target"
|
class="target"
|
||||||
role="button"
|
role="button"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
onmousedown={handleMouseDown}
|
onmousedown={handleMouseDown}
|
||||||
@@ -83,7 +101,20 @@
|
|||||||
height: 50px;
|
height: 50px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.click-target {
|
.possible-socket .target::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
width: 30px;
|
||||||
|
height: 30px;
|
||||||
|
border-radius: 100%;
|
||||||
|
box-shadow: 0px 0px 10px var(--socket-color);
|
||||||
|
background-color: var(--socket-color);
|
||||||
|
outline: solid thin var(--socket-color);
|
||||||
|
opacity: 0.7;
|
||||||
|
z-index: -10;
|
||||||
|
}
|
||||||
|
|
||||||
|
.target {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0px;
|
right: 0px;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
@@ -94,7 +125,7 @@
|
|||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.click-target:hover + svg path {
|
.target:hover + svg path {
|
||||||
d: var(--hover-path);
|
d: var(--hover-path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { NodeInput, NodeInstance } from '@nodarium/types';
|
import type { NodeInput, NodeInstance, Socket } from '@nodarium/types';
|
||||||
import { getGraphManager, getGraphState } from '../graph-state.svelte';
|
import { getGraphManager, getGraphState } from '../graph-state.svelte';
|
||||||
import { createNodePath } from '../helpers';
|
import { createNodePath } from '../helpers';
|
||||||
import { getParameterHeight, getSocketPosition } from '../helpers/nodeHelpers';
|
import { getParameterHeight, getSocketPosition } from '../helpers/nodeHelpers';
|
||||||
@@ -60,6 +60,17 @@
|
|||||||
aspectRatio
|
aspectRatio
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
function getSocketType(s: Socket | null) {
|
||||||
|
if (!s) return 'unknown';
|
||||||
|
if (typeof s.index === 'string') {
|
||||||
|
return s.node.state.type?.inputs?.[s.index].type || 'unknown';
|
||||||
|
}
|
||||||
|
return s.node.state.type?.outputs?.[s.index] || 'unknown';
|
||||||
|
}
|
||||||
|
|
||||||
|
const socketType = $derived(getSocketType(graphState.activeSocket));
|
||||||
|
const hoverColor = $derived(graphState.colors.getColor(socketType));
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -67,6 +78,7 @@
|
|||||||
data-node-type={node.type}
|
data-node-type={node.type}
|
||||||
data-node-input={id}
|
data-node-input={id}
|
||||||
style:height="{height}px"
|
style:height="{height}px"
|
||||||
|
style:--socket-color={hoverColor}
|
||||||
class:possible-socket={graphState?.possibleSocketIds.has(socketId)}
|
class:possible-socket={graphState?.possibleSocketIds.has(socketId)}
|
||||||
>
|
>
|
||||||
{#key id && graphId}
|
{#key id && graphId}
|
||||||
@@ -95,10 +107,8 @@
|
|||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
viewBox="0 0 100 100"
|
viewBox="0 0 100 100"
|
||||||
preserveAspectRatio="none"
|
preserveAspectRatio="none"
|
||||||
style={`
|
style:--path={`path("${path}")`}
|
||||||
--path: path("${path}");
|
style:--hover-path={`path("${pathHover}")`}
|
||||||
--hover-path: path("${pathHover}");
|
|
||||||
`}
|
|
||||||
>
|
>
|
||||||
<path vector-effect="non-scaling-stroke"></path>
|
<path vector-effect="non-scaling-stroke"></path>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -120,9 +130,16 @@
|
|||||||
transform: translateY(-50%) translateX(-50%);
|
transform: translateY(-50%) translateX(-50%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.possible-socket .target {
|
.possible-socket .target::before {
|
||||||
box-shadow: 0px 0px 10px rgba(255, 255, 255, 0.5);
|
content: "";
|
||||||
background-color: rgba(255, 255, 255, 0.2);
|
position: absolute;
|
||||||
|
width: 30px;
|
||||||
|
height: 30px;
|
||||||
|
border-radius: 100%;
|
||||||
|
box-shadow: 0px 0px 10px var(--socket-color);
|
||||||
|
background-color: var(--socket-color);
|
||||||
|
outline: solid thin var(--socket-color);
|
||||||
|
opacity: 0.5;
|
||||||
z-index: -10;
|
z-index: -10;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,11 +149,12 @@
|
|||||||
|
|
||||||
.content {
|
.content {
|
||||||
position: relative;
|
position: relative;
|
||||||
padding: 10px 20px;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
padding-inline: 20px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
justify-content: space-around;
|
justify-content: center;
|
||||||
|
gap: 10px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user