shattered 0.3.1 → 0.3.2
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/destroy +9 -0
- data/bin/runner +2 -2
- data/lib/game_loader.rb +2 -2
- data/lib/rails_generator/base.rb +1 -1
- data/lib/rails_generator/commands.rb +1 -1
- data/lib/rails_generator/generators/applications/shattered_app/shattered_app_generator.rb +5 -2
- data/lib/rails_generator/generators/components/actor/actor_generator.rb +1 -1
- data/lib/rails_generator/generators/components/controller/controller_generator.rb +1 -1
- data/lib/rails_generator/generators/components/model/model_generator.rb +1 -1
- data/lib/rails_generator/generators/components/state/state_generator.rb +1 -1
- data/lib/rails_generator/generators/components/view/view_generator.rb +1 -1
- data/lib/rails_generator/lookup.rb +14 -12
- data/lib/rails_generator/manifest.rb +1 -1
- data/lib/rails_generator/options.rb +1 -1
- data/lib/rails_generator/scripts.rb +1 -1
- data/lib/rails_generator/scripts/destroy.rb +1 -1
- data/lib/rails_generator/scripts/generate.rb +1 -1
- data/lib/rails_generator/scripts/update.rb +1 -1
- data/lib/rails_generator/simple_logger.rb +2 -2
- data/lib/rails_generator/spec.rb +1 -1
- data/lib/shatter.rb +5 -7
- data/lib/templates/configs/ogre_plugins.rcfg +4 -6
- data/lib/templates/media/basic.rmaterial +1 -0
- data/lib/templates/test/test_helper.rb +5 -0
- metadata +11 -9
- data/lib/rails_generator/generators/components/controller/templates/helper.rb +0 -2
data/bin/destroy
ADDED
@@ -0,0 +1,9 @@
|
|
1
|
+
#!/opt/local/bin/ruby
|
2
|
+
|
3
|
+
require File.dirname(__FILE__) + '/../config/boot'
|
4
|
+
require File.dirname(__FILE__) + '/../config/environment'
|
5
|
+
require 'rails_generator'
|
6
|
+
require 'rails_generator/scripts/destroy'
|
7
|
+
|
8
|
+
ARGV.shift if ['--help', '-h'].include?(ARGV[0])
|
9
|
+
Rails::Generator::Scripts::Destroy.new.run(ARGV)
|
data/bin/runner
CHANGED
data/lib/game_loader.rb
CHANGED
@@ -13,7 +13,7 @@ include ShatteredController
|
|
13
13
|
include ShatteredView
|
14
14
|
include ShatteredModel
|
15
15
|
|
16
|
-
module Shatter
|
16
|
+
module Shatter #:nodoc:all
|
17
17
|
#This class is loads the view, controller, and model. It then loads
|
18
18
|
#and starts the game based on these.
|
19
19
|
class GameLoader
|
@@ -43,4 +43,4 @@ class GameLoader
|
|
43
43
|
control.start_game
|
44
44
|
end
|
45
45
|
end
|
46
|
-
end
|
46
|
+
end
|
data/lib/rails_generator/base.rb
CHANGED
@@ -14,7 +14,7 @@ require File.dirname(__FILE__) + '/spec'
|
|
14
14
|
# generator and just replaces the code templates with its own.
|
15
15
|
#
|
16
16
|
# Now go forth and multiply^Wgenerate.
|
17
|
-
module Rails
|
17
|
+
module Rails #:nodoc:all
|
18
18
|
module Generator
|
19
19
|
class GeneratorError < StandardError; end
|
20
20
|
class UsageError < GeneratorError; end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
require 'rbconfig'
|
2
2
|
|
3
|
-
class ShatteredAppGenerator < Rails::Generator::Base
|
3
|
+
class ShatteredAppGenerator < Rails::Generator::Base #:nodoc:all
|
4
4
|
DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
|
5
5
|
Config::CONFIG['ruby_install_name'])
|
6
6
|
|
@@ -33,6 +33,9 @@ class ShatteredAppGenerator < Rails::Generator::Base
|
|
33
33
|
# Environments
|
34
34
|
m.file "templates/environments/environment.rb", "config/environment.rb"
|
35
35
|
|
36
|
+
# Testing
|
37
|
+
m.file "templates/test/test_helper.rb", "test/test_helper.rb"
|
38
|
+
|
36
39
|
# Mac OSX
|
37
40
|
m.file "templates/configs/Mac/shattered.app/Contents/Info.plist", "config/Mac/shattered.app/Contents/Info.plist"
|
38
41
|
m.file "templates/configs/Mac/shattered.app/Contents/MacOS/shattered_mac", "config/Mac/shattered.app/Contents/MacOS/shattered_mac"
|
@@ -45,7 +48,7 @@ class ShatteredAppGenerator < Rails::Generator::Base
|
|
45
48
|
m.file "templates/configs/Mac/shattered.app/Contents/Resources/rb_main.rb", "config/Mac/shattered.app/Contents/Resources/rb_main.rb"
|
46
49
|
|
47
50
|
# Scripts
|
48
|
-
%w( generate runner console ).each do |file|
|
51
|
+
%w( generate runner console destroy ).each do |file|
|
49
52
|
m.file "../bin/#{file}", "script/#{file}", script_options
|
50
53
|
end
|
51
54
|
|
@@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/../model/model_generator'
|
|
8
8
|
require File.dirname(__FILE__) + '/../view/view_generator'
|
9
9
|
require File.dirname(__FILE__) + '/../controller/controller_generator'
|
10
10
|
|
11
|
-
class ActorGenerator < Rails::Generator::NamedBase
|
11
|
+
class ActorGenerator < Rails::Generator::NamedBase #:nodoc:
|
12
12
|
def manifest
|
13
13
|
model=["model", file_name]
|
14
14
|
view=["view", file_name]
|
@@ -1,6 +1,6 @@
|
|
1
1
|
require File.dirname(__FILE__) + '/spec'
|
2
2
|
|
3
|
-
class Object
|
3
|
+
class Object #:nodoc:all
|
4
4
|
class << self
|
5
5
|
# Lookup missing generators using const_missing. This allows any
|
6
6
|
# generator to reference another without having to know its location:
|
@@ -21,21 +21,23 @@ class Object
|
|
21
21
|
end
|
22
22
|
end
|
23
23
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
ENV['HOME']
|
28
|
-
|
29
|
-
ENV['USERPROFILE']
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
24
|
+
class Dir #:nodoc:all
|
25
|
+
# User home directory lookup adapted from RubyGems.
|
26
|
+
def self.user_home
|
27
|
+
if ENV['HOME']
|
28
|
+
ENV['HOME']
|
29
|
+
elsif ENV['USERPROFILE']
|
30
|
+
ENV['USERPROFILE']
|
31
|
+
elsif ENV['HOMEDRIVE'] and ENV['HOMEPATH']
|
32
|
+
"#{ENV['HOMEDRIVE']}:#{ENV['HOMEPATH']}"
|
33
|
+
else
|
34
|
+
File.expand_path '~'
|
35
|
+
end
|
34
36
|
end
|
35
37
|
end
|
36
38
|
|
37
39
|
|
38
|
-
module Rails
|
40
|
+
module Rails #:nodoc:all
|
39
41
|
module Generator
|
40
42
|
|
41
43
|
# Generator lookup is managed by a list of sources which return specs
|
data/lib/rails_generator/spec.rb
CHANGED
data/lib/shatter.rb
CHANGED
@@ -1,10 +1,8 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
require component
|
7
|
-
end
|
1
|
+
require 'rubygems'
|
2
|
+
require 'active_support'
|
3
|
+
|
4
|
+
["shattered_support","shattered_ogre","shattered_model", "shattered_view","shattered_controller"].each do |component|
|
5
|
+
require component
|
8
6
|
end
|
9
7
|
|
10
8
|
require File.dirname(__FILE__) + '/game_loader'
|
@@ -1,18 +1,16 @@
|
|
1
1
|
// The PluginFolder tells Ogre where OgreMain.dll can be found.
|
2
|
-
<% if PLATFORM =~ /mswin/ %>
|
2
|
+
<% if PLATFORM =~ /mswin/ || PLATFORM =~ /linux/ %>
|
3
3
|
PluginFolder=<%= SHATTERED_OGRE_DLLS %>
|
4
|
-
<% elsif PLATFORM =~ /darwin/ %>
|
5
|
-
<% else %>
|
6
|
-
PluginFolder=/usr/local/lib/OGRE
|
7
4
|
<% end %>
|
8
5
|
|
9
6
|
// Each of these plugins loads a seperate subsystem of Ogre.
|
10
7
|
<%
|
11
8
|
plugins = %w( RenderSystem_GL RenderSystem_Direct3D9
|
12
9
|
Plugin_ParticleFX Plugin_BSPSceneManager
|
13
|
-
Plugin_OctreeSceneManager Plugin_CgProgramManager )
|
10
|
+
Plugin_OctreeSceneManager Plugin_CgProgramManager )
|
14
11
|
plugins -= ["RenderSystem_Direct3D9"] unless PLATFORM =~ /mswin32/
|
12
|
+
plugins -= ["Plugin_CgProgramManager"] if PLATFORM =~ /i686-darwin/
|
15
13
|
%>
|
16
14
|
<% plugins.each do |plugin| %>
|
17
15
|
Plugin=<%= plugin %>
|
18
|
-
<% end %>
|
16
|
+
<% end %>
|
metadata
CHANGED
@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
|
|
3
3
|
specification_version: 1
|
4
4
|
name: shattered
|
5
5
|
version: !ruby/object:Gem::Version
|
6
|
-
version: 0.3.
|
7
|
-
date: 2006-
|
6
|
+
version: 0.3.2
|
7
|
+
date: 2006-06-04
|
8
8
|
summary: "Shattered: The main package tieing together controller, view, and model"
|
9
9
|
require_paths:
|
10
10
|
- lib
|
@@ -29,6 +29,7 @@ platform: ruby
|
|
29
29
|
authors: []
|
30
30
|
files:
|
31
31
|
- bin/console
|
32
|
+
- bin/destroy
|
32
33
|
- bin/generate
|
33
34
|
- bin/runner
|
34
35
|
- bin/shatter
|
@@ -63,7 +64,6 @@ files:
|
|
63
64
|
- lib/rails_generator/generators/components/controller/USAGE
|
64
65
|
- lib/rails_generator/generators/components/controller/templates/controller.rb
|
65
66
|
- lib/rails_generator/generators/components/controller/templates/functional_test.rb
|
66
|
-
- lib/rails_generator/generators/components/controller/templates/helper.rb
|
67
67
|
- lib/rails_generator/generators/components/controller/templates/view.rhtml
|
68
68
|
- lib/rails_generator/generators/components/model/model_generator.rb
|
69
69
|
- lib/rails_generator/generators/components/model/templates
|
@@ -90,6 +90,7 @@ files:
|
|
90
90
|
- lib/templates/MIT-LICENSE
|
91
91
|
- lib/templates/Rakefile
|
92
92
|
- lib/templates/README
|
93
|
+
- lib/templates/test
|
93
94
|
- lib/templates/configs/boot.rb
|
94
95
|
- lib/templates/configs/empty.log
|
95
96
|
- lib/templates/configs/Mac
|
@@ -118,6 +119,7 @@ files:
|
|
118
119
|
- lib/templates/environments/environment.rb
|
119
120
|
- lib/templates/media/basic.rmaterial
|
120
121
|
- lib/templates/media/offset_map.rmaterial
|
122
|
+
- lib/templates/test/test_helper.rb
|
121
123
|
test_files: []
|
122
124
|
rdoc_options:
|
123
125
|
- "--exclude"
|
@@ -137,7 +139,7 @@ dependencies:
|
|
137
139
|
-
|
138
140
|
- ">="
|
139
141
|
- !ruby/object:Gem::Version
|
140
|
-
version:
|
142
|
+
version: 0.3.2
|
141
143
|
version:
|
142
144
|
- !ruby/object:Gem::Dependency
|
143
145
|
name: shattered_view
|
@@ -147,7 +149,7 @@ dependencies:
|
|
147
149
|
-
|
148
150
|
- ">="
|
149
151
|
- !ruby/object:Gem::Version
|
150
|
-
version:
|
152
|
+
version: 0.3.2
|
151
153
|
version:
|
152
154
|
- !ruby/object:Gem::Dependency
|
153
155
|
name: shattered_ogre
|
@@ -157,7 +159,7 @@ dependencies:
|
|
157
159
|
-
|
158
160
|
- ">="
|
159
161
|
- !ruby/object:Gem::Version
|
160
|
-
version:
|
162
|
+
version: 0.3.2
|
161
163
|
version:
|
162
164
|
- !ruby/object:Gem::Dependency
|
163
165
|
name: shattered_controller
|
@@ -167,7 +169,7 @@ dependencies:
|
|
167
169
|
-
|
168
170
|
- ">="
|
169
171
|
- !ruby/object:Gem::Version
|
170
|
-
version:
|
172
|
+
version: 0.3.2
|
171
173
|
version:
|
172
174
|
- !ruby/object:Gem::Dependency
|
173
175
|
name: shattered_support
|
@@ -177,7 +179,7 @@ dependencies:
|
|
177
179
|
-
|
178
180
|
- ">="
|
179
181
|
- !ruby/object:Gem::Version
|
180
|
-
version:
|
182
|
+
version: 0.3.2
|
181
183
|
version:
|
182
184
|
- !ruby/object:Gem::Dependency
|
183
185
|
name: activesupport
|
@@ -187,5 +189,5 @@ dependencies:
|
|
187
189
|
-
|
188
190
|
- ">="
|
189
191
|
- !ruby/object:Gem::Version
|
190
|
-
version:
|
192
|
+
version: 0.3.2
|
191
193
|
version:
|