Revision 8c57d77b
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/library/mesh/MeshBase.java | ||
|---|---|---|
| 22 | 22 |
|
| 23 | 23 |
import android.opengl.GLES30; |
| 24 | 24 |
import android.opengl.Matrix; |
| 25 |
import android.util.Log; |
|
| 26 | 25 |
|
| 27 | 26 |
import org.distorted.library.effect.MatrixEffect; |
| 28 | 27 |
import org.distorted.library.effect.VertexEffect; |
| 29 | 28 |
import org.distorted.library.effectqueue.EffectQueue; |
| 29 |
import org.distorted.library.main.DistortedLibrary; |
|
| 30 | 30 |
import org.distorted.library.main.InternalBuffer; |
| 31 | 31 |
import org.distorted.library.program.DistortedProgram; |
| 32 | 32 |
import org.distorted.library.type.Static4D; |
| ... | ... | |
| 462 | 462 |
|
| 463 | 463 |
if( origVertices!=mNumVertices ) |
| 464 | 464 |
{
|
| 465 |
android.util.Log.e("mesh", "join: origVertices: "+origVertices+" numVertices: "+mNumVertices);
|
|
| 465 |
DistortedLibrary.logMessage("MeshBase: join: origVertices: "+origVertices+" numVertices: "+mNumVertices);
|
|
| 466 | 466 |
} |
| 467 | 467 |
|
| 468 | 468 |
int endIndex, index=0, numEffComp = mEffComponent.size(); |
| ... | ... | |
| 621 | 621 |
else |
| 622 | 622 |
{
|
| 623 | 623 |
int error = GLES30.glGetError(); |
| 624 |
Log.e("mesh", "failed to map tf buffer, error="+error);
|
|
| 624 |
DistortedLibrary.logMessage("MeshBase: failed to map tf buffer, error="+error);
|
|
| 625 | 625 |
} |
| 626 | 626 |
|
| 627 | 627 |
GLES30.glUnmapBuffer(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER); |
| ... | ... | |
| 641 | 641 |
} |
| 642 | 642 |
else |
| 643 | 643 |
{
|
| 644 |
android.util.Log.e("mesh", "JobNode null");
|
|
| 644 |
DistortedLibrary.logMessage("MeshBase: JobNode null");
|
|
| 645 | 645 |
} |
| 646 | 646 |
} |
| 647 | 647 |
|
| ... | ... | |
| 670 | 670 |
sb.append(") ");
|
| 671 | 671 |
} |
| 672 | 672 |
|
| 673 |
Log.d("mesh", sb.toString() );
|
|
| 673 |
DistortedLibrary.logMessage("MeshBase: "+sb.toString() );
|
|
| 674 | 674 |
} |
| 675 | 675 |
} |
| 676 | 676 |
|
| ... | ... | |
| 694 | 694 |
sb.append(mVertAttribs1[VERT1_ATTRIBS*i+POS_ATTRIB+2]); |
| 695 | 695 |
sb.append(") ");
|
| 696 | 696 |
} |
| 697 |
Log.d("mesh", sb.toString());
|
|
| 697 |
DistortedLibrary.logMessage("MeshBase: "+sb.toString());
|
|
| 698 | 698 |
} |
| 699 | 699 |
|
| 700 | 700 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 713 | 713 |
sb.append(' ');
|
| 714 | 714 |
} |
| 715 | 715 |
|
| 716 |
Log.d("mesh", sb.toString());
|
|
| 716 |
DistortedLibrary.logMessage("MeshBase: "+sb.toString());
|
|
| 717 | 717 |
} |
| 718 | 718 |
|
| 719 | 719 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 745 | 745 |
} |
| 746 | 746 |
} |
| 747 | 747 |
|
| 748 |
Log.d("mesh", sb.toString());
|
|
| 748 |
DistortedLibrary.logMessage("MeshBase: "+sb.toString());
|
|
| 749 | 749 |
} |
| 750 | 750 |
|
| 751 | 751 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 907 | 907 |
} |
| 908 | 908 |
else |
| 909 | 909 |
{
|
| 910 |
android.util.Log.e("mesh", "Error: unknown mesh file version "+String.format("0x%08X", version));
|
|
| 910 |
DistortedLibrary.logMessage("MeshBase: Error: unknown mesh file version "+String.format("0x%08X", version));
|
|
| 911 | 911 |
return 0; |
| 912 | 912 |
} |
| 913 | 913 |
} |
| 914 | 914 |
catch(Exception e) |
| 915 | 915 |
{
|
| 916 |
android.util.Log.e("mesh", "Exception1 trying to read file: "+e.toString());
|
|
| 916 |
DistortedLibrary.logMessage("MeshBase: Exception1 trying to read file: "+e.toString());
|
|
| 917 | 917 |
return 0; |
| 918 | 918 |
} |
| 919 | 919 |
|
| ... | ... | |
| 941 | 941 |
} |
| 942 | 942 |
catch(Exception e) |
| 943 | 943 |
{
|
| 944 |
android.util.Log.e("mesh", "Exception2 trying to read file: "+e.toString());
|
|
| 944 |
DistortedLibrary.logMessage("MeshBase: Exception2 trying to read file: "+e.toString());
|
|
| 945 | 945 |
return 0; |
| 946 | 946 |
} |
| 947 | 947 |
|
| ... | ... | |
| 1008 | 1008 |
|
| 1009 | 1009 |
floatBuf.get(mVertAttribs1, 0, VERT1_ATTRIBS*mNumVertices); |
| 1010 | 1010 |
break; |
| 1011 |
default: android.util.Log.e("mesh", "Error: unknown mesh file version "+String.format("0x%08X", version));
|
|
| 1011 |
default: DistortedLibrary.logMessage("MeshBase: Error: unknown mesh file version "+String.format("0x%08X", version));
|
|
| 1012 | 1012 |
return 0; |
| 1013 | 1013 |
} |
| 1014 | 1014 |
|
| ... | ... | |
| 1101 | 1101 |
} |
| 1102 | 1102 |
catch(IOException ex) |
| 1103 | 1103 |
{
|
| 1104 |
android.util.Log.e("mesh", "IOException trying to write a mesh: "+ex.toString());
|
|
| 1104 |
DistortedLibrary.logMessage("MeshBase: IOException trying to write a mesh: "+ex.toString());
|
|
| 1105 | 1105 |
} |
| 1106 | 1106 |
} |
| 1107 | 1107 |
|
Also available in: Unified diff
Decouple (to a large degree) the OpenGL Library from Android.