6 years agoMerge remote-tracking branch 'origin/breaking-rocket' breaking-rocket
Tuomo Turunen [Thu, 5 Jul 2012 12:10:19 +0000 (15:10 +0300)]
Merge remote-tracking branch 'origin/breaking-rocket'


6 years agoRevert "Adapting to latest SFML and Thor changes:"
Tuomo Turunen [Thu, 5 Jul 2012 11:31:22 +0000 (14:31 +0300)]
Revert "Adapting to latest SFML and Thor changes:"

This reverts commit 9b442836bb6d72fd7daa5b37a2b4f20fe278f5b8.

6 years agoTaken the ASSERT_*_PTR macros into use also outside the Core where possible.
Tuomo Turunen [Thu, 5 Jul 2012 11:03:40 +0000 (14:03 +0300)]
Taken the ASSERT_*_PTR macros into use also outside the Core where possible.

6 years agoUpdated cavemodel with higher resolution texture.
Antti Virtanen [Wed, 4 Jul 2012 22:59:07 +0000 (01:59 +0300)]
Updated cavemodel with higher resolution texture.
Using more accurate method (watermap) for calculating shapes from model.

6 years agoNot tilting view anymore. It makes really hard to align it with flat SFML rendering.
Antti Virtanen [Wed, 4 Jul 2012 22:18:34 +0000 (01:18 +0300)]
Not tilting view anymore. It makes really hard to align it with flat SFML rendering.

6 years agoNot flipping y-axis in the fragment shader anymore. We can do that directly to model...
Antti Virtanen [Wed, 4 Jul 2012 21:58:17 +0000 (00:58 +0300)]
Not flipping y-axis in the fragment shader anymore. We can do that directly to model matrix.

6 years agoPlayer destructor now detaches from rocket. Valgrind noticed that Rocket destructor...
Antti Virtanen [Wed, 4 Jul 2012 15:10:55 +0000 (18:10 +0300)]
Player destructor now detaches from rocket. Valgrind noticed that Rocket destructor used already delete Player when World was destructed.

6 years agoSfmlClient with 3d rendering now finally works. Window deactivation after initializat...
Antti Virtanen [Wed, 4 Jul 2012 15:00:03 +0000 (18:00 +0300)]
SfmlClient with 3d rendering now finally works. Window deactivation after initialization was done at the wrong place...

6 years agoIncluded critical damage into statistics. Score calculation works the same way
Tuomo Turunen [Wed, 4 Jul 2012 10:26:55 +0000 (13:26 +0300)]
Included critical damage into statistics. Score calculation works the same way
as with normal damage: each object can define the score got from critical
damage and causing critical damage to own team is negative score.

6 years agoNow lost shapes can be restored by going to base. The logic is:
Tuomo Turunen [Tue, 3 Jul 2012 15:46:44 +0000 (18:46 +0300)]
Now lost shapes can be restored by going to base. The logic is:
- Base prototype defines timer (in milliseconds) how long the rocket has to be
  in the base for restoring one shape (zero timer means that in that base shapes
  cannot be restored)
- If the rocket leaves the base and comes back, the timer starts from beginning
- Shapes are restored always starting from index one and forwards, meaning that
  the shape with the smallest index (excluding zero) is restored first

6 years agoAdded ability to gain lost shapes back for rocket when recharging in a base.
Tuomo Turunen [Mon, 2 Jul 2012 20:01:36 +0000 (23:01 +0300)]
Added ability to gain lost shapes back for rocket when recharging in a base.
For now all shapes are restored at once, so some logic needs to be invented for

6 years agoFixed indentation.
Tuomo Turunen [Mon, 2 Jul 2012 16:33:20 +0000 (19:33 +0300)]
Fixed indentation.

6 years agoChanged the probability of critical hit from 100% to 5% with little-ball.
Tuomo Turunen [Mon, 2 Jul 2012 16:32:11 +0000 (19:32 +0300)]
Changed the probability of critical hit from 100% to 5% with little-ball.

