Skip to content

Commit

Permalink
2021/12/10
Browse files Browse the repository at this point in the history
  • Loading branch information
hythl0day committed Dec 9, 2021
1 parent cfaf4c5 commit d29195f
Show file tree
Hide file tree
Showing 54 changed files with 312 additions and 203 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
15 changes: 0 additions & 15 deletions assets/scripts/game/flutter.ht

This file was deleted.

10 changes: 0 additions & 10 deletions assets/scripts/game/game.ht

This file was deleted.

46 changes: 0 additions & 46 deletions assets/scripts/main.ht

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:hetu_script/hetu_script.dart';
import 'package:hetu_script/binding.dart';

import '../../../../../engine/scene/rogue/component/rogue_map.dart';
import '../../../../../engine/scene/maze/component/rogue_map.dart';

extension RogueMapBinding on RogueMap {
extension MazeBinding on Maze {
dynamic htFetch(String varName) {
switch (varName) {
case r'removeEntity':
Expand Down Expand Up @@ -33,18 +33,18 @@ extension RogueMapBinding on RogueMap {
}
}

class RogueMapClassBinding extends HTExternalClass {
RogueMapClassBinding() : super(r'RogueMap');
class MazeClassBinding extends HTExternalClass {
MazeClassBinding() : super(r'Maze');

@override
dynamic memberGet(String varName) {
switch (varName) {
case r'RogueMap.fromJson':
case r'Maze.fromJson':
return (HTEntity object,
{List<dynamic> positionalArgs = const [],
Map<String, dynamic> namedArgs = const {},
List<HTType> typeArgs = const []}) {
return RogueMap.fromJson(positionalArgs.first);
return Maze.fromJson(positionalArgs.first);
};
default:
throw HTError.undefined(varName);
Expand All @@ -53,7 +53,7 @@ class RogueMapClassBinding extends HTExternalClass {

@override
dynamic instanceMemberGet(dynamic object, String varName) {
var i = object as RogueMap;
var i = object as Maze;
return i.htFetch(varName);
}
}
4 changes: 2 additions & 2 deletions lib/engine/game.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:hetu_script/hetu_script.dart';
import 'package:hetu_script_flutter/hetu_script_flutter.dart';

import '../binding/external_game_functions.dart';
import '../binding/game/scene/rogue/component/rogue_map_binding.dart';
import '../binding/game/scene/maze/component/maze_binding.dart';
import 'scene/scene.dart';
import 'event/event.dart';
import '../shared/localizations.dart';
Expand All @@ -16,7 +16,7 @@ class SamsaraGame with SceneController, EventAggregator {
Future<void> init() async {
await hetu.initFlutter(
externalFunctions: externalGameFunctions,
externalClasses: [RogueMapClassBinding()],
externalClasses: [MazeClassBinding()],
);
hetu.evalFile('main.ht', invokeFunc: 'init');
final Map<String, dynamic> localizationData =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class TilePosition {
String toString() => '[$left,$top]';
}

class RogueMap extends GameComponent with HandlesGesture {
class Maze extends GameComponent with HandlesGesture {
@override
Camera get camera => gameRef.camera;

Expand All @@ -34,7 +34,7 @@ class RogueMap extends GameComponent with HandlesGesture {

bool updateTile = true;

RogueMap({
Maze({
required this.entryX,
required this.entryY,
double srcTileWidth = Tile.defaultSrcTileWidth,
Expand All @@ -48,7 +48,7 @@ class RogueMap extends GameComponent with HandlesGesture {
scale = Vector2(Tile.defaultScale, Tile.defaultScale);
}

static Future<RogueMap> fromJson(Map<String, dynamic> data) async {
static Future<Maze> fromJson(Map<String, dynamic> data) async {
final srcTileWidth = data['srcTileWidth'];
final srcTileHeight = data['srcTileHeight'];

Expand Down Expand Up @@ -107,7 +107,7 @@ class RogueMap extends GameComponent with HandlesGesture {
entities[key] = entity;
}

return RogueMap(
return Maze(
entryX: entryX,
entryY: entryY,
srcTileWidth: srcTileWidth,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class RogueGame extends Scene {
Future<void> onLoad() async {
await super.onLoad();

final RogueMap map = await game.hetu.invoke('createRogueGame');
final Maze map = await game.hetu.invoke('createRogueGame');
add(map);
_loaded = true;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/game_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/painting.dart';

import 'engine/scene/scene.dart';
import 'engine/scene/rogue/rogue_game.dart';
import 'engine/scene/maze/rogue_game.dart';
import 'ui/loading_screen.dart';
import 'ui/map/map_view.dart';
import 'engine/game.dart';
Expand Down
Loading

0 comments on commit d29195f

Please sign in to comment.