Fixes issue #148, makes Builder constructor package protected to avoi…

…d partial family construction

ashley/src/com/badlogic/ashley/core/Family.java

@@ -29,9 +29,8 @@
 public class Family {
 	private static ObjectMap<String, Family> families = new ObjectMap<String, Family>();
 	private static int familyIndex = 0;
-	// zero bits should goes first for builder
-	private static final Bits zeroBits = new Bits();
 	private static final Builder builder = new Builder();
+	private static final Bits zeroBits = new Bits();
 
 	private final Bits all;
 	private final Bits one;
@@ -77,33 +76,37 @@ public boolean matches (Entity entity) {
 	 * @return A Builder singleton instance to get a family
 	 */
 	@SafeVarargs
-	public static final Builder all (Class<? extends Component>... componentTypes) {
-		return builder.all(componentTypes);
+	public static Builder all (Class<? extends Component>... componentTypes) {
+		return builder.reset().all(componentTypes);
 	}
 
 	/**
 	 * @param componentTypes entities will have to contain at least one of the specified components.
 	 * @return A Builder singleton instance to get a family
 	 */
 	@SafeVarargs
-	public static final Builder one (Class<? extends Component>... componentTypes) {
-		return builder.one(componentTypes);
+	public static Builder one (Class<? extends Component>... componentTypes) {
+		return builder.reset().one(componentTypes);
 	}
 
 	/**
 	 * @param componentTypes entities cannot contain any of the specified components.
 	 * @return A Builder singleton instance to get a family
 	 */
 	@SafeVarargs
-	public static final Builder exclude (Class<? extends Component>... componentTypes) {
-		return builder.exclude(componentTypes);
+	public static Builder exclude (Class<? extends Component>... componentTypes) {
+		return builder.reset().exclude(componentTypes);
 	}
 
 	public static class Builder {
 		private Bits all = zeroBits;
 		private Bits one = zeroBits;
 		private Bits exclude = zeroBits;
 
+		Builder() {
+
+		}
+
 		/**
 		 * Resets the builder instance
 		 * @return A Builder singleton instance to get a family
@@ -120,10 +123,8 @@ public Builder reset () {
 		 * @return A Builder singleton instance to get a family
 		 */
 		@SafeVarargs
-		public final Builder all (Class<? extends Component>... componentTypes) {
-			Bits bits = ComponentType.getBitsFor(componentTypes);
-			bits.or(all);
-			all = bits;
+		public Builder all (Class<? extends Component>... componentTypes) {
+			all = ComponentType.getBitsFor(componentTypes);
 			return this;
 		}
 
@@ -132,10 +133,8 @@ public final Builder all (Class<? extends Component>... componentTypes) {
 		 * @return A Builder singleton instance to get a family
 		 */
 		@SafeVarargs
-		public final Builder one (Class<? extends Component>... componentTypes) {
-			Bits bits = ComponentType.getBitsFor(componentTypes);
-			bits.or(one);
-			one = bits;
+		public Builder one (Class<? extends Component>... componentTypes) {
+			one = ComponentType.getBitsFor(componentTypes);
 			return this;
 		}
 
@@ -144,10 +143,8 @@ public final Builder one (Class<? extends Component>... componentTypes) {
 		 * @return A Builder singleton instance to get a family
 		 */
 		@SafeVarargs
-		public final Builder exclude (Class<? extends Component>... componentTypes) {
-			Bits bits = ComponentType.getBitsFor(componentTypes);
-			bits.or(exclude);
-			exclude = bits;
+		public Builder exclude (Class<? extends Component>... componentTypes) {
+			exclude = ComponentType.getBitsFor(componentTypes);
 			return this;
 		}
 
@@ -159,7 +156,6 @@ public Family get () {
 				family = new Family(all, one, exclude);
 				families.put(hash, family);
 			}
-			reset();
 			return family;
 		}
 	}

ashley/tests/com/badlogic/ashley/core/FamilyTests.java

@@ -335,23 +335,6 @@ public void matchWithoutSystems () {
 		engine.clearPools();
 	}
 
-	@Test
-	public void matchWithPartialBuilding () {
-		Component[] components = {new ComponentA(), new ComponentB(), new ComponentC()};
-		Entity entity = new Entity();
-		for (Component component : components) {
-			entity.add(component);
-		}
-
-		Builder builder = new Builder();
-		for (Component component : components) {
-			builder.all(component.getClass());
-		}
-		Family family = builder.get();
-		assertTrue(family.matches(entity));
-		assertSame(family, Family.all(ComponentA.class, ComponentB.class, ComponentC.class).get());
-	}
-
 	@Test
 	public void matchWithComplexBuilding () {
 		Family family = Family.all(ComponentB.class).one(ComponentA.class).exclude(ComponentC.class).get();