6 years agoRemoved prototyping code and implemented real code for breaking any objects into
Tuomo Turunen [Mon, 2 Jul 2012 15:22:38 +0000 (18:22 +0300)]
Removed prototyping code and implemented real code for breaking any objects into
- Object's prototype defines probabilities for each shape to brake (the first
  shape is unbreakable)
- Object provides causeCriticalDamage() function, which can be called when
  critical damage is caused for the object. It can also be called from lua
- When causeCriticalDamage() is called, one random shape based on the
  probabilities given on the prototype is removed
- little-ball-projectile.lua script gives a dummy example how to use this new

6 years agoNow also weapons can be disabled once the bound shape is lost.
Tuomo Turunen [Sun, 1 Jul 2012 21:22:30 +0000 (00:22 +0300)]
Now also weapons can be disabled once the bound shape is lost.

6 years agoMade it possible to bind rocket engines with certain shapes so that when the
Tuomo Turunen [Sun, 1 Jul 2012 20:18:38 +0000 (23:18 +0300)]
Made it possible to bind rocket engines with certain shapes so that when the
shape is lost, the engine stops working. By default engine is not bound to any
particular shape, so this feature is not on by default.

6 years agoChanged rocket to have list of forward and backward engines instead of single
Tuomo Turunen [Sun, 1 Jul 2012 17:47:52 +0000 (20:47 +0300)]
Changed rocket to have list of forward and backward engines instead of single
rear and singe front engine. Each engine has its own thrust and forward engines
have also turbo thrust. This is enabler to make engines to break or disappear
when pieces of rocket are lost.

6 years agoRemoved gluPerspective initialization.
Antti Virtanen [Sun, 1 Jul 2012 14:00:34 +0000 (17:00 +0300)]
Removed gluPerspective initialization.
Added glCheck to some calls where it was missing.
Wireframe rendering can be used with SfmlClient.

6 years agoAdapting to latest SFML and Thor changes:
Tuomo Turunen [Sun, 1 Jul 2012 08:23:23 +0000 (11:23 +0300)]
Adapting to latest SFML and Thor changes:
- Need to include <SFML/Graphics.hpp> in GfxObject.cxx
- thor::Vertex has been removed, using sf::Vector2f instead
- 'Back' has been renamed to 'BackSpace'
- Temporarily disabled usage of thor::triangulate(), because it crashes

6 years agoMoved diffuse texture to separate file and replaced cavemodel_TX.jpg with composed...
Antti Virtanen [Fri, 29 Jun 2012 15:01:46 +0000 (18:01 +0300)]
Moved diffuse texture to separate file and replaced cavemodel_TX.jpg with composed texture.

6 years agoRenderContext is now passed as non-const because rendering mode can be changed.
Antti Virtanen [Fri, 29 Jun 2012 14:56:13 +0000 (17:56 +0300)]
RenderContext is now passed as non-const because rendering mode can be changed.
RenderContext matrices improved: model is flipped to proper aligment and view is scaled with correct coefficients. Not perfect yet but getting closer.

6 years agoAligned cavemodel shapes with proper offset to get it matched with model.
Antti Virtanen [Fri, 29 Jun 2012 14:53:51 +0000 (17:53 +0300)]
Aligned cavemodel shapes with proper offset to get it matched with model.

6 years agoAdded public pixel<->meter conversion coefficients.
Antti Virtanen [Fri, 29 Jun 2012 14:52:56 +0000 (17:52 +0300)]
Added public pixel<->meter conversion coefficients.

6 years agoWorld borders doesn't have to necessarily start from (0,0)
Antti Virtanen [Fri, 29 Jun 2012 14:25:41 +0000 (17:25 +0300)]
World borders doesn't have to necessarily start from (0,0)

6 years agoMax vertices in mesh is now configured properly to get something drawn.
Antti Virtanen [Fri, 29 Jun 2012 13:51:50 +0000 (16:51 +0300)]
Max vertices in mesh is now configured properly to get something drawn.

