Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [461] maven/trunk/ogoglio-bodies
|
From: <tre...@us...> - 2007-10-01 13:57:45
|
Revision: 461
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=461&view=rev
Author: trevorolio
Date: 2007-10-01 06:57:49 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
Now the body morphs are arranged in an ADG and applied to the body mesh in depth first order.
This implies that there is only one morph with no parent, and there are no cycles.
Both cases are detected, logged, and fail gracefully.
Modified Paths:
--------------
maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/fat.ogmorph
maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/headWidth.ogmorph
maven/trunk/ogoglio-bodies/ogoglio-body-tools/src/main/java/com/ogoglio/util/body/BodyMorphTool.java
Added Paths:
-----------
maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/chinWidth.ogmorph
maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/sourceArt/chinWidth.blend
Added: maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/chinWidth.ogmorph
===================================================================
--- maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/chinWidth.ogmorph (rev 0)
+++ maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/chinWidth.ogmorph 2007-10-01 13:57:49 UTC (rev 461)
@@ -0,0 +1,13 @@
+# MorphDeltaMap
+name: Chin Width
+parent: Fat
+
+19 0.009885,0.000000,0.000000
+21 0.006815,0.000000,0.000000
+23 0.004966,0.000000,0.000000
+84 0.011247,0.000000,0.000000
+89 0.014312,0.000000,0.000000
+484 -0.009884,0.000000,0.000000 -0.006815,0.000000,0.000000 -0.004965,0.000000,0.000000
+527 -0.011248,0.000000,0.000000
+533 -0.014312,0.000000,0.000000
+
Modified: maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/fat.ogmorph
===================================================================
--- maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/fat.ogmorph 2007-09-28 23:01:11 UTC (rev 460)
+++ maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/fat.ogmorph 2007-10-01 13:57:49 UTC (rev 461)
@@ -1,5 +1,5 @@
# MorphDeltaMap
-Fat
+name: Fat
345 0.000000,0.000000,0.101537 0.000000,0.000000,0.101537 0.000000,0.000000,0.101537
353 0.000000,0.000000,0.101536 0.000000,0.000000,0.101537 0.000000,0.000000,0.101537
Modified: maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/headWidth.ogmorph
===================================================================
--- maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/headWidth.ogmorph 2007-09-28 23:01:11 UTC (rev 460)
+++ maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/geometry/headWidth.ogmorph 2007-10-01 13:57:49 UTC (rev 461)
@@ -1,5 +1,6 @@
# MorphDeltaMap
-Head Width
+name: Head Width
+parent: Fat
15 -0.006293,0.000000,0.000000
19 -0.006191,0.000000,0.000000
Added: maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/sourceArt/chinWidth.blend
===================================================================
(Binary files differ)
Property changes on: maven/trunk/ogoglio-bodies/ogoglio-body-mike/src/main/resources/sourceArt/chinWidth.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: maven/trunk/ogoglio-bodies/ogoglio-body-tools/src/main/java/com/ogoglio/util/body/BodyMorphTool.java
===================================================================
--- maven/trunk/ogoglio-bodies/ogoglio-body-tools/src/main/java/com/ogoglio/util/body/BodyMorphTool.java 2007-09-28 23:01:11 UTC (rev 460)
+++ maven/trunk/ogoglio-bodies/ogoglio-body-tools/src/main/java/com/ogoglio/util/body/BodyMorphTool.java 2007-10-01 13:57:49 UTC (rev 461)
@@ -21,8 +21,18 @@
return;
}
String name = args[0];
- File baseMeshFile = new File(args[1]);
- File morphMeshFile = new File(args[2]);
+ String parentName = null;
+ File baseMeshFile = null;
+ File morphMeshFile = null;
+ if(args.length == 4){
+ parentName = args[1];
+ baseMeshFile = new File(args[2]);
+ morphMeshFile = new File(args[3]);
+ } else {
+ baseMeshFile = new File(args[1]);
+ morphMeshFile = new File(args[2]);
+ }
+
if (!baseMeshFile.exists() || !morphMeshFile.exists()) {
printHelp();
return;
@@ -32,7 +42,7 @@
Obj baseObj = new ObjParser(new FileInputStream(baseMeshFile)).parse();
Obj morphObj = new ObjParser(new FileInputStream(morphMeshFile)).parse();
- MorphDeltaMap deltaMap = generateDeltaMap(name, baseObj, morphObj);
+ MorphDeltaMap deltaMap = generateDeltaMap(name, parentName, baseObj, morphObj);
System.out.println(deltaMap);
} catch (IOException e) {
@@ -46,11 +56,11 @@
return new Vector3f(point2.x - point1.x, point2.y - point1.y, point2.z - point1.z);
}
- private static final MorphDeltaMap generateDeltaMap(String name, Obj baseObj, Obj morphObj) {
+ private static final MorphDeltaMap generateDeltaMap(String name, String parentName, Obj baseObj, Obj morphObj) {
Point3f[] basePoints = baseObj.getVertices();
Point3f[] morphPoints = morphObj.getVertices();
- MorphDeltaMap map = new MorphDeltaMap(name);
+ MorphDeltaMap map = new MorphDeltaMap(name, parentName);
int lower = -1;
int upper = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
