Update for NDK Gold #56

Merged
merged 80 commits into from Dec 11, 2012

Conversation

Projects
None yet
7 participants
Contributor

jhoffmannrim commented Dec 11, 2012

No description provided.

jhoffmannrim and others added some commits May 1, 2012

@jhoffmannrim jhoffmannrim update NDK-Samples for BB 10.0.04 c4dd34f
@jhoffmannrim jhoffmannrim Merge pull request #15 from jhoffmannrim/next
update NDK-Samples for BB 10.0.04
9747854
Nick Landry Make BB10.0.4 changes to BelligerentBlocks
Remove the "device identifying information" permissions since scoreloop no
longer needs it.  Link against the scoreloopcore DSO rather than the
static archive.  Ensure all build targets are configured correctly.

Applied a few minor fixes to get rid of the warnings.
f49812e
@nlandry nlandry Merge pull request #16 from nlandry/next
Make BB10.0.4 changes to BelligerentBlocks
f369991
@jhoffmannrim jhoffmannrim update NDK-Samples for BB 10.0.06 93b8b8e
@nlandry nlandry Merge pull request #22 from jhoffmannrim/next
update NDK-Samples for BB 10.0.06
a51b607
Anthony Hu Removal of reference to shadow.png
shadow.png is no longer needed.
8780589
Anthony Hu Merge pull request #29 from anhu/next
Removal of reference to shadow.png
0c38631
@mlepage mlepage Fix bbutil render_text indices (saves memory). acdd479
Anthony Hu Modifications required for scoreloop's API changes 022366f
Anthony Hu This change fixes a build warning and font issue.
We use Arial because the old font is no longer supported on the system.
Changed splashscreen to splashScreens in bar descriptor.
2dcb4ca
Anthony Hu Samples Documentation
Specify only BB10 devices for samples that won't work properly on simulator.
Reflect that in their readme.txt files.
d480c64
Anthony Hu Removal of HelloWorldConsole sample application.
We should not be encouraging the creation of headless applications.
bba0031
@jhoffmannrim jhoffmannrim add Anthony Hu to list of committers in README.md 81b8258
Anthony Hu Removal of template projects.
The following projects are removed:
* GLES11Template
* GLES11Template
* ScreenTemplate
246a343
Anthony Hu Merge pull request #28 from anhu/develop
These commits were previously merged by dtomilovskiy. I'm just doing it again to make the branches more consistent.
1b22bea
Contributor

pelegri commented on acdd479 Jul 25, 2012

Marc, is this patch only applicable to BB10 or also to PlayBook? Even if we were to only apply it to the BB10 b/c of testing/resourcing, it might be useful to document it accordingly.

Member

rsperanza replied Jul 25, 2012

Contributor

mlepage replied Jul 25, 2012

Hi Eduardo, it is applicable to any and all code that has those lines. When malloc'ing the array of shorts, the size should be a multiple of shorts (2 bytes) not floats (4 bytes). The two types must match in the malloc. Additionally, since this is for OpenGL, it should be unsigned short not signed short. They're the same size, but later when it's used with OpenGL, the flag passed is for unsigned short, since signed short is not a legal option. Other places in the code correctly use unsigned short in this case, but this one didn't.

Contributor

mlepage replied Jul 25, 2012

In the future, ideally there would be a solution for not duplicating these lines (files) in every sample. That will keep them limited to one place in github, instead of half a dozen. Maybe a library.

Contributor

jhoffmannrim replied Jul 26, 2012

This commit has been merged into develop branch (for BB10) with Pull Request #28.

The reason that the code is duplicated in each sample is so that each sample is standalone. The samples are for developers new to the platform and we don't want to complicate the build process by creating a library that they have to get working before they can use the samples.

Contributor

mlepage replied Jul 27, 2012

Awesome, good to finally see this fix go in, thanks!

For code sharing, I was thinking along the lines of having the individual samples reference a common file in a sibling directory. So each builds in the file (no lib) but it's in one place. There's probably a way to have git deal with this using links of some sort.

Contributor

mlepage replied Jul 27, 2012

Oops, I see it's still just in develop. At what point will the incorrect master code be fixed? This should be a hotfix to the incorrect code in the current release, it shouldn't be waiting for a new release.

anhu replied Jul 27, 2012

Contributor

mlepage replied Jul 27, 2012

Great, thanks Anthony!

Anthony Hu and others added some commits Jul 5, 2012

