Skip to content

Opengl es 20 #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SMARTVIK wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Opengl es 20 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
29bb945
Initial OpenGL ES 2.0 implementation.
harism May 29, 2012
8053d6f
Code stylized.
harism May 29, 2012
a7afee9
mBackgroundColorChanged flag removed.
harism Jun 1, 2012
13744de
Back facing texture flipped horizontally.
harism Jun 6, 2012
af7963d
Background color changed.
harism Jan 27, 2013
fc23707
Shader code moved into CurlStatic class.
harism Jan 27, 2013
f0b0b65
Curl position calculation and radius changed.
harism Jan 27, 2013
f5aaa0b
Copyright notices changed to 2013 plus code stylized.
harism Jan 27, 2013
3943849
Lots and lots of changes in rendering.
harism Jan 27, 2013
0e1de23
Minor fixes plus touch handling made smoother.
harism Jan 27, 2013
c616e66
Fix flickering once animation ends and curl position is calculated
harism Apr 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/fi/harism/curl/CurlActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2012 Harri Smatt
Copyright 2013 Harri Smatt

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -47,7 +47,7 @@ public void onCreate(Bundle savedInstanceState) {
mCurlView.setPageProvider(new PageProvider());
mCurlView.setSizeChangedObserver(new SizeChangedObserver());
mCurlView.setCurrentIndex(index);
mCurlView.setBackgroundColor(0xFF202830);
mCurlView.setBackgroundColor(0xFFC0C0C0);

// This is something somewhat experimental. Before uncommenting next
// line, please see method comments in CurlView.
Expand Down Expand Up @@ -131,32 +131,32 @@ public void updatePage(CurlPage page, int width, int height, int index) {
// First case is image on front side, solid colored back.
case 0: {
Bitmap front = loadBitmap(width, height, 0);
page.setTexture(front, CurlPage.SIDE_FRONT);
page.setBitmap(front, CurlPage.SIDE_FRONT);
page.setColor(Color.rgb(180, 180, 180), CurlPage.SIDE_BACK);
break;
}
// Second case is image on back side, solid colored front.
case 1: {
Bitmap back = loadBitmap(width, height, 2);
page.setTexture(back, CurlPage.SIDE_BACK);
page.setBitmap(back, CurlPage.SIDE_BACK);
page.setColor(Color.rgb(127, 140, 180), CurlPage.SIDE_FRONT);
break;
}
// Third case is images on both sides.
case 2: {
Bitmap front = loadBitmap(width, height, 1);
Bitmap back = loadBitmap(width, height, 3);
page.setTexture(front, CurlPage.SIDE_FRONT);
page.setTexture(back, CurlPage.SIDE_BACK);
page.setBitmap(front, CurlPage.SIDE_FRONT);
page.setBitmap(back, CurlPage.SIDE_BACK);
break;
}
// Fourth case is images on both sides - plus they are blend against
// separate colors.
case 3: {
Bitmap front = loadBitmap(width, height, 2);
Bitmap back = loadBitmap(width, height, 1);
page.setTexture(front, CurlPage.SIDE_FRONT);
page.setTexture(back, CurlPage.SIDE_BACK);
page.setBitmap(front, CurlPage.SIDE_FRONT);
page.setBitmap(back, CurlPage.SIDE_BACK);
page.setColor(Color.argb(127, 170, 130, 255),
CurlPage.SIDE_FRONT);
page.setColor(Color.rgb(255, 190, 150), CurlPage.SIDE_BACK);
Expand All @@ -166,7 +166,7 @@ public void updatePage(CurlPage page, int width, int height, int index) {
// scenario only one texture is used and shared for both sides.
case 4:
Bitmap front = loadBitmap(width, height, 0);
page.setTexture(front, CurlPage.SIDE_BOTH);
page.setBitmap(front, CurlPage.SIDE_BOTH);
page.setColor(Color.argb(127, 255, 255, 255),
CurlPage.SIDE_BACK);
break;
Expand Down
Loading