Revision: 31257 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31257 Author: leifandersen Date: 2010-08-11 18:30:16 +0200 (Wed, 11 Aug 2010)
Log Message: ----------- 1. Updated the hash operator to work on multiple architectures (I hope), by rounding off the floats. 2. Updated the hashes to reflect the new hash operator. Modified Paths: -------------- branches/soc-2010-leifandersen/release/scripts/op/tests_hash.py branches/soc-2010-leifandersen/tests/hashfile.txt Modified: branches/soc-2010-leifandersen/release/scripts/op/tests_hash.py =================================================================== --- branches/soc-2010-leifandersen/release/scripts/op/tests_hash.py 2010-08-11 16:08:54 UTC (rev 31256) +++ branches/soc-2010-leifandersen/release/scripts/op/tests_hash.py 2010-08-11 16:30:16 UTC (rev 31257) @@ -73,9 +73,9 @@ if texslot != None: hashcode.update(str(texslot.name).encode()) for num in w.horizon_color: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for num in w.zenith_color: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for ob in scene.objects: hashcode.update(str(ob.name).encode()) hashcode.update(str(ob.type).encode()) @@ -84,14 +84,14 @@ for object in ob.dupli_group.objects: hashcode.update(str(object.name).encode()) for num in ob.rotation_euler: - hashcode.update(str(round(num, 6)).encode()) + hashcode.update(str(round(num, 10)).encode()) for num in ob.location: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for num in ob.scale: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for point in ob.bound_box: for num in point: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for group in ob.vertex_groups: hashcode.update(str(group.name).encode()) for mod in ob.modifiers: @@ -139,13 +139,13 @@ hashcode.update(str(sb.minstep).encode()) hashcode.update(str(sb.plastic).encode()) for num in sb.lcom: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for vector in sb.lrot: for num in vector: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for vector in sb.lscale: for num in vector: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) if sb.effector_weights != None: ef = sb.effector_weights hashcode.update(str(ef.all).encode()) @@ -166,7 +166,7 @@ if ob.type == 'MESH': for vert in ob.data.verts: for co in vert.co: - hashcode.update(str(co).encode()) + hashcode.update(str(roung(co, 10)).encode()) for face in ob.data.faces: hashcode.update(str(face.smooth).encode()) hashcode.update(str(face.select).encode()) @@ -174,7 +174,7 @@ for vert in face.verts: hashcode.update(str(vert).encode()) for point in face.center: - hashcode.update(str(point).encode()) + hashcode.update(str(round(point, 10)).encode()) for pair in face.edge_keys: for num in pair: hashcode.update(str(num).encode()) @@ -188,12 +188,12 @@ for particle in ps.particles: hashcode.update(str(particle.size).encode()) for num in particle.velocity: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for num in particle.rotation: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for hair in particle.hair: for num in hair.location: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) set = ps.settings hashcode.update(str(set.amount).encode()) hashcode.update(str(set.abs_path_time).encode()) @@ -203,7 +203,7 @@ hashcode.update(str(set.billboard_animation).encode()) hashcode.update(str(set.billboard_lock).encode()) for num in set.billboard_offset: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) hashcode.update(str(set.billboard_tilt).encode()) hashcode.update(str(set.billboard_uv_split).encode()) hashcode.update(str(set.clumppow).encode()) @@ -279,7 +279,7 @@ hashcode.update(str(ob.data.shadow_adaptive_threshold).encode()) hashcode.update(str(ob.data.shadow_method).encode()) for num in ob.data.shadow_color: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) if ob.data.rna_type.name == 'PointLamp': hashcode.update(str(ob.data.shadow_ray_samples).encode()) hashcode.update(str(ob.data.shadow_ray_sampling_method).encode()) @@ -291,11 +291,11 @@ hashcode.update(str(ob.data.falloff_curve.clip_max_x).encode()) hashcode.update(str(ob.data.falloff_curve.clip_max_y).encode()) for num in ob.data.falloff_curve.white_level: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) if ob.data.rna_type.name == 'Spot Lamp': hashcode.update(str(ob.data.shadow_method).encode()) for num in ob.data.color: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) if ob.type == 'CAMERA': hashcode.update(str(ob.data.name).encode()) hashcode.update(str(ob.data.lens).encode()) @@ -353,9 +353,9 @@ hashcode.update(str(spline.resolution_v).encode()) hashcode.update(str(tx.tag).encode()) for num in tx.texspace_loc: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for num in tx.texspace_size: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for box in tx.textboxes: hashcode.update(str(box.x).encode()) hashcode.update(str(box.y).encode()) @@ -374,9 +374,9 @@ hashcode.update(str(mb.render_size).encode()) hashcode.update(str(mb.wire_size).encode()) for num in mb.texspace_loc: - hashcode.update(str(num).encode()) + hashcode.update(str(roound(num, 10)).encode()) for num in mb.texspace_size: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for material in mb.materials: hashcode.update(str(material.name).encode()) hashcode.update(str(mb.threshold).encode()) @@ -385,7 +385,7 @@ hashcode.update(str(el.size_y).encode()) hashcode.update(str(el.size_z).encode()) for num in el.rotation: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) hashcode.update(str(el.negative).encode()) hashcode.update(str(el.hide).encode()) hashcode.update(str(el.stiffness).encode()) @@ -438,37 +438,37 @@ hashcode.update(str(bone.parent.name).encode()) hashcode.update(str(bone.select).encode()) for num in bone.center: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for child in bone.children: hashcode.update(str(bone.name).encode()) for child in bone.children_recursive: hashcode.update(str(bone.name).encode()) for num in bone.head: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for num in bone.head_local: - hashcode.update(str(num).encode()) + hashcode.update(str(round(num, 10)).encode()) for layor in bone.layer: hashcode.update(str(layor.denominator).encode()) hashcode.update(str(layor.imag).encode()) hashcode.update(str(layor.real).encode()) for vector in bone.matrix: for num in vector: - hashcode.update(str(num).encode()) @@ 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