WIP: OK Color #107933

Draft

Jorijn de Graaf wants to merge 7 commits from bonj/blender:ok-color into main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.

Jorijn de Graaf commented

2023-05-15 01:36:44 +02:00

Contributor

OK HSV / HSL for color pickers.

OK HSV / HSL for color pickers.

Jorijn de Graaf added 1 commit 2023-05-15 01:36:54 +02:00

69dd42a693 OK Color initial implementation

The foundation is there, with a proper external module and build option.
Björn Ottosson's original code is a CPP header; I ported it to C with a header that only exposes the desired functions. I might add a diff for this later to keep track of changes.
The actual integration of these functions into Blender's color math is hacky and doesn't work properly, which is what I intend to work on next.

Jorijn de Graaf added 1 commit 2023-05-15 01:39:08 +02:00

3e2bb51767 Merge branch 'main' into ok-color

YimingWu reviewed 2023-05-15 07:39:40 +02:00

source/blender/blenlib/intern/math_color.c

						
				@ -13,2 +16,4 @@

				void hsv_to_rgb(float h, float s, float v, float *r_r, float *r_g, float *r_b)

				{

				#ifdef WITH_OK_COLOR

YimingWu commented

2023-05-15 07:39:40 +02:00

Member

We probably do not want to have a #ifdef here in such a generic color function because this is not only used in the color picker, but also other parts of Blender.

Also, We probably would like to have an additional option for the user to choose which style of the color picker do they want to use, it's better to expose there (see static const EnumPropertyItem color_picker_types[]). But then you will also probably need to deal with a little bit shader for the actual circle to be drawn correctly.

Additionally, The widget display/value conversion should (already?) follow viewport color management.

We probably do not want to have a `#ifdef` here in such a generic color function because this is not only used in the color picker, but also other parts of Blender. Also, We probably would like to have an additional option for the user to choose which style of the color picker do they want to use, it's better to expose there (see `static const EnumPropertyItem color_picker_types[]`). But then you will also probably need to deal with a little bit shader for the actual circle to be drawn correctly. Additionally, The widget display/value conversion should (already?) follow viewport color management.

Jorijn de Graaf commented

2023-05-15 13:50:34 +02:00

Author

Contributor

I did it like this because I hadn't found a better way yet.
It's a draft for a reason haha.
Thanks for the tips, I'll try to make it an option.

I did it like this because I hadn't found a better way yet. It's a draft for a reason haha. Thanks for the tips, I'll try to make it an option.

YimingWu added the

label 2023-05-15 07:55:04 +02:00

Jorijn de Graaf added 3 commits 2023-05-16 01:10:41 +02:00

51297be341 Remove unnecessary spaces in include

I don't know how this got here but it's bothering me.
It doesn't really matter as this isn't the right place to do this anyway but it doesn't hurt to fix either.

2642b455fd Clamp sRGB to OK HSV/L and do NaN checks

This is roughly the same I did for Godot, but built into the ok_color functions themselves.
Having these functions return only valid numbers makes life a lot easier.

221f28a785 Add options for OK HSL and OK HSV color circle

Not used yet but it's a start.

Jorijn de Graaf added 1 commit 2023-05-16 01:46:41 +02:00

9af9c73c34 Make ok_color functions similar to math_color

You no longer need to use the structs to use these functions.
The clamping and NaN checks are done in the new functions, to keep the rest of the code closer to the original.
The actual calling of these functions is still done in math_color.c, which is definitely the wrong place; one step at a time.

Jorijn de Graaf commented

2023-05-16 02:11:08 +02:00

Author

Contributor

Blender has a "perceptually linear color space" for color pickers, which gives strange results in combination with OK color, so I'll need to figure out how to turn that off.

Blender has a "perceptually linear color space" for color pickers, which gives strange results in combination with OK color, so I'll need to figure out how to turn that off.

Jorijn de Graaf added 1 commit 2023-05-22 23:58:03 +02:00

025c076ade Merge branch 'main' into ok-color

This pull request has changes conflicting with the target branch.

source/blender/makesrna/intern/rna_userdef.c

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u ok-color:bonj-ok-color

git checkout bonj-ok-color

Sign in to join this conversation.

No reviewers

No Label

Animation & Rigging

Asset Browser Project Overview

Automated Testing

Blender Asset Bundle

Dependency Graph

Development Management

EEVEE & Viewport

Images & Movies

Motion Tracking

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Render Pipeline

Sculpt, Paint & Texture

Video Sequencer

Virtual Reality

Blender 2.8 Project

Milestone 1: Basic, Local Asset Browser

Good First Issue

Animation & Rigging

Development Management

EEVEE & Viewport

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Sculpt, Paint & Texture

Needs Info from Developers

Needs Information from User

No Milestone

No project

No Assignees

2 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#107933

No description provided.