sbc@chromium.org [Tue, 21 May 2013 23:15:50 +0000 (23:15 +0000)]
[nacltoons] Add compound shapes.
This change is suprisingly large as it involves switching
from CCPhysicsSprite (where each physics object must have
a visisble sprite) to CCPhysicsNode (where the physics
node itself is not visible, but can have zero or more
visible children).
This means that a single phyiscs node (corresponding to a
single box2d body) can be constructed from many shapes and
sprites, each adding its own fixtures to the overall body.
R=binji@chromium.org
Review URL: https://codereview.chromium.org/
15070003
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1552
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Sat, 18 May 2013 01:49:00 +0000 (01:49 +0000)]
[nacltoons] Build third_party libraries into single libdir.
Also, make sure this libdir comes before the naclports
one as we want to use liblua from the cocos build rather
than the one that ships with ports.
TBR=binji
Review URL: https://codereview.chromium.org/
15268005
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1551
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Sat, 18 May 2013 00:51:42 +0000 (00:51 +0000)]
[nacltoons] Fix one more bad path to make lua unittests pass.
TBR=binji
BUG=None
Review URL: https://codereview.chromium.org/
15393002
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1550
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Sat, 18 May 2013 00:10:40 +0000 (00:10 +0000)]
[nacltoons] Fix location of lua-yaml in Makefile.
TBR=binji
BUG=None
Review URL: https://codereview.chromium.org/
15386002
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1549
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 17 May 2013 22:55:56 +0000 (22:55 +0000)]
[nacltoons] Use YAML for for data files and add lua unittests
This clearly differentiates code form data as well as
making data files a lot shorter and easier to read.
Add initial support for serializing levels.
And lunit (lua unit testing) to DEPS so we can do some
testing in pure lua, and add lua.sh script for launching
lua to run tests.
Move nacltoons third party deps to nacltoons/third_party.
BUG=
R=binji@chromium.org
Review URL: https://codereview.chromium.org/
14820005
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1548
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 7 May 2013 21:23:40 +0000 (21:23 +0000)]
[nacltoons] Move nacl-specific build to proj.nacl
Also, move win32 specific code to proj.win32.
R=binji@chromium.org
Review URL: https://codereview.chromium.org/
14851014
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1547
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 7 May 2013 20:47:22 +0000 (20:47 +0000)]
[nacltoons] Fixes for glibc build
BUG=
R=binji@chromium.org
Review URL: https://codereview.chromium.org/
14931005
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1546
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 30 Apr 2013 00:15:15 +0000 (00:15 +0000)]
[nacltoons] Initial editor support.
Includes basic drawing and moving operations, undo/redo
stack, and level serialization to .def file.
Move physics update call from C++ to lua.
BUG=
R=binji@chromium.org
Review URL: https://codereview.chromium.org/
14367024
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1545
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@chromium.org [Thu, 18 Apr 2013 16:42:53 +0000 (16:42 +0000)]
Add visual studio project files so that we can build and
run under visual studio.
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/
14245002
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1544
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@google.com [Fri, 12 Apr 2013 00:26:25 +0000 (00:26 +0000)]
Create a seperate GUI library in LUA and Fix editor Bugs
Move Menu and MenuItem creation to a seperate library that can handle
defaults. This makes it easier and faster for game editors to build
menus.
This CL also fixes the bad formating and extra line for the asset list.
TBR=sbc@chromium.org
NOTRY=true
BUG=171141
Review URL: https://codereview.chromium.org/
14102004
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1543
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@google.com [Mon, 1 Apr 2013 18:41:24 +0000 (18:41 +0000)]
Add editting of LUA files
Update Makefile to use local common.mk (to turn off incognito which causes TEMPFS to fail).
Adds one TextArea which is used to edit files listed in assets.def
Added a LoadResource and SaveResource routine which will first try and fetch a file from
the TEMPFS, and if not found, load it via URL.
R=sbc@chromium.org
BUG=171141
Review URL: https://codereview.chromium.org/
13302004
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1542
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 29 Mar 2013 17:50:49 +0000 (17:50 +0000)]
[nacltoons] Add multi-body touch events
Handle touch events that occur over more than once body.
Also, Roll cocos2dx deps to get CCLusStack::pushUserType.
Review URL: https://codereview.chromium.org/
12925006
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1541
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 29 Mar 2013 17:46:17 +0000 (17:46 +0000)]
[nacltoons] Add support for lua update handlers
Add support for script events on drawn objects. Since
scripts can be shared between multiple objects pass 'self'
to all touch and contact events.
Add tapcount (double click) detection.
Review URL: https://codereview.chromium.org/
13004013
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1540
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 26 Mar 2013 19:59:53 +0000 (19:59 +0000)]
[nacltoons] Use more consistent lua module system.
This system is based on the recomendations here:
http://lua-users.org/wiki/LuaModuleFunctionCritiqued
BUG=
Review URL: https://codereview.chromium.org/
12567016
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1539
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 26 Mar 2013 00:32:01 +0000 (00:32 +0000)]
[nacltoons] Do touch detections using box2d.
Box2D is can very quickly tell is which bodies a touch
even occurs on. Use this rather than doing it ourselves
in lua.
Also, move object registration out of validate.lua.
Review URL: https://codereview.chromium.org/
13071010
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1538
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Mon, 25 Mar 2013 23:38:07 +0000 (23:38 +0000)]
[nacltoons] Add custom level scripts
Also, the level.def is now parsed directly into the level_obj
global rather then being a member of it.
Review URL: https://codereview.chromium.org/
12702013
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1537
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Mon, 25 Mar 2013 20:51:30 +0000 (20:51 +0000)]
[nacltoons] Add touch handling and drawing in lua.
Lua objects can now receive touch events.
Move all drawing code to drawing.lua. Game is now in
charge of the drawing, and currently uses the default
touch handlers provided by drawing.lua. The drawing
code no longer relies on render to texture or full
screen polys.
Add background music and background image support.
Add ability to set sprite color in def files.
Review URL: https://codereview.chromium.org/
12681007
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1536
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 20 Mar 2013 19:38:11 +0000 (19:38 +0000)]
[nacltoons] Roll cocos2dx version
This brings in fixes we've made to CCPhysicsNode as well as
recent upstream history.
TBR=binji
Review URL: https://codereview.chromium.org/
12545054
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1535
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 19 Mar 2013 19:32:38 +0000 (19:32 +0000)]
[nacltoons] Add linux host build.
Also, add some easing actions to level selection menu as an example
of how to so node animations.
Review URL: https://codereview.chromium.org/
12700018
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1534
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 14 Mar 2013 21:53:38 +0000 (21:53 +0000)]
[nacltoons] Move scene and menu management to lua
This change does not effect the behaviour of the sample game
but moves more of the game logic into lua code.
It is now up to the game (game.lua) to add any menus, layers,
or flow needed to start, stop and move between levels.
To keep the sample games simple a default game behavior
script contains a standard level selection code. The idea
is that this can be cloned an modified.
Review URL: https://codereview.chromium.org/
12603004
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1533
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 13 Mar 2013 00:48:43 +0000 (00:48 +0000)]
[nacltoons] Reference resources directly from checkout location
This allows editing of files in-place to take effect
without re-publishing.
Review URL: https://codereview.chromium.org/
12413017
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1532
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 12 Mar 2013 23:01:03 +0000 (23:01 +0000)]
[nacltoons] Add new 'edge' shape for defining ground/walls in data files.
Remove hard-coded ground definition from C++ code.
Review URL: https://codereview.chromium.org/
12798003
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1531
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 12 Mar 2013 18:58:27 +0000 (18:58 +0000)]
[nacltoons] Roll cocos2dx version.
This brings in the latest upstream changes from cocos2dx,
including some CLs that were upstreamed from us.
Review URL: https://codereview.chromium.org/
12781010
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1530
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 12 Mar 2013 17:35:11 +0000 (17:35 +0000)]
[nacltoons] Refactor game data description files.
Pure data files now use the .def extension.
game.def now describes the game and pointers to
the .lua logic for the game. This is now much
closer to the game design document.
Add validator.lua that checks .def files as they are
read in.
This change is a refactor only and should not effect
the game in any visible way.
Review URL: https://codereview.chromium.org/
12742003
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1529
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Sat, 9 Mar 2013 02:06:27 +0000 (02:06 +0000)]
[nacltoons] Add Makefile for building lua bindings.
Include basic.lua helper script which performs some
modifications on the generated code.
BUG=None
Review URL: https://codereview.chromium.org/
12634010
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1528
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Sat, 9 Mar 2013 01:35:31 +0000 (01:35 +0000)]
[nacltoons] Rename core classes in accordance with doc.
game_manager is now in charge of creating scenes, and
moving between them. gameplay_scene used to do this but
now we no longer subclass scene at all.
physics_layer -> level_layer
BUG=
Review URL: https://codereview.chromium.org/
12579005
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1527
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@google.com [Fri, 8 Mar 2013 01:04:18 +0000 (01:04 +0000)]
Added HTML editor
Use common.js and add edit.js to enable editing via HTML. This change
addes some menu items and text fields which can then be used to reset
the game engine to reload the whole game or just a level.
Plumbing in NaCl is a seperate CL.
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/
12640005
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1526
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 8 Mar 2013 00:32:56 +0000 (00:32 +0000)]
[nacltoons] Move game logic (behavior) to lua.
The game can now optionally include behaviour.lua file
which can define a 'ContactBegan' function. This function
is called whenever new box2d collisions occur. The arguments
passed are the integer tags assigned to the box2d bodies.
The lua code can then call LevelComplete on the layer to
signal that the goal has been reached.
BUG=None
Review URL: https://codereview.chromium.org/
12642005
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1525
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 7 Mar 2013 23:34:35 +0000 (23:34 +0000)]
[nacltoons] Add level selection screen.
Also, remove -lnosys to fix linker warnings.
BUG=None
Review URL: https://codereview.chromium.org/
12634007
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1524
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 7 Mar 2013 18:32:55 +0000 (18:32 +0000)]
[nacltoons] Improve lua integration.
loader.lua is now loaded just once on startup and its global
'main()' function is used to load levels on demand.
main() takes argument so there is no more need for
PhysicsLayer::GetCurrent().
Review URL: https://codereview.chromium.org/
12550005
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1523
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 7 Mar 2013 18:30:08 +0000 (18:30 +0000)]
[nacltoons] Roll cocos2dx deps
The revision currently in DEPS is no longer referenced by
any remote branch.
TBR=binji
Review URL: https://codereview.chromium.org/
12630004
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1522
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 7 Mar 2013 18:11:42 +0000 (18:11 +0000)]
[nacltoons] Apply google style
Review URL: https://codereview.chromium.org/
12550004
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1521
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 7 Mar 2013 18:10:29 +0000 (18:10 +0000)]
[nacltoons] Remove legacy nacl_mounts support.
Roll cocos2dx to a version that also has nacl_mounts
removed.
R=binji
Review URL: https://codereview.chromium.org/
12472014
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1520
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 5 Mar 2013 01:06:00 +0000 (01:06 +0000)]
[nacltoons] Add dependencies between main nexe and cocos libs.
Previously changes to cocos (or box2d or lua) would not
result in the game re-linking.
Review URL: https://codereview.chromium.org/
12390078
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1519
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Mon, 4 Mar 2013 23:47:25 +0000 (23:47 +0000)]
[nacltoon] Roll cocos2dx again to bring in another Box2D fix.
This version should be for all three architectures with
zero warnings.
TBR=binji
Review URL: https://codereview.chromium.org/
12377096
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1518
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Mon, 4 Mar 2013 23:07:54 +0000 (23:07 +0000)]
[nacltoons] Roll cocos2dx to fix ARM build
R=binji
Review URL: https://codereview.chromium.org/
12374096
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1517
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Mon, 4 Mar 2013 21:14:02 +0000 (21:14 +0000)]
[nacltoons] Use box2d sensors to detect collisions.
Also, roll cocos2dx version, now that our port has been upstreamed.
BUG=None
Review URL: https://codereview.chromium.org/
12387095
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1516
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 1 Mar 2013 22:17:41 +0000 (22:17 +0000)]
[nacltoons] Allow fixtures (static and dynamic) to be defined in game data.
BUG=None
Review URL: https://codereview.chromium.org/
12391040
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1515
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 28 Feb 2013 23:26:16 +0000 (23:26 +0000)]
[nacltoons] Add design resolution.
Adding a design resoltuion allows the game to be designed at
one resolution and run at another.
Also add brush clamping.
Review URL: https://codereview.chromium.org/
12380036
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1514
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 27 Feb 2013 22:05:06 +0000 (22:05 +0000)]
[nacltoons] And some game logic and level loading from lua.
- Add lua bindings for CCPhysicsSprite and Box2D.
- Add level loading in lua
- Add a sample level set (currently programmer art only)
BUG=171141
Review URL: https://codereview.chromium.org/
12330158
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1513
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 26 Feb 2013 20:28:39 +0000 (20:28 +0000)]
[nacltoons] Don't built with nacl-mounts by default
The bots don't have nacl-mounts installed, nor to they
build it as part of the game build anymore.
TEST=make all
BUG=None
Review URL: https://codereview.chromium.org/
12316137
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1512
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 26 Feb 2013 20:04:42 +0000 (20:04 +0000)]
[nacltoons] Roll cocos2dx version.
Use naclports from the SDK proper rather than
building it locally, but roll the naclports DEPS
so that the new webp port can be built locally if
needed.
Check for min SDK version.
Honor NACL_ARCH when building cocos2dx to that we
can be (by default) build for just a single arch.
BUG=None
Review URL: https://codereview.chromium.org/
12315044
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1511
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Mon, 25 Feb 2013 22:54:14 +0000 (22:54 +0000)]
[nacltoons] Switch to SDK build system (common.mk)
Remove forked .mk files from 'build'.
Don't copy cocos headers unless they are newer that the
ones in the target folder.
BUG=None
Review URL: https://codereview.chromium.org/
12319004
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1510
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 19 Feb 2013 23:26:41 +0000 (23:26 +0000)]
[nacltoons] roll cocos2dx revision
This removes the fontconfig dependency.
Also, roll back to using nacl_mounts until nacl_io http
mount is fast enough and make it easy to switch between
the two.
BUG=None
Review URL: https://codereview.chromium.org/
12303043
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1509
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 15 Feb 2013 18:02:24 +0000 (18:02 +0000)]
[nacltoons] Add physics drawing code
BUG=None
Review URL: https://codereview.chromium.org/
12212172
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1508
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 14 Feb 2013 01:51:22 +0000 (01:51 +0000)]
[VS Addin] Bump SDK version required for pnacl builds.
Turns out a working pnacl toolchain didn't make it into 24.
This change should fix the failing test on the waterfall.
TBR=binji
BUG=None
Review URL: https://codereview.chromium.org/
12255022
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1507
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 14 Feb 2013 00:07:11 +0000 (00:07 +0000)]
[VS Addin] Fix typo in test code for parallel builds.
BUG=https://code.google.com/p/chromium/issues/detail?id=174685
Review URL: https://codereview.chromium.org/
12207169
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1506
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 13 Feb 2013 00:42:07 +0000 (00:42 +0000)]
[nacltoons] Cleanup initial game code.
Changes based on feedback from https://codereview.chromium.org/
12226130/
BUG=None
Review URL: https://codereview.chromium.org/
12220140
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1505
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 12 Feb 2013 23:31:25 +0000 (23:31 +0000)]
[nacltoons] Add initial frontend and physics game scenes.
The only resource we are now using from the cococs sample
is the blocks.png image file.
BUG=None
Review URL: https://codereview.chromium.org/
12226130
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1504
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 12 Feb 2013 22:51:21 +0000 (22:51 +0000)]
[NaCl Addin] Fix parsing of dependency file.
Parsing of dependency files that contain spaces in filenames
was broken.
BUG=https://code.google.com/p/chromium/issues/detail?id=174685
TEST=run unittests
Review URL: https://codereview.chromium.org/
12207047
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1503
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 12 Feb 2013 01:40:32 +0000 (01:40 +0000)]
[VS Addin] Fix parallel building.
There was a bug in the calling code for compiler_wrapper.
New unit test added to prevent regression.
BUG=
Review URL: https://codereview.chromium.org/
12248006
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1502
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 12 Feb 2013 01:31:01 +0000 (01:31 +0000)]
Clear out all sample code.
This enables us to start from a blank canvas for creating
our game.
BUG=171141
Review URL: https://codereview.chromium.org/
12217123
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1501
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@google.com [Wed, 6 Feb 2013 23:49:09 +0000 (23:49 +0000)]
Update nacltoon Makefile
Update Makefile to remove cocos stamp so we alwasy try to rebuild.
Delete out/publish to fix SVN issue
TBR=binji@chromium.org
Review URL: https://codereview.chromium.org/
12209048
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1500
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 6 Feb 2013 22:10:09 +0000 (22:10 +0000)]
Roll cocos2dx version.
This change allows us to re-target the object file locations
when building cocos which means we no longer need to clean
to between configuration.
BUG=
Review URL: https://codereview.chromium.org/
12208036
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1499
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 6 Feb 2013 02:11:27 +0000 (02:11 +0000)]
Teach common.mk how to be quiet.
These changes only effect nacltoons for now but I hope they
will get merged back into out primary common.mk file.
Also, use sensible default CHROME_PATH.
Also, don't use oshelpers except on win32 (just adds noise
to make output).
BUG=
Review URL: https://codereview.chromium.org/
12210022
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1498
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 5 Feb 2013 22:50:29 +0000 (22:50 +0000)]
Start initial work on game example.
Rename main class to GameplayScene.cpp.
Add 'all' dependancy to publish target so it doesn't start
publishing before its built anything.
Make background color non-white so FPS counter shows up.
Add physics.
BUG=None
Review URL: https://codereview.chromium.org/
12208005
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1497
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 5 Feb 2013 21:20:11 +0000 (21:20 +0000)]
[NaCl Addin] Add testing against pepper_24.
Also, add/cleanup annotator output for the addin.
BUG=None
Review URL: https://codereview.chromium.org/
12197018
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1496
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 5 Feb 2013 21:06:50 +0000 (21:06 +0000)]
Roll cocos version and build cocos lua support.
BUG=
Review URL: https://codereview.chromium.org/
12185030
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1495
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Mon, 4 Feb 2013 20:16:36 +0000 (20:16 +0000)]
Cleanup annotator output
Don't report game build phase until we actually start
building the game.
Use "make foo" rather than "Making foo".
BUG=None
Review URL: https://codereview.chromium.org/
12178020
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1494
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Sat, 2 Feb 2013 00:50:39 +0000 (00:50 +0000)]
Roll cocos2dx deps
This brings in the fix for Box2D build so that it
will honour LIB_DIR.
R=binji
BUG=None
Review URL: https://codereview.chromium.org/
12175002
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1493
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 1 Feb 2013 23:36:15 +0000 (23:36 +0000)]
Remove legacy docs and gallery
Also, update NOTICE, removing references to things
no longer in the checkout.
BUG=None
Review URL: https://codereview.chromium.org/
12088091
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1492
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 1 Feb 2013 23:34:29 +0000 (23:34 +0000)]
Cleanup nacltoons annotator output
BUG=None
Review URL: https://codereview.chromium.org/
12114055
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1491
050acbb0-2703-11df-ab0a-
9f3f633ae91d
binji@chromium.org [Fri, 1 Feb 2013 23:19:26 +0000 (23:19 +0000)]
Build/run game as packaged app.
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/
12089118
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1490
050acbb0-2703-11df-ab0a-
9f3f633ae91d
binji@chromium.org [Fri, 1 Feb 2013 22:11:02 +0000 (22:11 +0000)]
Fix "make run" after last change.
Also added "make publish"
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/
12163007
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1489
050acbb0-2703-11df-ab0a-
9f3f633ae91d
binji@chromium.org [Fri, 1 Feb 2013 21:41:03 +0000 (21:41 +0000)]
Move sources to src, data to data.
BUG=none
TBR=sbc@chromium.org
Review URL: https://codereview.chromium.org/
12091114
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1488
050acbb0-2703-11df-ab0a-
9f3f633ae91d
binji@chromium.org [Fri, 1 Feb 2013 20:32:42 +0000 (20:32 +0000)]
Cocos2dx build depends on naclports build.
BUG=none
TBR=sbc@chromium.org
Review URL: https://codereview.chromium.org/
12086111
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1487
050acbb0-2703-11df-ab0a-
9f3f633ae91d
binji@chromium.org [Fri, 1 Feb 2013 20:23:11 +0000 (20:23 +0000)]
Use SDK Makefile for game.
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/
12147003
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1486
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 1 Feb 2013 01:32:44 +0000 (01:32 +0000)]
nacltoons starting point is now the SimpleGame from cocos2dx
R=binji
BUG=None
Review URL: https://codereview.chromium.org/
12156003
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1485
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 1 Feb 2013 00:59:49 +0000 (00:59 +0000)]
Build CocosDenshion sound library.
Roll naclports and cocos2dx version.
Build sound-related naclports.
Build game target by default.
BUG=None
Review URL: https://codereview.chromium.org/
12155002
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1484
050acbb0-2703-11df-ab0a-
9f3f633ae91d
binji@chromium.org [Thu, 31 Jan 2013 23:59:44 +0000 (23:59 +0000)]
Fix buildbot script.
* Download naclsdk, build w/ NACL_SDK_ROOT
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/
12092097
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1483
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 31 Jan 2013 23:53:15 +0000 (23:53 +0000)]
Don't ignore failures in build-cocos2dx.sh.
Also have make clean clean the naclports and cocos stamps.
R=binji
BUG=
Review URL: https://codereview.chromium.org/
12094088
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1482
050acbb0-2703-11df-ab0a-
9f3f633ae91d
binji@chromium.org [Thu, 31 Jan 2013 22:58:55 +0000 (22:58 +0000)]
Roll DEPS for cocos2dx
R=sbc@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/
12149002
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1481
050acbb0-2703-11df-ab0a-
9f3f633ae91d
binji@chromium.org [Thu, 31 Jan 2013 19:15:44 +0000 (19:15 +0000)]
Initial build setup for nacltoons using Cocos2dx.
BUG=crbug.com/171141
R=noelallen@chromium.org, sbc@chromium.org
Review URL: https://codereview.chromium.org/
12100005
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1480
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@google.com [Wed, 30 Jan 2013 20:06:48 +0000 (20:06 +0000)]
Add buildbot script and disable tree status
Add a builtbot script to start building the example game.
Disable tree status until it is ready.
TBR=binji@chromium.org
Review URL: https://codereview.chromium.org/
12083007
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1479
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@chromium.org [Mon, 21 Jan 2013 07:58:22 +0000 (07:58 +0000)]
Update Font
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1478
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@google.com [Sun, 20 Jan 2013 01:10:14 +0000 (01:10 +0000)]
font files
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1477
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@google.com [Sun, 20 Jan 2013 01:10:02 +0000 (01:10 +0000)]
RenderAsset
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1476
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@google.com [Sun, 20 Jan 2013 01:09:54 +0000 (01:09 +0000)]
Add RenderAssets
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1475
050acbb0-2703-11df-ab0a-
9f3f633ae91d
noelallen@google.com [Thu, 17 Jan 2013 04:47:10 +0000 (04:47 +0000)]
Add first pass of nacltoons
Contains a copy of the 3D example.
Plus script for generating Font outlines.
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1474
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 12 Dec 2012 18:46:38 +0000 (18:46 +0000)]
[NaCl SDK Addin] Add arm support in visual studio
Also, don't pass -t to create_nmf on newer versions of the SDK.
BUG=
Review URL: https://codereview.chromium.org/
11547004
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1473
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Sat, 8 Dec 2012 01:20:09 +0000 (01:20 +0000)]
[NaCl SDK Addin] Fix detection of PNaCl toolchain.
The check was incorrectly looking at the revsion alone which
can be higher for older version (e.g it can be higher on 23
than it is on 24).
BUG=
Review URL: https://codereview.chromium.org/
11475048
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1472
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 29 Nov 2012 01:16:10 +0000 (01:16 +0000)]
oops
BUG=
Review URL: https://codereview.chromium.org/
11421140
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1471
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 28 Nov 2012 23:44:45 +0000 (23:44 +0000)]
[NaCl Addin] Fix for broken pnacl debugging
BUG=
Review URL: https://codereview.chromium.org/
11414210
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1470
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 21 Nov 2012 00:32:45 +0000 (00:32 +0000)]
[NaCl Add] Define WIN32 by default for PPAPI host builds
BUG=
Review URL: https://codereview.chromium.org/
11421016
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1469
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Mon, 19 Nov 2012 18:31:03 +0000 (18:31 +0000)]
[NaCl Addin] Remove .so target from pnacl platform.
Also fix name of target nexe -> pexe. This change
is actually tiny, but involves forking two existing
files.
BUG=
Review URL: https://codereview.chromium.org/
11414040
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1468
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 15 Nov 2012 20:26:14 +0000 (20:26 +0000)]
[NaCl Addin] Add new property for setting name of index page.
As a result of this change we no longer need to ship the
.user file for the hello_world_gles example, which is good.
Also, add missing index_pnacl.html.
BUG=
Review URL: https://codereview.chromium.org/
11359218
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1467
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Mon, 12 Nov 2012 21:57:38 +0000 (21:57 +0000)]
[NaCl Addin] Fix to PNaCl lib creation from MSVS
Enable PNaCl in the addin for recent pepper builds.
Fix path to httpd.py (it was moved in pepper_canary).
BUG=
Review URL: https://codereview.chromium.org/
11375004
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1466
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 8 Nov 2012 19:44:18 +0000 (19:44 +0000)]
[NaCl Addin] Fix building of libraries in MSVS.
This also adds unit tests that build static and shared
libraries so this cannot happen again.
I've also added copyright header to all C# files.
BUG=
Review URL: https://codereview.chromium.org/
11360111
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1465
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 6 Nov 2012 22:59:58 +0000 (22:59 +0000)]
Honor toolchain name in output folder.
Without this change glibc targets would always end up on the
newlib build folder.
BUG=
Review URL: https://codereview.chromium.org/
11358127
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1464
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Thu, 1 Nov 2012 18:33:16 +0000 (18:33 +0000)]
[VS Addin] Add PNaCl configs to examples.
Also, cleanup link messages, and add missing arguments
to PNaCl linker plugin.
BUG=
Review URL: https://codereview.chromium.org/
11367026
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1463
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 31 Oct 2012 21:20:15 +0000 (21:20 +0000)]
[VS Addin] Add automatic nmf creation
BUG=
Review URL: https://codereview.chromium.org/
11348050
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1462
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 31 Oct 2012 20:15:18 +0000 (20:15 +0000)]
[VS Addin] Test result parser now handles inconclusive results.
Inconclusive results are the MS unit tests way of signalling
that a test was skipped. We don't want to treat these tests
as failures on the bots.
This change also cleans up the output of check_test_results.
BUG=
Review URL: https://codereview.chromium.org/
11366011
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1461
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 31 Oct 2012 17:35:48 +0000 (17:35 +0000)]
[VS Addin] Disable PNaCl adding tests until newer SDK is available.
This should fix the current test failures on the bot.
BUG=
Review URL: https://codereview.chromium.org/
11340059
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1460
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 31 Oct 2012 00:13:35 +0000 (00:13 +0000)]
Add PNaCl support for VS addin.
The primary changes here are due to the fact that the
link phase for PNaCl differs significantly from from
NaCl one. Also, since PNaCl toolchains is a bat file
that calls python script, we need to ensure that python
is in the path for all PNaCl builds.
The link phase was using automatic depenedacy tracking
previously but this process fails to launch the python
process successfully, so we now write the .tlog manually
in the same way we do for the compiler phase.
BUG=
Review URL: https://codereview.chromium.org/
11266051
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1459
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 30 Oct 2012 21:17:52 +0000 (21:17 +0000)]
Add more properties to the VS property sheets file
for the NaCl target.
It was reported by one of our users that property
sheets could not be used with the NaCl platform.
BUG=153805
Review URL: https://codereview.chromium.org/
10983016
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1458
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 23 Oct 2012 01:02:59 +0000 (01:02 +0000)]
[NaCl SDK] move VSNaClSDKRoot into ConfigurationGeneral section
This change removes a lot of the hacking we were previously
doing to make sure that the value of VSNaClSDKRoot was
available in all the right place.
BUG=
Review URL: https://codereview.chromium.org/
11225037
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1457
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Fri, 19 Oct 2012 20:27:56 +0000 (20:27 +0000)]
Remove unneeded command line args from VS addin examples.
Remove --enable-nacl and --no-sandbox from PPAPI plugin runs.
Remove unneeded/harmful .user file.
BUG=
Review URL: https://codereview.chromium.org/
11223003
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1456
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Wed, 17 Oct 2012 19:16:01 +0000 (19:16 +0000)]
Fix for Visual Studio prompting for $(CHROME_PATH).
We need to make sure that the expanded version of
$(CHROME_PATH) is always used, otherwise Visual Studio will
complain, so we expand this variable on within the
"LocalDebuggerCommand" as part of the project modifications
that we do when NaCl/PPAPI are first added to the project.
The problem is that the "LocalDebuggerCommand" is stored not
in the project itself but in the .user file. This change
means that even if the user deletes that .user file (or more
likely receives a project files without an accompanying
.user file) we detect that $(CHROME_PATH) is within
"LocalDebuggerCommand" and force an update to the settings
at that time.
BUG=155094
Review URL: https://codereview.chromium.org/
11192036
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1455
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 16 Oct 2012 22:01:19 +0000 (22:01 +0000)]
fix hello_nacl compile error
BUG=
Review URL: https://codereview.chromium.org/
11191014
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1454
050acbb0-2703-11df-ab0a-
9f3f633ae91d
sbc@chromium.org [Tue, 16 Oct 2012 20:00:16 +0000 (20:00 +0000)]
Update example comments based on feedback form Mark
BUG=
Review URL: https://codereview.chromium.org/
11187006
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1453
050acbb0-2703-11df-ab0a-
9f3f633ae91d