Anthony Hu Removal of the GLES20Template project. 42b267b
Anthony Hu Update samples to enable use of dialog service
Needed to set window group at the right time.
c7f4f26
Anthony Hu Make the samples work in portrait orientation
For most of the applications, it was a simple matter of setting manifest
properties and bar descriptor files.  For the VideoWindow and VideoPlayback
applications, we needed to play the video at the correct aspect ratio at
The largest size possible while still showing the whole area of the video.

Also, some of the GLES20 related code in VideoWindow application had to be
corrected.

Did not change HelloWorldDisplay since it is not suited for portrait
orientation.
6f99874
Anthony Hu Make the code a bit more efficient and look better
For efficiency, we try to minimize the amount of code that is needlessly
initialized over and over again.

To make it look better, we made some whitespace changes and used clearer
variable names.
2c9f006
Anthony Hu Fixes GoodCitizen such that it continues rotating
...after returning from a thumbnailed state into
fullscreen state and properly exits when closed.
6c947d2
Anthony Hu Start using SENSOR_TYPE_GRAVITY as input
Before this change, we used SENSOR_TYPE_AZIMUTH_PITCH_ROLL to figure
out which direction the blocks should be "falling".  Using the
SENSOR_TYPE_GRAVITY events simplifies the code by making many of the
calculations unneccessary.
1c0c8b9
Anthony Hu Changed the action tag into permission tags.
This changes all bar-descriptor.xml files in the ndk-samples.  The
action tag was recently deprecated.  We also remove all the ones
that are commented out since the list of permissions often changes
and these comments quickly go out of date.
fadfed5
Anthony Hu Monitor mmrender state of playback, change buttons
Use mmrenderer's new playback state monitoring system.
The old button text no longer fits on our smaller buttons on the new
dialogs.
53d96b9
Anthony Hu Create sample app to leverage new camera API
Credit goes to Sean McVeigh who was the original author.
7a2fa18
Anthony Hu The channels sample will use a dialog and toast
Before, this sample used 2 dialogs.  The ability to control the
position of the dialogs has been deprecated so the two dialogs
overlap.  This is undesirable so we have changed one of them into
a toast.
a32a777
Anthony Hu Fixing resources in the manifest properties.
Adding background textures to the resources fields for good citizen
and splashscreens for all the other projects.
7e91513
Anthony Hu Adding the splash screens to manifest
for the Camera Application.
2280414
Anthony Hu Merge pull request #30 from anhu/develop
Series of changes for fix that are slated for BB10.0.08
5e28f09
Anthony Hu Create sample app to leverage new camera API
Credit goes to Sean McVeigh who was the original author.
6c425f2
Anthony Hu Adding the splash screens to manifest
for the Camera Application.
4bf3f31
Anthony Hu Merge pull request #31 from anhu/next
Camera feature.
f50e425
Anthony Hu Getting rid of calls to deprecated APIs. 60a6796
Anthony Hu Change the readme.txt file of the Gestures sample
...to reflect that the sample does not work on simulator.
05480e0
Anthony Hu Allow the IDE to fix project configuration files
Deleted old .cproject and .project and let the IDE produce new ones
in order to get rid of some warnings.  This was only done for the
Camera sample.
833f109
Anthony Hu Merge pull request #34 from anhu/develop
Series of minor changes that are slated for BB10.0.08
58798ab
Anthony Hu Removed simulator launch configuration
...from the camera sample application.
8f080d2
Anthony Hu Merge pull request #35 from anhu/develop
Removed simulator launch configuration
c9852e1
Nick Landry Fix blocks falling at strange angles
Gravity data doesn't change for the simulator, so hardcode it so that
blocks fall straight down on the simulator.  Remove initial orientation
query, it is no longer being used.
ecedbec
Nick Landry Pitch/Roll comment should be about gravity 2149e33
@nlandry nlandry Merge pull request #38 from nlandry/develop
Fix blocks falling at strange angles
cdd3161
@jhoffmannrim jhoffmannrim Merge develop into next for external beta 3 (BB 10.0.09) dc07e4a
@jhoffmannrim jhoffmannrim Merge pull request #40 from jhoffmannrim/next
Update NDK-Samples for BB 10.0.09
9e671a6
Nick Landry Re-write CubeRotate to take advantage of glview (available in the lat…
…est beta)
fe340ba
Nick Landry Revert accidental change to FallingBlocks ef67211
Nick Landry Use whatever the default device orientation is e39d664
@nlandry nlandry Merge pull request #43 from nlandry/next
Update CubeRotate to use glview (available in latest beta)
5a1e049
Nick Landry Convert FallingBlocks to use glview ca61cab
@nlandry nlandry Merge pull request #44 from nlandry/next
Convert FallingBlocks to use glview
db15b36
Nick Landry Change the keyboard example to use glview e685a7c
@nlandry nlandry Merge pull request #45 from nlandry/next
Change the keyboard example to use glview
6b9f355
@nlandry nlandry Fix native screen initialization for BB10
Screen initialization has simplified from PlayBook.  Update samples that
aren't using glview to reflect the proper way.