6 years agoFixed bug from ShaderCache::getUniformLocation().
Antti Virtanen [Fri, 29 Jun 2012 13:00:29 +0000 (16:00 +0300)]
Fixed bug from ShaderCache::getUniformLocation().
OpenGL states are now correctly saved before using SFML rendering.

6 years agoAdded new option --offset to png2shape.
Antti Virtanen [Thu, 28 Jun 2012 21:55:29 +0000 (00:55 +0300)]
Added new option --offset to png2shape.
Updated README how to generated properly scaled shapes from model heightmap.
Updated cavemodel shapes.

6 years agoRefactored ShapeFactory
Antti Virtanen [Thu, 28 Jun 2012 21:41:15 +0000 (00:41 +0300)]
Refactored ShapeFactory

6 years agoCollision borders are now created to the world.
Antti Virtanen [Thu, 28 Jun 2012 21:38:32 +0000 (00:38 +0300)]
Collision borders are now created to the world.

6 years agoAdjust rocket's thrusting according to 'current mass / original mass'. This way
Tuomo Turunen [Thu, 28 Jun 2012 21:11:11 +0000 (00:11 +0300)]
Adjust rocket's thrusting according to 'current mass / original mass'. This way
the rocket doesn't become Speedy Gonzales when pieces fall out of it and its
mass decreases.

6 years agoHave bitmask of existing shapes in each object and send that to client so that
Tuomo Turunen [Thu, 28 Jun 2012 20:47:43 +0000 (23:47 +0300)]
Have bitmask of existing shapes in each object and send that to client so that
client can skip drawing those shapes which do not exist in the object anymore.
The bitmask is 64-bit int, so this also means that the maximum number of shapes
per object is 64.

6 years agoKeep shapes and fixtures in vector rather than in list, so that it is easy to
Tuomo Turunen [Thu, 28 Jun 2012 19:11:12 +0000 (22:11 +0300)]
Keep shapes and fixtures in vector rather than in list, so that it is easy to
check which indexes has been removed.

6 years agoRemember the created fixtures in Object for later use.
Tuomo Turunen [Thu, 28 Jun 2012 18:36:16 +0000 (21:36 +0300)]
Remember the created fixtures in Object for later use.

6 years agoAdded prototype code for breaking rocket to multiple pieces:
Tuomo Turunen [Thu, 28 Jun 2012 15:31:49 +0000 (18:31 +0300)]
Added prototype code for breaking rocket to multiple pieces:
When firing weapon #1, one piece of the rocket is removed and created as its
own Item. The rocket is still drawn as original rocket, because SfmlClient
draws the rocket based on the prototype. This needs to be solved...

6 years agoMerge branch 'master' of
Tuomo Turunen [Wed, 27 Jun 2012 05:39:32 +0000 (08:39 +0300)]
Merge branch 'master' of

6 years agoDeprecated old ModelManager from SfmlClient. It has been replaced with new one in...
Antti Virtanen [Tue, 26 Jun 2012 23:24:53 +0000 (02:24 +0300)]
Deprecated old ModelManager from SfmlClient. It has been replaced with new one in GLUtil.
GfxObject::draw() now tries to configure shader before rendering model with it.

6 years agoImplemented caching for shader attribute and uniform locations.
Antti Virtanen [Tue, 26 Jun 2012 22:56:51 +0000 (01:56 +0300)]
Implemented caching for shader attribute and uniform locations.

6 years agoChanges things a bit back that I did in dfb9d070b354e40e5b89c38a49e2c6dd70050a17...
Antti Virtanen [Tue, 26 Jun 2012 21:38:27 +0000 (00:38 +0300)]
Changes things a bit back that I did in dfb9d070b354e40e5b89c38a49e2c6dd70050a17. Maybe it is anyway better that Window provides proper facade for sf::Window.

6 years agoAdded "multi-piece-rocket", which consist of multiple (8) pieces.
Tuomo Turunen [Tue, 26 Jun 2012 18:24:59 +0000 (21:24 +0300)]
Added "multi-piece-rocket", which consist of multiple (8) pieces.

