Explorar o código

natvis: added simple views + minor changes

Michele Caini %!s(int64=4) %!d(string=hai) anos
pai
achega
b6f953e13b
Modificáronse 3 ficheiros con 15 adicións e 13 borrados
  1. 8 8
      natvis/entt/container.natvis
  2. 1 1
      natvis/entt/core.natvis
  3. 6 4
      natvis/entt/entity.natvis

+ 8 - 8
natvis/entt/container.natvis

@@ -3,10 +3,10 @@
 	<Type Name="entt::dense_hash_map&lt;*&gt;">
 	<Type Name="entt::dense_hash_map&lt;*&gt;">
 		<DisplayString>{{ size={ packed.first_base::value.size() } }}</DisplayString>
 		<DisplayString>{{ size={ packed.first_base::value.size() } }}</DisplayString>
 		<Expand>
 		<Expand>
-			<Item Name="[capacity]">packed.first_base::value.capacity()</Item>
-			<Item Name="[bucket_count]">sparse.first_base::value.size()</Item>
-			<Item Name="[load_factor]">(float)packed.first_base::value.size() / (float)sparse.first_base::value.size()</Item>
-			<Item Name="[max_load_factor]">threshold</Item>
+			<Item Name="[capacity]" ExcludeView="simple">packed.first_base::value.capacity()</Item>
+			<Item Name="[bucket_count]" ExcludeView="simple">sparse.first_base::value.size()</Item>
+			<Item Name="[load_factor]" ExcludeView="simple">(float)packed.first_base::value.size() / (float)sparse.first_base::value.size()</Item>
+			<Item Name="[max_load_factor]" ExcludeView="simple">threshold</Item>
 			<IndexListItems>
 			<IndexListItems>
 				<Size>packed.first_base::value.size()</Size>
 				<Size>packed.first_base::value.size()</Size>
 				<ValueNode>packed.first_base::value[$i].element</ValueNode>
 				<ValueNode>packed.first_base::value[$i].element</ValueNode>
@@ -16,10 +16,10 @@
 	<Type Name="entt::dense_hash_set&lt;*&gt;">
 	<Type Name="entt::dense_hash_set&lt;*&gt;">
 		<DisplayString>{{ size={ packed.first_base::value.size() } }}</DisplayString>
 		<DisplayString>{{ size={ packed.first_base::value.size() } }}</DisplayString>
 		<Expand>
 		<Expand>
-			<Item Name="[capacity]">packed.first_base::value.capacity()</Item>
-			<Item Name="[bucket_count]">sparse.first_base::value.size()</Item>
-			<Item Name="[load_factor]">(float)packed.first_base::value.size() / (float)sparse.first_base::value.size()</Item>
-			<Item Name="[max_load_factor]">threshold</Item>
+			<Item Name="[capacity]" ExcludeView="simple">packed.first_base::value.capacity()</Item>
+			<Item Name="[bucket_count]" ExcludeView="simple">sparse.first_base::value.size()</Item>
+			<Item Name="[load_factor]" ExcludeView="simple">(float)packed.first_base::value.size() / (float)sparse.first_base::value.size()</Item>
+			<Item Name="[max_load_factor]" ExcludeView="simple">threshold</Item>
 			<IndexListItems>
 			<IndexListItems>
 				<Size>packed.first_base::value.size()</Size>
 				<Size>packed.first_base::value.size()</Size>
 				<ValueNode>packed.first_base::value[$i].element</ValueNode>
 				<ValueNode>packed.first_base::value[$i].element</ValueNode>

+ 1 - 1
natvis/entt/core.natvis

@@ -19,7 +19,7 @@
 		<DisplayString Condition="str != nullptr">{{ hash={ hash } }}</DisplayString>
 		<DisplayString Condition="str != nullptr">{{ hash={ hash } }}</DisplayString>
 		<DisplayString>{{}}</DisplayString>
 		<DisplayString>{{}}</DisplayString>
 		<Expand>
 		<Expand>
-			<Item Name="[str]">str,na</Item>
+			<Item Name="[data]">str,na</Item>
 		</Expand>
 		</Expand>
 	</Type>
 	</Type>
 	<Type Name="entt::type_info">
 	<Type Name="entt::type_info">

+ 6 - 4
natvis/entt/entity.natvis

@@ -3,7 +3,8 @@
 	<Type Name="entt::basic_sparse_set&lt;*&gt;">
 	<Type Name="entt::basic_sparse_set&lt;*&gt;">
 		<DisplayString>{{ size={ packed.size() }, type={ info->alias,na } }}</DisplayString>
 		<DisplayString>{{ size={ packed.size() }, type={ info->alias,na } }}</DisplayString>
 		<Expand>
 		<Expand>
-			<Item Name="[capacity]">packed.capacity()</Item>
+			<Item Name="[capacity]" ExcludeView="simple">packed.capacity()</Item>
+			<Item Name="[policy]" ExcludeView="simple">mode,en</Item>
 			<IndexListItems>
 			<IndexListItems>
 				<Size>packed.size()</Size>
 				<Size>packed.size()</Size>
 				<ValueNode Condition="packed[$i] &lt; (entity_traits::reserved &amp; ~entity_traits::entity_mask)">packed[$i]</ValueNode>
 				<ValueNode Condition="packed[$i] &lt; (entity_traits::reserved &amp; ~entity_traits::entity_mask)">packed[$i]</ValueNode>
@@ -14,9 +15,10 @@
 	<Type Name="entt::basic_storage&lt;*&gt;">
 	<Type Name="entt::basic_storage&lt;*&gt;">
 		<DisplayString>{{ size={ base_type::packed.size() }, type={ base_type::info->alias,na } }}</DisplayString>
 		<DisplayString>{{ size={ base_type::packed.size() }, type={ base_type::info->alias,na } }}</DisplayString>
 		<Expand>
 		<Expand>
-			<Item Name="[capacity]" Optional="true">packed.first_base::value.capacity() * packed_page_v</Item>
-			<Item Name="[page size]" Optional="true">packed_page_v</Item>
-			<Item Name="[entities]">(base_type*)this,na</Item>
+			<Item Name="[capacity]" Optional="true" ExcludeView="simple">packed.first_base::value.capacity() * packed_page_v</Item>
+			<Item Name="[page size]" Optional="true" ExcludeView="simple">packed_page_v</Item>
+			<Item Name="[base]" ExcludeView="simple">(base_type*)this,na</Item>
+			<Item Name="[base]" IncludeView="simple">(base_type*)this,view(simple)na</Item>
 			<IndexListItems Optional="true">
 			<IndexListItems Optional="true">
 				<Size>base_type::packed.size()</Size>
 				<Size>base_type::packed.size()</Size>
 				<ValueNode Condition="base_type::packed[$i] &lt; (entity_traits::reserved &amp; ~entity_traits::entity_mask)">packed.first_base::value[$i / packed_page_v][$i &amp; (packed_page_v - 1)]</ValueNode>
 				<ValueNode Condition="base_type::packed[$i] &lt; (entity_traits::reserved &amp; ~entity_traits::entity_mask)">packed.first_base::value[$i / packed_page_v][$i &amp; (packed_page_v - 1)]</ValueNode>