Revision: 17462
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17462
Author: blendix
Date: 2008-11-14 19:46:57 +0100 (Fri, 14 Nov 2008)
Log Message:
-----------
RNA
* Rename cname to identifier.
* Rename PropertyEnumItem to EnumPropertyItem.
* Wrapped min/max/step/precision, pointer type for RNA.
* Draw FLT_MAX a bit better in buttons.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface.c
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/RNA_define.h
branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_dependency.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2008-11-14 17:33:15 UTC (rev 17461)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2008-11-14 18:46:57 UTC (rev 17462)
@@ -27,6 +27,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#include <float.h>
#include <math.h>
#include <string.h>
@@ -1514,7 +1515,9 @@
value= ui_get_but_val(but);
if(ui_is_but_float(but)) {
- if(but->a2) { /* amount of digits defined */
+ if(value == FLT_MAX) sprintf(but->drawstr, "%sFLT_MAX",
but->str);
+ else if(value == -FLT_MAX) sprintf(but->drawstr,
"%s-FLT_MAX", but->str);
+ else if(but->a2) { /* amount of digits defined */
if(but->a2==1) sprintf(but->drawstr, "%s%.1f",
but->str, value);
else if(but->a2==2) sprintf(but->drawstr,
"%s%.2f", but->str, value);
else if(but->a2==3) sprintf(but->drawstr,
"%s%.3f", but->str, value);
@@ -2261,7 +2264,7 @@
break;
}
case PROP_ENUM: {
- const PropertyEnumItem *item;
+ const EnumPropertyItem *item;
DynStr *dynstr;
char *menu;
int i, totitem;
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2008-11-14 17:33:15 UTC (rev 17461)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2008-11-14 18:46:57 UTC (rev 17462)
@@ -39,7 +39,7 @@
/* Structs */
-const char *RNA_struct_cname(PointerRNA *ptr);
+const char *RNA_struct_identifier(PointerRNA *ptr);
const char *RNA_struct_ui_name(PointerRNA *ptr);
PropertyRNA *RNA_struct_name_property(PointerRNA *ptr);
@@ -52,7 +52,7 @@
/* Property Information */
-const char *RNA_property_cname(PropertyRNA *prop, PointerRNA *ptr);
+const char *RNA_property_identifier(PropertyRNA *prop, PointerRNA *ptr);
PropertyType RNA_property_type(PropertyRNA *prop, PointerRNA *ptr);
PropertySubType RNA_property_subtype(PropertyRNA *prop, PointerRNA *ptr);
@@ -66,7 +66,7 @@
int RNA_property_string_maxlength(PropertyRNA *prop, PointerRNA *ptr);
-void RNA_property_enum_items(PropertyRNA *prop, PointerRNA *ptr, const
PropertyEnumItem **item, int *totitem);
+void RNA_property_enum_items(PropertyRNA *prop, PointerRNA *ptr, const
EnumPropertyItem **item, int *totitem);
const char *RNA_property_ui_name(PropertyRNA *prop, PointerRNA *ptr);
const char *RNA_property_ui_description(PropertyRNA *prop, PointerRNA *ptr);
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_define.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_define.h
2008-11-14 17:33:15 UTC (rev 17461)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_define.h
2008-11-14 18:46:57 UTC (rev 17462)
@@ -43,14 +43,14 @@
/* Struct */
-StructRNA *RNA_def_struct(BlenderRNA *brna, const char *cname, const char
*name);
+StructRNA *RNA_def_struct(BlenderRNA *brna, const char *identifier, const char
*name);
void RNA_def_struct_sdna(StructRNA *srna, const char *structname);
void RNA_def_struct_name_property(StructRNA *srna, PropertyRNA *prop);
void RNA_def_struct_flag(StructRNA *srna, int flag);
/* Property */
-PropertyRNA *RNA_def_property(StructRNA *srna, const char *cname, int type,
int subtype);
+PropertyRNA *RNA_def_property(StructRNA *srna, const char *identifier, int
type, int subtype);
void RNA_def_property_boolean_sdna(PropertyRNA *prop, const char *structname,
const char *propname, int bit);
void RNA_def_property_int_sdna(PropertyRNA *prop, const char *structname,
const char *propname);
@@ -64,7 +64,7 @@
void RNA_def_property_array(PropertyRNA *prop, int arraylength);
void RNA_def_property_range(PropertyRNA *prop, double min, double max);
-void RNA_def_property_enum_items(PropertyRNA *prop, const PropertyEnumItem
*item);
+void RNA_def_property_enum_items(PropertyRNA *prop, const EnumPropertyItem
*item);
void RNA_def_property_string_maxlength(PropertyRNA *prop, int maxlength);
void RNA_def_property_struct_type(PropertyRNA *prop, const char *type);
@@ -78,7 +78,7 @@
void RNA_def_property_string_default(PropertyRNA *prop, const char *value);
void RNA_def_property_ui_text(PropertyRNA *prop, const char *name, const char
*description);
-void RNA_def_property_ui_range(PropertyRNA *prop, double min, double max,
double step, double precision);
+void RNA_def_property_ui_range(PropertyRNA *prop, double min, double max,
double step, int precision);
void RNA_def_property_funcs(PropertyRNA *prop, const char *notify, const char
*readonly);
void RNA_def_property_boolean_funcs(PropertyRNA *prop, const char *get, const
char *set);
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
2008-11-14 17:33:15 UTC (rev 17461)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
2008-11-14 18:46:57 UTC (rev 17462)
@@ -147,17 +147,17 @@
PointerRNA ptr;
} CollectionPropertyIterator;
-typedef struct PropertyEnumItem {
+typedef struct EnumPropertyItem {
int value;
- const char *cname;
+ const char *identifier;
const char *name;
-} PropertyEnumItem;
+} EnumPropertyItem;
typedef struct PropertyRNA {
struct PropertyRNA *next, *prev;
/* C code name */
- const char *cname;
+ const char *identifier;
/* various options */
int flag;
@@ -220,7 +220,8 @@
float softmin, softmax;
float hardmin, hardmax;
- float step, precision;
+ float step;
+ int precision;
float defaultvalue;
const float *defaultarray;
@@ -244,7 +245,7 @@
PropEnumGetFunc get;
PropEnumSetFunc set;
- const PropertyEnumItem *item;
+ const EnumPropertyItem *item;
int totitem;
int defaultvalue;
@@ -286,7 +287,7 @@
struct StructRNA *next, *prev;
/* C code name */
- const char *cname;
+ const char *identifier;
/* various options */
int flag;
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2008-11-14 17:33:15 UTC (rev 17461)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2008-11-14 18:46:57 UTC (rev 17462)
@@ -101,18 +101,18 @@
char *func;
if(!dp->dnastructname || !dp->dnaname) {
- fprintf(stderr, "rna_def_property_get_func: %s.%s has no valid
dna info.\n", srna->cname, prop->cname);
+ fprintf(stderr, "rna_def_property_get_func: %s.%s has no valid
dna info.\n", srna->identifier, prop->identifier);
DefRNA.error= 1;
return NULL;
}
if(prop->type == PROP_STRING && ((StringPropertyRNA*)prop)->maxlength
== 0) {
- fprintf(stderr, "rna_def_property_get_func: string %s.%s has
max length 0.\n", srna->cname, prop->cname);
+ fprintf(stderr, "rna_def_property_get_func: string %s.%s has
max length 0.\n", srna->identifier, prop->identifier);
DefRNA.error= 1;
return NULL;
}
- func= rna_alloc_function_name(srna->cname, prop->cname, "get");
+ func= rna_alloc_function_name(srna->identifier, prop->identifier,
"get");
switch(prop->type) {
case PROP_STRING: {
@@ -191,13 +191,13 @@
if(!dp->dnastructname || !dp->dnaname) {
if(!(prop->flag & PROP_NOT_EDITABLE)) {
- fprintf(stderr, "rna_def_property_set_func: %s.%s has
no valid dna info.\n", srna->cname, prop->cname);
+ fprintf(stderr, "rna_def_property_set_func: %s.%s has
no valid dna info.\n", srna->identifier, prop->identifier);
DefRNA.error= 1;
}
return NULL;
}
- func= rna_alloc_function_name(srna->cname, prop->cname, "set");
+ func= rna_alloc_function_name(srna->identifier, prop->identifier,
"set");
switch(prop->type) {
case PROP_STRING: {
@@ -254,12 +254,12 @@
if(prop->type == PROP_STRING) {
if(!dp->dnastructname || !dp->dnaname) {
- fprintf(stderr, "rna_def_property_length_func: %s.%s
has no valid dna info.\n", srna->cname, prop->cname);
+ fprintf(stderr, "rna_def_property_length_func: %s.%s
has no valid dna info.\n", srna->identifier, prop->identifier);
DefRNA.error= 1;
return NULL;
}
- func= rna_alloc_function_name(srna->cname, prop->cname,
"length");
+ func= rna_alloc_function_name(srna->identifier,
prop->identifier, "length");
fprintf(f, "static int %s(PointerRNA *ptr)\n", func);
fprintf(f, "{\n");
@@ -269,12 +269,12 @@
}
else if(prop->type == PROP_COLLECTION) {
if(prop->type == PROP_COLLECTION && !dp->dnalengthname) {
- fprintf(stderr, "rna_def_property_length_func: %s.%s
has no valid dna info.\n", srna->cname, prop->cname);
+ fprintf(stderr, "rna_def_property_length_func: %s.%s
has no valid dna info.\n", srna->identifier, prop->identifier);
DefRNA.error= 1;
return NULL;
}
- func= rna_alloc_function_name(srna->cname, prop->cname,
"length");
+ func= rna_alloc_function_name(srna->identifier,
prop->identifier, "length");
fprintf(f, "static int %s(PointerRNA *ptr)\n", func);
fprintf(f, "{\n");
@@ -291,12 +291,12 @@
char *func;
if(!dp->dnastructname || !dp->dnaname) {
- fprintf(stderr, "rna_def_property_begin_func: %s.%s has no
valid dna info.\n", srna->cname, prop->cname);
+ fprintf(stderr, "rna_def_property_begin_func: %s.%s has no
valid dna info.\n", srna->identifier, prop->identifier);
DefRNA.error= 1;
return NULL;
}
- func= rna_alloc_function_name(srna->cname, prop->cname, "begin");
+ func= rna_alloc_function_name(srna->identifier, prop->identifier,
"begin");
if(dp->dnalengthname) {
fprintf(f, "static void %s(CollectionPropertyIterator *iter,
PointerRNA *ptr)\n", func);
@@ -385,7 +385,7 @@
if(!pprop->get) pprop->get=
(void*)rna_def_property_get_func(f, srna, prop, dp);
if(!pprop->set) pprop->set=
(void*)rna_def_property_set_func(f, srna, prop, dp);
if(!pprop->structtype && !pprop->type) {
- fprintf(stderr, "rna_def_property_funcs: %s.%s,
collection must have either type function or fixed type.\n", srna->cname,
prop->cname);
+ fprintf(stderr, "rna_def_property_funcs: %s.%s,
collection must have either type function or fixed type.\n", srna->identifier,
prop->identifier);
DefRNA.error= 1;
}
break;
@@ -405,19 +405,19 @@
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