6 years agoAdded possibility to define rope and weld joints between items in world
Tuomo Turunen [Mon, 25 Jun 2012 19:00:54 +0000 (22:00 +0300)]
Added possibility to define rope and weld joints between items in world
prototype. The "cave_2000_2500" demonstrates this with two joints.

6 years agoImplemented ShaderCache stub and reorganized rendering responsibilities between windo...
Antti Virtanen [Sun, 24 Jun 2012 23:39:07 +0000 (02:39 +0300)]
Implemented ShaderCache stub and reorganized rendering responsibilities between windowmanager and window a bit.

6 years agoEnabled blending and color buffer clearing.
Antti Virtanen [Sun, 24 Jun 2012 23:27:27 +0000 (02:27 +0300)]
Enabled blending and color buffer clearing.

6 years agoRelocated GfxObject class into separate file.
Antti Virtanen [Sun, 24 Jun 2012 22:48:42 +0000 (01:48 +0300)]
Relocated GfxObject class into separate file.

6 years agoRopeObject and RopeObjectUpdate now inherit from basic types of DataModel. This way...
Antti Virtanen [Sun, 24 Jun 2012 22:32:01 +0000 (01:32 +0300)]
RopeObject and RopeObjectUpdate now inherit from basic types of DataModel. This way we can get ropes drawn with minimal changes.

6 years agoImplemented RenderContext which contains necessary data to know how to render and...
Antti Virtanen [Sun, 24 Jun 2012 20:41:38 +0000 (23:41 +0300)]
Implemented RenderContext which contains necessary data to know how to render and where.

6 years agoAdded initial support for drawing rope. Not tested yet because WindowManager doesn...
Antti Virtanen [Sun, 24 Jun 2012 20:10:35 +0000 (23:10 +0300)]
Added initial support for drawing rope. Not tested yet because WindowManager doesn't yet handle rope objects.

6 years agoAdded turbo for cccp-rocket.
Tuomo Turunen [Sun, 24 Jun 2012 18:17:11 +0000 (21:17 +0300)]
Added turbo for cccp-rocket.

6 years agoWhen explicitly destroying a joint, instead of calling Box2D's version of
Tuomo Turunen [Sun, 24 Jun 2012 18:11:49 +0000 (21:11 +0300)]
When explicitly destroying a joint, instead of calling Box2D's version of
DestroyJoint(), use the new Core::World::destroyJoint() so that all
JointListeners and Core::World itself know that a joint was destroyed.

6 years agoFixed typo.
Tuomo Turunen [Sun, 24 Jun 2012 17:51:00 +0000 (20:51 +0300)]
Fixed typo.

6 years agoAdditional logic for RopeObject handling to SfmlClient Runners and DataModel.
Tuomo Turunen [Sun, 24 Jun 2012 17:34:03 +0000 (20:34 +0300)]
Additional logic for RopeObject handling to SfmlClient Runners and DataModel.

6 years agoMerge branch 'master' of
Tuomo Turunen [Sun, 24 Jun 2012 16:24:52 +0000 (19:24 +0300)]
Merge branch 'master' of

6 years agoAdded RopeObject, which describes Box2D joints to be drawn.
Tuomo Turunen [Sun, 24 Jun 2012 16:23:30 +0000 (19:23 +0300)]
Added RopeObject, which describes Box2D joints to be drawn.

6 years agoImproved support for selecting rendering mode
Antti Virtanen [Sun, 24 Jun 2012 14:14:47 +0000 (17:14 +0300)]
Improved support for selecting rendering mode

6 years agoSupport for objects consisting of multiple shapes in SfmlClient:
Tuomo Turunen [Sun, 24 Jun 2012 12:26:25 +0000 (15:26 +0300)]
Support for objects consisting of multiple shapes in SfmlClient:
One Object now refers to 0-N GfxObjects and each GfxObject is created from one
shape of the object. In case player's rocket consists of multiple shapes, the
first shape in the prototype's shape list is the focus GfxObject.