Also, stop calling navigator_rotation_lock().  It is rarely needed as long
as the proper rotation behaviour is specified in the bar-descriptor.xml
file.
fdc9905
@nlandry nlandry Update the use of scoreloop
Some Scoreloop calls have changed in R9.  Update BelligerentBlocks so that
it works again.
4e31274
@nlandry nlandry Merge pull request #46 from nlandry/next
Fix native screen initialization for BB10
662dd02
@jhoffmannrim jhoffmannrim Merge pull request #48 from blackberry/next
merge from next
f48c504
@jhoffmannrim jhoffmannrim Fix native screen initialization for BB10 for Samples that use dialogs
Screen initialization has simplified from PlayBook.  Update samples that use
dialogs to reflect the proper way.

Also, stop calling navigator_rotation_lock().  It is rarely needed as long as
the proper rotation behaviour is specified in the bar-descriptor.xml file.
bbfbaa4
@jhoffmannrim jhoffmannrim update AudioControl to recognize more audio channels 03ef8e7
@jhoffmannrim jhoffmannrim change Dialog sample to use standard OK label instead of "Submit" 2b5c152
@jhoffmannrim jhoffmannrim Merge pull request #49 from jhoffmannrim/develop
updates to samples
1a9f6b9
@jhoffmannrim jhoffmannrim Merge pull request #50 from blackberry/develop
merge develop to next to pick up recent changes
48f2e7d
@jhoffmannrim jhoffmannrim remove return value from function declared as void f0e7acb
@jhoffmannrim jhoffmannrim Merge pull request #51 from jhoffmannrim/next
remove return value from function declared as void
e57da86
@jhoffmannrim jhoffmannrim cleanup VideoWindow
- add log messages for any fatal errors
- reformat code
e594c22
@jhoffmannrim jhoffmannrim Fix native screen initialization in VideoWindow for BB10
Screen initialization has simplified from PlayBook.  Update VideoWindow to
reflect the proper way.
2180729
@jhoffmannrim jhoffmannrim fix VideoWindow: remove green cast
- set clear color to black instead of green
4aa5414
@jhoffmannrim jhoffmannrim Merge pull request #52 from jhoffmannrim/next
Fixes to VideoWindow
95d7fff
@jhoffmannrim jhoffmannrim update Makefiles, project files and bar-descriptor.xml files
- includes removal of sample splashscreens
c842272
@jhoffmannrim jhoffmannrim Merge pull request #53 from jhoffmannrim/next
update Makefiles, project files and bar-descriptor.xml files
4d6b055
@ablake ablake Adding the Gamepad sample project. adfc040
@ablake ablake Converting line delimiters to Unix-style in all the makefiles I misse…
…d, as well as the bar-descriptor.
2217b83
@ablake ablake Adding a readme to the Gamepad sample. b019f65
@jhoffmannrim jhoffmannrim convert Gamepad's .cproject and .project to UNIX line endings 4e7fead
@jhoffmannrim jhoffmannrim Gamepad: add manifest.properties and regenerate project files 4150714
@jhoffmannrim jhoffmannrim Gamepad: remove Simulator Release build d283f7c
@jhoffmannrim jhoffmannrim update .gitignore with Gamepad files d4c2921
@ablake ablake Merge pull request #1 from jhoffmannrim/next
Updating Gamepad project files.
d37f822
@ablake ablake Adding copyright information for libpng to the LICENSE file. e9735e4
@ablake ablake Merge branch 'next' of https://github.com/ablake/NDK-Samples into next 8603510
@pelegri pelegri Merge pull request #54 from ablake/next
Adding the Gamepad sample project.
6476f93
@jhoffmannrim jhoffmannrim Merge remote-tracking branch 'origin/next' 34a76f5
Contributor

pelegri commented Dec 11, 2012

OK. Maybe tomorrow you can explain me the structure of the local branches? I kind of expected an intra-repo merge from next to master...

pelegri merged commit c6b91a2 into blackberry:master Dec 11, 2012

Contributor

jhoffmannrim commented Dec 11, 2012

@pelegri It was not a clean merge so I had to resolve conflicts locally.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment