Commit: 309f06c4efcd90e70590dcefea00a4f8c0e30e6e
Author: Nick Wu
Date: Tue Jun 26 09:29:40 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB309f06c4efcd90e70590dcefea00a4f8c0e30e6e
rename LANPR_LineStyle into LANPR_LineLayer.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_all.h
M source/blender/draw/engines/lanpr/lanpr_ops.c
M source/blender/makesdna/DNA_lanpr_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_lanpr.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h
b/source/blender/draw/engines/lanpr/lanpr_all.h
index 31960875e30..b6d24e044ca 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -238,14 +238,6 @@ typedef struct LANPR_Data {
#define TNS_CALCULATION_OCCLUTION 4
#define TNS_CALCULATION_FINISHED 100
-#define TNS_OVERRIDE_DISPLAY_NULL 0
-#define TNS_OVERRIDE_DISPLAY_SHOW 1
-#define TNS_OVERRIDE_DISPLAY_HIDE 2
-#define TNS_OVERRIDE_DISPLAY_SWAP 3
-
-#define NUL_LINE_WIDTH_WARNING_TOO_WIDE 1
-#define NUL_LINE_WIDTH_WARNING_TOO_THIN 2
-
typedef struct LANPR_RenderTaskInfo {
//thrd_t ThreadHandle;
@@ -359,12 +351,12 @@ typedef struct LANPR_RenderBuffer {
nListHandle DrawCommands;
- //LANPR_RenderBufferPreviewNode RenderPreview[32];
+ //tnsRenderBufferPreviewNode RenderPreview[32];
struct Scene *Scene;
struct Object *Camera;
- //LANPR_RenderTriangles are in mesh object.
+ //tnsRenderTriangles are in mesh object.
}LANPR_RenderBuffer;
@@ -413,7 +405,7 @@ typedef struct LANPR_RenderVert {
struct LANPR_RenderLine *IntersectingLine;
struct LANPR_RenderLine *IntersectintLine2;
struct LANPR_RenderTriangle *IntersectWith; // Positive 1
Negative 0
- //LANPR_RenderTriangle* IntersectingOnFace; // <|
|>
+ //tnsRenderTriangle* IntersectingOnFace; // <|
|>
char Positive; // L---->|----->R
L---->|----->R
char EdgeUsed; // <|
|>
}LANPR_RenderVert;
@@ -424,7 +416,7 @@ typedef struct LANPR_RenderLine {
struct LANPR_RenderTriangle *TL, *TR;
nListHandle Segments;
//tnsEdge* Edge;//should be edge material
- //LANPR_RenderTriangle* Testing;//Should Be tRT** Testing[NumOfThreads]
+ //tnsRenderTriangle* Testing;//Should Be tRT** Testing[NumOfThreads]
char MinOcclude;
struct Object *ObjectRef;
//char IgnoreConnectedFace;
@@ -467,6 +459,53 @@ typedef struct LANPR_RenderSubPixel {
//#define TNS_OVERRIDE_ALL_OTHERS_IN_GROUP 3
//#define TNS_OVERRIDE_ALL_OTHERS 4
+typedef struct LANPR_RenderDrawCommand {
+ nListItem Item;
+ LANPR_RenderBuffer* ParentRB;
+
+ int Type;
+
+ nSafeString* Name;
+
+ tnsVector4d Color;
+ real Thickness;
+ int OccludeBegin, OccludeEnd;
+
+ int UseStipple;
+ u16bit StipplePattern;
+ u8bit StippleSize;
+ int DrawThisCommand;
+
+ int DrawContour;
+ int DrawCrease;
+ int DrawIntersections;
+ int DrawMaterialLines;
+
+ GLuint VBO;
+ GLuint NBO;
+ int VertCount;
+
+ int OverrideColor;
+ Material* MaterialRef;
+ nSafeString* ReadMaterialName;
+
+ Collection* OverrideGroup; // I'll correct the name to "collection"
later.
+ nSafeString* ReadGroupName;
+ int ExcludeGroup;
+
+ real NormalEdgeClamp;
+ real NormalEdgeStrength;
+ real DepthEdgeClamp;
+ real DepthEdgeStrength;
+
+ int ClearDepthBuffer;
+
+ int DepthTest;
+
+ int TransparencyMode;
+ real Transparency;
+}LANPR_RenderDrawCommand;
+
extern RenderEngineType DRW_engine_viewport_lanpr_type;
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c
b/source/blender/draw/engines/lanpr/lanpr_ops.c
index e291a028b93..92c6c87c925 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -2504,9 +2504,9 @@ LANPR_RenderBuffer *lanpr_CreateRenderBuffer(SceneLANPR
*lanpr) {
return rb;
}
-void lanpr_RebuildRenderDrawCommand(LANPR_RenderBuffer *rb, LANPR_LineStyle
*rdc);
+void lanpr_RebuildRenderDrawCommand(LANPR_RenderBuffer *rb, LANPR_LineLayer
*rdc);
-int lanpr_DrawEdgePreview(LANPR_RenderBuffer *rb, LANPR_LineStyle
*OverrideLayer, Collection *OverrideGroup,
+int lanpr_DrawEdgePreview(LANPR_RenderBuffer *rb, LANPR_LineLayer
*OverrideLayer, Collection *OverrideGroup,
real ThicknessScale, RenderEngine *e, GPUFrameBuffer
*Off) {
//too many errors. later....
}
@@ -2767,7 +2767,7 @@ u32bit lanpr_MakeBoundingAreaVBORecursive(float *V,
u32bit Begin, LANPR_Bounding
//}
-void lanpr_RebuildRenderDrawCommand(LANPR_RenderBuffer *rb, LANPR_LineStyle
*rdc) {
+void lanpr_RebuildRenderDrawCommand(LANPR_RenderBuffer *rb, LANPR_LineLayer
*rdc) {
int Count = 0;
int level;
float *V, *tv, *N;;
@@ -2845,7 +2845,7 @@ void lanpr_RebuildRenderDrawCommand(LANPR_RenderBuffer
*rb, LANPR_LineStyle *rdc
}
void lanpr_RebuildAllCommand(SceneLANPR *lanpr) {
- LANPR_LineStyle *rdc;
+ LANPR_LineLayer *rdc;
if (!lanpr) return;
//tnsCleanObjectFinishMarks(rb->Scene);
//for (rdc = lanpr->line_style_layers.pLast; rdc; rdc =
rdc->Item.pPrev) {
@@ -2906,8 +2906,8 @@ void SCENE_OT_lanpr_calculate_feature_lines(struct
wmOperatorType *ot){
ot->exec = lanpr_compute_feature_lines_exec;
}
-LANPR_LineStyle *lanpr_new_line_layer(SceneLANPR *lanpr){
- LANPR_LineStyle *ls = MEM_callocN(sizeof(LANPR_LineStyle), "Line
Style");
+LANPR_LineLayer *lanpr_new_line_layer(SceneLANPR *lanpr){
+ LANPR_LineLayer *ls = MEM_callocN(sizeof(LANPR_LineLayer), "Line
Style");
BLI_addtail(&lanpr->line_style_layers, ls);
lanpr->active_layer = ls;
return ls;
@@ -2925,7 +2925,7 @@ int lanpr_delete_line_layer_exec(struct bContext *C,
struct wmOperator *op) {
Scene *scene = CTX_data_scene(C);
SceneLANPR *lanpr = &scene->lanpr;
- LANPR_LineStyle *rdc = lanpr->active_layer;
+ LANPR_LineLayer *rdc = lanpr->active_layer;
if (!rdc) return OPERATOR_FINISHED;
@@ -2944,7 +2944,7 @@ int lanpr_move_line_layer_exec(struct bContext *C, struct
wmOperator *op) {
Scene *scene = CTX_data_scene(C);
SceneLANPR *lanpr = &scene->lanpr;
- LANPR_LineStyle *rdc = lanpr->active_layer;
+ LANPR_LineLayer *rdc = lanpr->active_layer;
if (!rdc) return OPERATOR_FINISHED;
@@ -2971,7 +2971,7 @@ int lanpr_auto_create_line_layer(struct bContext *C,
struct wmOperator *op) {
Scene *scene = CTX_data_scene(C);
SceneLANPR *lanpr = &scene->lanpr;
- LANPR_LineStyle *rdc;
+ LANPR_LineLayer *rdc;
rdc = lanpr_new_line_layer(lanpr);
rdc->thickness = 2;
diff --git a/source/blender/makesdna/DNA_lanpr_types.h
b/source/blender/makesdna/DNA_lanpr_types.h
index b13a3fc319c..8c6c6d2d85a 100644
--- a/source/blender/makesdna/DNA_lanpr_types.h
+++ b/source/blender/makesdna/DNA_lanpr_types.h
@@ -71,8 +71,8 @@ typedef struct LANPR_LineStyleComponent{
}LANPR_LineStyleComponent;
-typedef struct LANPR_LineStyle{
- struct LANPR_LineStyle *next, *prev;
+typedef struct LANPR_LineLayer{
+ struct LANPR_LineLayer *next, *prev;
int what;
@@ -112,6 +112,6 @@ typedef struct LANPR_LineStyle{
unsigned int NBO;
int VertCount;
-}LANPR_LineStyle;
+}LANPR_LineLayer;
#endif
\ No newline at end of file
diff --git a/source/blender/makesdna/DNA_scene_types.h
b/source/blender/makesdna/DNA_scene_types.h
index 3eb39861edd..ada0dfa7ac5 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1434,7 +1434,7 @@ typedef struct SceneEEVEE {
/* LANPR Global Config */
struct LANPR_RenderBuffer;
-struct LANPR_LineStyle;
+struct LANPR_LineLayer;
typedef struct SceneLANPR{
@@ -1504,7 +1504,7 @@ typedef struct SceneLANPR{
struct LANPR_RenderBuffer *render_buffer; /* created when needed.
for offline rendering */
ListBase line_style_layers; /* now here!!! */
- struct LANPR_LineStyle *active_layer;
+ struct LANPR_LineLayer *active_layer;
} SceneLANPR;
diff --git a/source/blender/makesrna/intern/rna_lanpr.c
b/source/blender/makesrna/intern/rna_lanpr.c
index cb2774ef426..1689a7d9718 100644
--- a/source/blender/makesrna/intern/rna_lanpr.c
+++ b/source/blender/makesrna/intern/rna_lanpr.c
@@ -89,9 +89,9 @@ void RNA_def_lanpr(BlenderRNA *brna){
- srna = RNA_def_struct(brna, "LANPR_LineStyle", NULL);
- RNA_def_struct_sdna(srna, "LANPR_LineStyle");
- RNA_def_struct_ui_text(srna, "Line Style", "LANPR_LineStyle layer");
+ srna = RNA_def_struct(brna, "LANPR_LineLayer", NULL);
+ RNA_def_struct_sdna(srna, "LANPR_LineLayer");
+ RNA_def_struct_ui_text(srna, "Line Layer", "LANPR_LineLayer");
prop = RNA_def_property(srna, "use_differnt_style", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_ui_text(prop, "Different Style", "Use different line
styles for differnt line types");
diff --git a/source/blender/makesrna/intern/rna_scene.c
b/source/blender/makesrna/intern/rna_scene.c
index 88fc3a04f41..bffb4486d3f 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2126,7 +2126,7 @@ void rna_lanpr_active_line_layer_index_range(
int rna_lanpr_active_line_layer_index_get(PointerRNA *ptr)
{
SceneLANPR *lanpr = (SceneLANPR *)ptr->data;
- LANPR_LineStyle* ls;
+ LANPR_LineLayer* ls;
int i=0;
for(ls = lanpr->line_style_layers.first;ls;ls=ls->next){
if(ls == lanpr->active_layer) return i;
@@ -2138,7 +2138,7 @@ int rna_lanpr_active_line_layer_index_get(PointerRNA *ptr)
void rna_lanpr_active_line_layer_index_set(PointerRNA *ptr, int value)
{
SceneLANPR *lanpr = (SceneLANPR *)ptr->data;
- LANPR_LineStyle* ls;
+ LANPR_LineLayer* ls;
int i=0;
for(ls = lanpr->line_style_layers.first;ls;ls=ls->next){
if(i==value){
@@ -2153,8 +2153,8 @@ void rna_lanpr_active_line_layer_index_set(PointerRNA
*ptr, int value)
PointerRNA rna_lanpr_active_line_layer_get(PointerRNA *ptr)
{
SceneLANPR *lanpr = (SceneLANPR *)ptr->data;
- LANPR_LineStyle *ls = lanpr->active_layer;
- return rna_pointer_inherit_refine(ptr, &RNA_LANPR_LineStyle, ls);
+ LANPR_LineLayer *ls = lanpr->active_layer;
+ return rna_pointer_inherit_refine(ptr, &RNA_LANPR_LineLayer, ls);
}
void rna_lanpr_active_line_layer_set(PointerRNA *ptr, PointerRNA value)
@@ -6401,7 +6401,7 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
RNA_def_property_update(prop, NC_SCENE, NULL);
- /* these shall go into LANPR_LineStyle layer */
+ /* these shall go into LANPR_LineLayer */
prop = RNA_def_property(srna, "en
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