6 years agoBug fix:
Tuomo Turunen [Sun, 24 Jun 2012 11:48:51 +0000 (14:48 +0300)]
Bug fix:
SFML by default uses circle origin {0,0}, but Box2D thinks {0,0} refers to the
center of the circle. So now DataModel sets circle origin to be {radius,radius}
so that SFML and Box2D idea of circle looks like the same.

6 years agoClient now adds xml/models into cache.
Antti Virtanen [Fri, 22 Jun 2012 10:17:21 +0000 (13:17 +0300)]
Client now adds xml/models into cache.
Renderer is now selectable in client. This doesn't yet have any effect.

6 years agoFixed typo from ModelPrototype::TextureType parsing.
Antti Virtanen [Fri, 22 Jun 2012 10:17:01 +0000 (13:17 +0300)]
Fixed typo from ModelPrototype::TextureType parsing.

6 years agoRemoved unnecessary include.
Antti Virtanen [Fri, 22 Jun 2012 10:08:09 +0000 (13:08 +0300)]
Removed unnecessary include.

6 years agoAdded model prototypes to cache.
Antti Virtanen [Fri, 22 Jun 2012 10:04:58 +0000 (13:04 +0300)]
Added model prototypes to cache.

6 years agoImplemented --scale option to png2shape. That can be used to scale x and y with given...
Antti Virtanen [Fri, 22 Jun 2012 09:59:24 +0000 (12:59 +0300)]
Implemented --scale option to png2shape. That can be used to scale x and y with given modifier.

6 years agoAdded model to cavemodel world.
Antti Virtanen [Thu, 21 Jun 2012 22:34:57 +0000 (01:34 +0300)]
Added model to cavemodel world.

6 years agoAttributes image, width and height are now deprecated from world prototype. World...
Antti Virtanen [Thu, 21 Jun 2012 22:33:18 +0000 (01:33 +0300)]
Attributes image, width and height are now deprecated from world prototype. World calculates width and height dynamically.

6 years agoAdded world for cavemodel
Antti Virtanen [Thu, 21 Jun 2012 21:31:39 +0000 (00:31 +0300)]
Added world for cavemodel

6 years agoAdded model schema and example cave.
Antti Virtanen [Thu, 21 Jun 2012 20:54:55 +0000 (23:54 +0300)]
Added model schema and example cave.

6 years agoAdded ModelPrototype
Antti Virtanen [Wed, 20 Jun 2012 13:32:38 +0000 (16:32 +0300)]
Added ModelPrototype

6 years agoBasic flight mode should now work.
Antti Virtanen [Wed, 20 Jun 2012 09:55:14 +0000 (12:55 +0300)]
Basic flight mode should now work.

6 years agoAdded terrain normal texture
Antti Virtanen [Tue, 19 Jun 2012 21:56:23 +0000 (00:56 +0300)]
Added terrain normal texture

6 years agoAdded 'gravity factor' into the rules. It can be tuned with
Tuomo Turunen [Tue, 19 Jun 2012 20:14:17 +0000 (23:14 +0300)]
Added 'gravity factor' into the rules. It can be tuned with
"--param game-rules.gravity=X". Few example values:
* 1.0 is normal gravity (just like the prototype says) and the default value
* 0.0 is zero gravity
* -1.0 is negative gravity (the exact opposite of the prototype)

6 years agoRenamed some shader and model parameters.
Antti Virtanen [Tue, 19 Jun 2012 13:11:28 +0000 (16:11 +0300)]
Renamed some shader and model parameters.

6 years agoBetter parameter handling for model shaders.
Antti Virtanen [Tue, 19 Jun 2012 12:48:39 +0000 (15:48 +0300)]
Better parameter handling for model shaders.

6 years agoSimplified drawModel() prototype.
Antti Virtanen [Tue, 19 Jun 2012 12:30:06 +0000 (15:30 +0300)]
Simplified drawModel() prototype.

6 years agoReplaced shader attribute map with simple array
Antti Virtanen [Tue, 19 Jun 2012 12:07:11 +0000 (15:07 +0300)]
Replaced shader attribute map with simple array

6 years agoOptimizing ModelManager rendering step
Antti Virtanen [Tue, 19 Jun 2012 11:25:40 +0000 (14:25 +0300)]
Optimizing ModelManager rendering step

6 years agoTangents and bitangents are now given to shader if it accepts them
Antti Virtanen [Tue, 19 Jun 2012 11:18:18 +0000 (14:18 +0300)]
Tangents and bitangents are now given to shader if it accepts them

6 years agoImplemented ShaderUtil::compileFromTemplate helper that can be used to build shaders...
Antti Virtanen [Mon, 18 Jun 2012 23:31:15 +0000 (02:31 +0300)]
Implemented ShaderUtil::compileFromTemplate helper that can be used to build shaders from templates.

Improved texture handling in ModelTool.

6 years agoAdded possibility to have unlimited ammo as part of GameRules. Use
Tuomo Turunen [Mon, 18 Jun 2012 20:36:52 +0000 (23:36 +0300)]
Added possibility to have unlimited ammo as part of GameRules. Use
"--param game-rules.unlimited-ammo=true" to try it out.

6 years agoMade parsing CDMElement from Parameters to be its own module and changed
Tuomo Turunen [Mon, 18 Jun 2012 20:08:49 +0000 (23:08 +0300)]
Made parsing CDMElement from Parameters to be its own module and changed
WorldRunner to utilize that. As a side effect Core now depends on Util.

6 years agoBug fix:
Tuomo Turunen [Mon, 18 Jun 2012 19:43:29 +0000 (22:43 +0300)]
Bug fix:
- If fuel-consumption is zero, you should be able to fly even without fuel
  (after you have used all the fuel with turbo)
- And the same for turbo-consumption...

6 years agoFirst draft for affecting rules with Parameters. Check the sfml-client.ini for
Tuomo Turunen [Mon, 18 Jun 2012 18:36:57 +0000 (21:36 +0300)]
First draft for affecting rules with Parameters. Check the sfml-client.ini for
an example.

6 years agoModelTool improvements:
Antti Virtanen [Mon, 18 Jun 2012 14:24:11 +0000 (17:24 +0300)]
ModelTool improvements:
 - Removed unused support for dynamic lightmaps. Now we rather use imagemagick for building final texture.
 - Not using GL_MAX_ELEMENTS_VERTICES for selecting max amount of vertices that can be pushed to GPU with single drawElements. nvidia drivers return too large value that isn't anyway supported.
 - Mesh::draw now checks that shader attribute exits before trying to use it. This should fix memory corruption problems.
 - Not using glCheck with Mesh::drawWireFrame primitive rendering because it uses functions from openGL that aren't supported to be used between glBegin/glEnd.

6 years agoFixed the world's stupidest bug ever. Now turbo works also in Server.
Tuomo Turunen [Sun, 17 Jun 2012 17:52:12 +0000 (20:52 +0300)]
Fixed the world's stupidest bug ever. Now turbo works also in Server.

