vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a bug, added some menu-items

Browse Source
This commit is contained in:
Erik Faye-Lund 2008-02-17 12:05:16 +00:00
parent b7641dfcee
commit 366508c228
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/editor.rc
View File

@ -72,6 +72,7 @@ IDR_MENU MENU
BEGIN BEGIN
POPUP "&File" POPUP "&File"
BEGIN BEGIN
MENUITEM "New\tCtrl+N", ID_FILE_NEW40015
MENUITEM "&Open\tCtrl+O", ID_FILE_OPEN MENUITEM "&Open\tCtrl+O", ID_FILE_OPEN
MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE
MENUITEM "Save &As", ID_FILE_SAVE_AS MENUITEM "Save &As", ID_FILE_SAVE_AS

3
editor/resource.h
View File

@ -18,13 +18,14 @@
#define ID_EDIT_SELECTALL 40012 #define ID_EDIT_SELECTALL 40012
#define ID_EDIT_SELECTROW 40013 #define ID_EDIT_SELECTROW 40013
#define ID_EDIT_SELECTTRACK 40014 #define ID_EDIT_SELECTTRACK 40014
#define ID_FILE_NEW40015 40015
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 104 #define _APS_NEXT_RESOURCE_VALUE 104
#define _APS_NEXT_COMMAND_VALUE 40015 #define _APS_NEXT_COMMAND_VALUE 40016
#define _APS_NEXT_CONTROL_VALUE 1004 #define _APS_NEXT_CONTROL_VALUE 1004
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif

11
sync/device_client.cpp
View File

@ -82,17 +82,24 @@ bool ClientDevice::update(float row)
{ {
int track, row; int track, row;
float value; float value;
Track::KeyFrame::InterpolationType interp; char interp;
recv(serverSocket, (char*)&track, sizeof(int), 0); recv(serverSocket, (char*)&track, sizeof(int), 0);
recv(serverSocket, (char*)&row, sizeof(int), 0); recv(serverSocket, (char*)&row, sizeof(int), 0);
recv(serverSocket, (char*)&value, sizeof(float), 0); recv(serverSocket, (char*)&value, sizeof(float), 0);
recv(serverSocket, (char*)&interp, 1, 0); recv(serverSocket, (char*)&interp, 1, 0);
assert(interp >= 0);
assert(interp < Track::KeyFrame::IT_COUNT); assert(interp < Track::KeyFrame::IT_COUNT);
sync::Track &t = syncData.getTrack(track); sync::Track &t = syncData.getTrack(track);
t.setKeyFrame(row, Track::KeyFrame(value, interp)); t.setKeyFrame(row,
Track::KeyFrame(
value,
Track::KeyFrame::InterpolationType(interp)
)
);
} }
break; break;

16
sync/network.h
View File

@ -13,21 +13,21 @@ SOCKET serverConnect(struct sockaddr_in *addr);
bool pollRead(SOCKET socket); bool pollRead(SOCKET socket);
enum RemoteCommand enum RemoteCommand {
{
// server -> client // server -> client
SET_KEY, SET_KEY = 0,
DELETE_KEY, DELETE_KEY = 1,
// client -> server // client -> server
GET_TRACK, GET_TRACK = 2,
// client -> server, server -> client // client -> server, server -> client
SET_ROW, SET_ROW = 3,
// server -> client // server -> client
PAUSE, PAUSE = 4,
SAVE_TRACKS
SAVE_TRACKS = 5
}; };
#endif /* NETWORK_H */ #endif /* NETWORK_H */