Line 0
Link Here
|
|
|
1 |
--- src/wings.hrl.orig 2015-06-24 22:08:57 UTC |
2 |
+++ src/wings.hrl |
3 |
@@ -113,16 +113,16 @@ |
4 |
%% State and records |
5 |
%% Main state record containing all objects and other important state. |
6 |
-record(st, |
7 |
- {shapes=gb_trees:empty() :: gb_tree(), %All visible objects |
8 |
+ {shapes=gb_trees:empty() :: gb_trees:tree(), %All visible objects |
9 |
selmode=face :: sel_mode(), %Selection mode. |
10 |
sh=false :: boolean(), %Smart highlighting active. |
11 |
sel=[], %Current sel: [{Id,GbSet}] |
12 |
- ssels=gb_trees:empty() :: gb_tree(), %Saved selections: |
13 |
+ ssels=gb_trees:empty() :: gb_trees:tree(), %Saved selections: |
14 |
|
15 |
%% Selection only temporary? |
16 |
temp_sel=none :: 'none' | {sel_mode(),boolean()}, |
17 |
|
18 |
- mat=gb_trees:empty() :: gb_tree(), %Defined materials (GbTree). |
19 |
+ mat=gb_trees:empty() :: gb_trees:tree(), %Defined materials (GbTree). |
20 |
pal=[], %Palette |
21 |
file, %Current filename. |
22 |
saved=false :: 'false' | 'true' | 'auto' | integer(), |
23 |
@@ -134,7 +134,7 @@ |
24 |
|
25 |
edge_loop=none, %Previous edge loop. |
26 |
views={0,{}}, %{Current,TupleOfViews} |
27 |
- pst=gb_trees:empty() :: gb_tree(), %Plugin State Info |
28 |
+ pst=gb_trees:empty() :: gb_trees:tree(), %Plugin State Info |
29 |
% gb_tree where key is plugin module |
30 |
|
31 |
%% Previous commands. |
32 |
@@ -148,7 +148,7 @@ |
33 |
|
34 |
%% Undo information. |
35 |
last_cmd=empty_scene, %Last command. |
36 |
- undo=queue:new() :: queue(), %Undo (de)queue. |
37 |
+ undo=queue:new() :: queue:queue(), %Undo (de)queue. |
38 |
next_is_undo=true :: boolean(), %State of undo/redo toggle. |
39 |
undone=[] :: list() %States that were undone. |
40 |
}). |
41 |
@@ -165,14 +165,14 @@ |
42 |
% The GbSet contains the |
43 |
% object's selection. |
44 |
name="" :: string() | tuple(), %Name. (AutoUV stores other things here.) |
45 |
- es=array:new() :: array(), %array containing edges |
46 |
- lv=none :: 'none' | array(), %Left vertex attributes |
47 |
- rv=none :: 'none' | array(), %Right vertex attributes, |
48 |
- fs :: gb_tree(), %Faces |
49 |
- he=gb_sets:empty() :: gb_set(), %Hard edges |
50 |
- vc :: array(), %Connection info (=incident edge) |
51 |
+ es=array:new() :: array:array(), %array containing edges |
52 |
+ lv=none :: 'none' | array:array(), %Left vertex attributes |
53 |
+ rv=none :: 'none' | array:array(), %Right vertex attributes, |
54 |
+ fs :: gb_trees:tree(), %Faces |
55 |
+ he=gb_sets:empty() :: gb_sets:set(), %Hard edges |
56 |
+ vc :: array:array(), %Connection info (=incident edge) |
57 |
% for vertices. |
58 |
- vp=array:new() :: array(), %Vertex positions. |
59 |
+ vp=array:new() :: array:array(), %Vertex positions. |
60 |
pst=gb_trees:empty(), %Plugin State Info, |
61 |
% gb_tree where key is plugin module |
62 |
mat=default, %Materials. |