6 years agoArgh! Fixed the team vs. player name bug in Server and reverted the incorrect
Tuomo Turunen [Sun, 17 Jun 2012 17:42:48 +0000 (20:42 +0300)]
Argh! Fixed the team vs. player name bug in Server and reverted the incorrect
fix in SfmlClient (2b235dcb443878940e24298155857b29740202a1 was the incorrect

6 years agoFixed nasty bug in remote game (mixed team and player names).
Tuomo Turunen [Sun, 17 Jun 2012 17:38:58 +0000 (20:38 +0300)]
Fixed nasty bug in remote game (mixed team and player names).

6 years agoAdded turbo for rockets:
Tuomo Turunen [Sun, 17 Jun 2012 17:18:31 +0000 (20:18 +0300)]
Added turbo for rockets:
- Unlike normal forward thrust, turbo is either on or off
- The force of turbo is specified in rocket's prototype (zero by default)
- Turbo always pushes the rocket forward (the same as positive linear thrus)
- Turbo fuel consumption can be separately tuned from GameRules (but the default
  value is 1.0 just like normal fuel consumption)

I'm not able to test turbo with joystick, so probably it doesn't work.

6 years agoRemoved Core::World::Parameters.
Tuomo Turunen [Sun, 17 Jun 2012 15:33:19 +0000 (18:33 +0300)]
Removed Core::World::Parameters.

6 years agoRemoved 'infinite-fuel' and 'infinite-health' from the code. These should be
Tuomo Turunen [Sun, 17 Jun 2012 15:20:55 +0000 (18:20 +0300)]
Removed 'infinite-fuel' and 'infinite-health' from the code. These should be
controlled by the GameRules now (although there still isn't any change to affect
the GameRules).

6 years agoAdded 'fuel consumption' into the GameRules. It can be used to define how fast
Tuomo Turunen [Sun, 17 Jun 2012 15:13:34 +0000 (18:13 +0300)]
Added 'fuel consumption' into the GameRules. It can be used to define how fast
fuel runs out in normal flying, or even set to zero, when fuel never runs out.

6 years agoAdded function for creating CDMElement from GameRules. This will be handy if
Tuomo Turunen [Sun, 17 Jun 2012 14:57:52 +0000 (17:57 +0300)]
Added function for creating CDMElement from GameRules. This will be handy if
there is a need to send GameRules over the network.

6 years agoThe first draft for game rules:
Tuomo Turunen [Tue, 12 Jun 2012 17:39:32 +0000 (20:39 +0300)]
The first draft for game rules:
- Game rules are passed to World as shared const pointer
- For now game rules include factors for collision damage with walls and with
  objects (and by tuning these one can make flying easier or more difficult)
- It is still unclear from where the rules come from or who creates them

6 years agoMerge branch 'master' of
Antti Virtanen [Tue, 12 Jun 2012 11:56:34 +0000 (14:56 +0300)]
Merge branch 'master' of

6 years agoConverted dos linefeeds away
Antti Virtanen [Tue, 12 Jun 2012 11:55:52 +0000 (14:55 +0300)]
Converted dos linefeeds away

6 years agoFixed compile error from cpptemplate.
Antti Virtanen [Tue, 12 Jun 2012 11:55:06 +0000 (14:55 +0300)]
Fixed compile error from cpptemplate.
Building cpptemplate in premake.

6 years agoAdded cpptemplate library.
Antti Virtanen [Tue, 12 Jun 2012 11:52:10 +0000 (14:52 +0300)]
Added cpptemplate library.

6 years agoAdded algorithm for calculating tangents and bitangents.
Antti Virtanen [Mon, 11 Jun 2012 23:17:15 +0000 (02:17 +0300)]
Added algorithm for calculating tangents and bitangents.

6 years agoUsing prepared lightmapped texture for model.
Antti Virtanen [Mon, 11 Jun 2012 21:31:17 +0000 (00:31 +0300)]
Using prepared lightmapped texture for model.

6 years agoAdded instructions for preparing final texture with applied static lightmaps.
Antti Virtanen [Mon, 11 Jun 2012 14:40:25 +0000 (17:40 +0300)]
Added instructions for preparing final texture with applied static lightmaps.

6 years agoGenerate mipmaps for model textures.
Antti Virtanen [Sun, 10 Jun 2012 22:23:24 +0000 (01:23 +0300)]
Generate mipmaps for model textures.

6 years agoModelTool improvements:
Antti Virtanen [Sun, 10 Jun 2012 21:57:44 +0000 (00:57 +0300)]
ModelTool improvements:
 - Shape calculation can be now disabled
 - Flightmode can be enabled with F2. Started to do some testing with this to see how camera should be controlled in game.

6 years agoInstead of figuring out from mesh what are contained 2d shapes we could just use...
Antti Virtanen [Sat, 9 Jun 2012 22:45:22 +0000 (01:45 +0300)]
Instead of figuring out from mesh what are contained 2d shapes we could just use already existing heightmap and use png2shape with imagemagick for creating shape prototypes.

6 years agoRemoving LinearWrapper and Client.
Antti Virtanen [Sat, 9 Jun 2012 22:22:33 +0000 (01:22 +0300)]
Removing LinearWrapper and Client.