archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Orange: daily noodle updates;

Browse Source 
- Texture Node: now displays 'intensity values' in node too, and has input,
  and shows in buttons when activated in Node editor. (no browsing buttons
  yet...)

- New: "Normal Node". This uses a new UI button, which allows to quickly
  input a normal vector, based on spherical coordinates.
  The Normal Node has optional vector input, and delivers a dot product
  then. This can be used as a blending factor between nodes, or for fake
  extra light in a certain direction.

- New: "Geometry Node". This actually replaces the Input node. It offers
  all coordinates (vectors) as being the starting point for shading and
  for textures. Note: for preview render this doesn't give much different
  results yet... this is the start for real render support!

- http://www.blender.org/bf/rt5.jpg
  The two new nodes in action

- Bugfix: the "Block" button (which delivers popups) did not return a
  correct event when nothing happened (mouse moved out), which could
  cause mouse clicks to be passed on to the queue.
This commit is contained in:
Ton Roosendaal
2005-12-30 11:25:15 +00:00
parent 10d67f254c
commit d921d6be6f
12 changed files with 422 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/src/editnode.c
View File

@@ -166,12 +166,8 @@ void node_shader_default(Material *ma)
out= nodeAddNodeType(ma->nodetree, SH_NODE_OUTPUT);
out->locx= 300.0f; out->locy= 300.0f;
/* we add default the own material as shader */
in= nodeAddNodeType(ma->nodetree, SH_NODE_MATERIAL);
in->locx= 10.0f; in->locy= 300.0f;
// in->id= (ID *)ma;
// id_us_plus(in->id);
// in->flag |= NODE_ACTIVE_ID;
nodeSetActive(ma->nodetree, in);
/* only a link from color to color */
@@ -548,6 +544,13 @@ void node_set_active(SpaceNode *snode, bNode *node)
/* tree specific activate calls */
if(snode->treetype==NTREE_SHADER) {
/* when we select a material, active texture is cleared, for buttons */
if(node->id && GS(node->id->name)==ID_MA)
nodeClearActiveID(snode->nodetree, ID_TE);
if(node->id)
BIF_preview_changed(-1); /* temp hack to force texture preview to update */
allqueue(REDRAWBUTSSHADING, 1);
}
}
@@ -762,7 +765,7 @@ static void node_add_menu(SpaceNode *snode)
short event, mval[2];
/* shader menu, still hardcoded defines... solve */
event= pupmenu("Add Node%t|Input%x0|Output%x1|Material%x100|Texture%x106|Value %x102|Color %x101|Mix Color %x103|ColorRamp %x104|Color to BW %x105");
event= pupmenu("Add Node%t|Output%x1|Geometry%x108|Material%x100|Texture%x106|Normal%x107|Value %x102|Color %x101|Mix Color %x103|ColorRamp %x104|Color to BW %x105");
if(event<1) return;
getmouseco_areawin(mval);
@@ -1124,7 +1127,8 @@ int node_uiDoBlocks(SpaceNode *snode, ListBase *lb, short event)
{
bNode *node;
rctf rect;
ListBase listb= *lb;
int retval= UI_NOTHING;
short mval[2];
getmouseco_areawin(mval);
@@ -1138,14 +1142,16 @@ int node_uiDoBlocks(SpaceNode *snode, ListBase *lb, short event)
for(node= snode->nodetree->nodes.first; node; node= node->next) {
if(node->block) {
if(node == visible_node(snode, &rect)) {
ListBase lb;
lb.first= lb.last= node->block;
return uiDoBlocks(&lb, event);
lb->first= lb->last= node->block;
retval= uiDoBlocks(lb, event);
break;
}
}
}
return UI_NOTHING;
*lb= listb;
return retval;
}
void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)