Philipp Oeser
e5f139e99d
Editmode should display the original (non-evaluated) points unless there
is something like an "On Cage" option of a modifier [which none of the
curves modifiers have].
This was not the case since the introduction in rBe15320568a29.
So we now draw the editpoints from the original curves. This also means
that original and evaluated curves might not have the same number of
points, so we have to get independent of `proc_point_buf` since that
would possibly create vertexbuffers of different sizes (compared to the
original curves) which is not allowed for a single batch.
- remove the "pos" alias from the vertex buffer format of proc_point_buf
- instead, create a new "edit_points_pos" vertex buffer
- fill that with the original (un-evaluated) curves positions
- dont request `proc_point_buf` anymore
- rename the editpoints flags buffer to be more consistent
And since original and evaluated points might also be in completely
different positions, we also need to draw connecting lines between those
editpoints to not have them float in thin air. For drawing these in
editmode, a simple polyline was chosen (instead of drawing lines in a
resolution that is take from the old particle system -- which is not
depending on points even but has a hardcoded resolution that can only be
upped by the hair_subdiv scene render setting)
- create appropriate batch and indexbuffer for this
- positions vertex buffer can be reused
- reuse particle edit shader (instead of curve edi shader) to get
segment highlighting
{F14055436}
NOTE: this also removes the broken depth handling and instead makes it
work (also XRay is properly taken into account) by binding the correct
overlay framebuffer.
NOTE: to further clarify the distinction between curves drawing (that is
based on the old partice system drawing) and drawing in editmode, the
corresponding vertexbuffers have been moved out of CurvesEvalCache into
CurvesBatchCache directly.
NOTE: drawing the lines in editmode could be improved (taking the "real"
resolution of splines into account, but since this should happen on the
GPU in a compute shader, this is for later)
Potentionally fixes T101889.
Maniphest Tasks: T101889
Differential Revision: https://developer.blender.org/D16281
103 lines
3.0 KiB
C++
103 lines
3.0 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later
|
|
* Copyright 2017 Blender Foundation. All rights reserved. */
|
|
|
|
/** \file
|
|
* \ingroup draw
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "BKE_attribute.h"
|
|
#include "GPU_shader.h"
|
|
|
|
#include "draw_attributes.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct Curves;
|
|
struct GPUVertBuf;
|
|
struct GPUIndexBuf;
|
|
struct GPUBatch;
|
|
struct GPUTexture;
|
|
|
|
#define MAX_THICKRES 2 /* see eHairType */
|
|
#define MAX_HAIR_SUBDIV 4 /* see hair_subdiv rna */
|
|
|
|
typedef enum CurvesEvalShader {
|
|
CURVES_EVAL_CATMULL_ROM = 0,
|
|
CURVES_EVAL_BEZIER = 1,
|
|
} CurvesEvalShader;
|
|
#define CURVES_EVAL_SHADER_NUM 3
|
|
|
|
typedef struct CurvesEvalFinalCache {
|
|
/* Output of the subdivision stage: vertex buffer sized to subdiv level. */
|
|
GPUVertBuf *proc_buf;
|
|
|
|
/** Just contains a huge index buffer used to draw the final curves. */
|
|
GPUBatch *proc_hairs[MAX_THICKRES];
|
|
|
|
/** Points per curve, at least 2. */
|
|
int strands_res;
|
|
|
|
/** Attributes currently being drawn or about to be drawn. */
|
|
DRW_Attributes attr_used;
|
|
|
|
/**
|
|
* Attributes that were used at some point. This is used for garbage collection, to remove
|
|
* attributes that are not used in shaders anymore due to user edits.
|
|
*/
|
|
DRW_Attributes attr_used_over_time;
|
|
|
|
/**
|
|
* The last time in seconds that the `attr_used` and `attr_used_over_time` were exactly the same.
|
|
* If the delta between this time and the current scene time is greater than the timeout set in
|
|
* user preferences (`U.vbotimeout`) then garbage collection is performed.
|
|
*/
|
|
int last_attr_matching_time;
|
|
|
|
/* Output of the subdivision stage: vertex buffers sized to subdiv level. This is only attributes
|
|
* on point domain. */
|
|
GPUVertBuf *attributes_buf[GPU_MAX_ATTR];
|
|
} CurvesEvalFinalCache;
|
|
|
|
/* Curves procedural display: Evaluation is done on the GPU. */
|
|
typedef struct CurvesEvalCache {
|
|
/* Control point positions on evaluated data-block combined with parameter data. */
|
|
GPUVertBuf *proc_point_buf;
|
|
|
|
/** Info of control points strands (segment count and base index) */
|
|
GPUVertBuf *proc_strand_buf;
|
|
|
|
/* Curve length data. */
|
|
GPUVertBuf *proc_length_buf;
|
|
|
|
GPUVertBuf *proc_strand_seg_buf;
|
|
|
|
CurvesEvalFinalCache final[MAX_HAIR_SUBDIV];
|
|
|
|
/* For point attributes, which need subdivision, these buffers contain the input data.
|
|
* For curve domain attributes, which do not need subdivision, these are the final data. */
|
|
GPUVertBuf *proc_attributes_buf[GPU_MAX_ATTR];
|
|
|
|
int strands_len;
|
|
int elems_len;
|
|
int point_len;
|
|
} CurvesEvalCache;
|
|
|
|
/**
|
|
* Ensure all necessary textures and buffers exist for GPU accelerated drawing.
|
|
*/
|
|
bool curves_ensure_procedural_data(struct Curves *curves,
|
|
struct CurvesEvalCache **r_hair_cache,
|
|
struct GPUMaterial *gpu_material,
|
|
int subdiv,
|
|
int thickness_res);
|
|
|
|
void drw_curves_get_attribute_sampler_name(const char *layer_name, char r_sampler_name[32]);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|